Improved attribute handling with types and Attribute support (#1567)

* Add `AllowDynamicProperties` Attribute to cooperate with php8.2 deprecation * lint snapshot * Fix collection attribute typing * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update composer.json * Fix collectino with template types WIP * Add `AllowDynamicProperties` Attribute to cooperate with php8.2 deprecation * Fix collection attribute typing * Update CHANGELOG.md * Update CHANGELOG.md * Update composer.json * composer fix-style * Fix tests * Fix tests * composer fix-style * Fix collectino with complex template types{ * Delete phpactor * Install from scrumble repo * Implemented correct attribute handling * composer fix-style * Revert "Install from scrumble repo" This reverts commit 3f1057adb6. * Re-add barryvdh links * Revert "Update composer.json" This reverts commit 98252fe740. * Fix pivot test * Correct CHANGELOG.md with attribute merge request * More clear PhpDocTypeParser filename and clarified directory according to PSR12 --------- Co-authored-by: GeoSot <[email protected]> Co-authored-by: laravel-ide-helper <[email protected]> Co-authored-by: Luukdewaaier <[email protected]> Co-authored-by: Luuk de Weijer <[email protected]>
2026-08-18 10:07:12 +00:00 · 2024-07-12 15:53:04 +02:00
parent 6338abb2d7
commit c6509b658f
15 changed files with 463 additions and 30 deletions
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Parsers;
+
+class PhpDocReturnTypeParser
+{
+    /**
+     * @var string
+     */
+    private string $typeAlias;
+
+    /**
+     * @var array
+     */
+    private array $namespaceAliases;
+
+    /**
+     * @param string $typeAlias
+     * @param array $namespaceAliases
+     */
+    public function __construct(string $typeAlias, array $namespaceAliases)
+    {
+        $this->typeAlias = $typeAlias;
+        $this->namespaceAliases = $namespaceAliases;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function parse(): string|null
+    {
+        $matches = [];
+        preg_match('/(\w+)(<.*>)/', $this->typeAlias, $matches);
+        $matchCount = count($matches);
+
+        if ($matchCount === 0 || $matchCount === 1) {
+            return null;
+        }
+
+        if (empty($this->namespaceAliases[$matches[1]])) {
+            return null;
+        }
+
+        return $this->namespaceAliases[$matches[1]] . $this->parseTemplate($matches[2] ?? null);
+    }
+
+    /**
+     * @param string|null $template
+     * @return string
+     */
+    private function parseTemplate(string|null $template): string
+    {
+        if ($template  === null || $template === '') {
+            return '';
+        }
+
+        $type = '';
+        $result = '';
+
+        foreach (str_split($template) as $char) {
+            $match = preg_match('/[A-z]/', $char);
+
+            if (!$match) {
+                $type = $this->namespaceAliases[$type] ?? $type;
+                $result .= $type;
+                $result .= $char;
+                $type = '';
+
+                continue;
+            }
+
+            $type .= $char;
+        }
+
+        return $result;
+    }
+}