bug #41644 [Config] fix tracking attributes in ReflectionClassResource (nicolas-grekas)

derrabus · derrabus · commit 0fa07c6d7c8e · 2021-06-10T17:19:12.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Config] fix tracking attributes in ReflectionClassResource | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39988 | License | MIT | Doc PR | - Commits ------- 7ad8247 [Config] fix tracking attributes in ReflectionClassResource
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -119,6 +119,15 @@ private function computeHash(): string
 
     private function generateSignature(\ReflectionClass $class): iterable
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            $attributes = [];
+            foreach ($class->getAttributes() as $a) {
+                $attributes[] = [$a->getName(), $a->getArguments()];
+            }
+            yield print_r($attributes, true);
+            $attributes = [];
+        }
+
         yield $class->getDocComment();
         yield (int) $class->isFinal();
         yield (int) $class->isAbstract();
@@ -135,6 +144,14 @@ private function generateSignature(\ReflectionClass $class): iterable
             $defaults = $class->getDefaultProperties();
 
             foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC | \ReflectionProperty::IS_PROTECTED) as $p) {
+                if (\PHP_VERSION_ID >= 80000) {
+                    foreach ($p->getAttributes() as $a) {
+                        $attributes[] = [$a->getName(), $a->getArguments()];
+                    }
+                    yield print_r($attributes, true);
+                    $attributes = [];
+                }
+
                 yield $p->getDocComment();
                 yield $p->isDefault() ? '<default>' : '';
                 yield $p->isPublic() ? 'public' : 'protected';
@@ -145,9 +162,25 @@ private function generateSignature(\ReflectionClass $class): iterable
         }
 
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
+            if (\PHP_VERSION_ID >= 80000) {
+                foreach ($m->getAttributes() as $a) {
+                    $attributes[] = [$a->getName(), $a->getArguments()];
+                }
+                yield print_r($attributes, true);
+                $attributes = [];
+            }
+
             $defaults = [];
             $parametersWithUndefinedConstants = [];
             foreach ($m->getParameters() as $p) {
+                if (\PHP_VERSION_ID >= 80000) {
+                    foreach ($p->getAttributes() as $a) {
+                        $attributes[] = [$a->getName(), $a->getArguments()];
+                    }
+                    yield print_r($attributes, true);
+                    $attributes = [];
+                }
+
                 if (!$p->isDefaultValueAvailable()) {
                     $defaults[$p->name] = null;
 
diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -121,6 +121,11 @@ public function provideHashedSignature(): iterable
     {
         yield [false, 0, "// line change\n\n"];
         yield [true, 0, '/** class docblock */'];
+
+        if (\PHP_VERSION_ID >= 80000) {
+            yield [true, 0, '#[Foo]'];
+        }
+
         yield [true, 1, 'abstract class %s'];
         yield [true, 1, 'final class %s'];
         yield [true, 1, 'class %s extends Exception'];
@@ -140,6 +145,12 @@ public function provideHashedSignature(): iterable
         yield [false, 11, "public function pub(\$arg = null) {\nreturn 123;\n}"];
         yield [true, 12, '/** prot docblock */'];
         yield [true, 13, 'protected function prot($a = [123]) {}'];
+
+        if (\PHP_VERSION_ID >= 80000) {
+            yield [true, 13, '#[Foo] protected function prot($a = []) {}'];
+            yield [true, 13, 'protected function prot(#[Foo] $a = []) {}'];
+        }
+
         yield [false, 14, '/** priv docblock */'];
         yield [false, 15, ''];
 
