bug #41767 [Config] fix tracking default values that reference the parent class (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 79a87cb64c4f · 2021-06-23T20:50:42.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Config] fix tracking default values that reference the parent class | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41133 | License | MIT | Doc PR | - Commits ------- 978747e [Config] fix tracking default values that reference the parent class
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -161,6 +161,8 @@ private function generateSignature(\ReflectionClass $class): iterable
             }
         }
 
+        $defined = \Closure::bind(static function ($c) { return \defined($c); }, null, $class->name);
+
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
             if (\PHP_VERSION_ID >= 80000) {
                 foreach ($m->getAttributes() as $a) {
@@ -187,7 +189,7 @@ private function generateSignature(\ReflectionClass $class): iterable
                     continue;
                 }
 
-                if (!$p->isDefaultValueConstant() || \defined($p->getDefaultValueConstantName())) {
+                if (!$p->isDefaultValueConstant() || $defined($p->getDefaultValueConstantName())) {
                     $defaults[$p->name] = $p->getDefaultValue();
 
                     continue;
diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -164,6 +164,7 @@ public function provideHashedSignature(): iterable
 
         yield [true, 17, 'public function ccc($bar = 187) {}'];
         yield [true, 17, 'public function ccc($bar = ANOTHER_ONE_THAT_WILL_NEVER_BE_DEFINED_CCCCCCCCC) {}'];
+        yield [true, 17, 'public function ccc($bar = parent::BOOM) {}'];
         yield [true, 17, null, static function () { \define('A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC', 'foo'); }];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,8 @@ private function generateSignature(\ReflectionClass $class): iterable`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
	`164`	`+ $defined = \Closure::bind(static function ($c) { return \defined($c); }, null, $class->name);`
	`165`	`+`
`164`	`166`	`foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC \| \ReflectionMethod::IS_PROTECTED) as $m) {`
`165`	`167`	`if (\PHP_VERSION_ID >= 80000) {`
`166`	`168`	`foreach ($m->getAttributes() as $a) {`
`@@ -187,7 +189,7 @@ private function generateSignature(\ReflectionClass $class): iterable`
`187`	`189`	`continue;`
`188`	`190`	`}`
`189`	`191`
`190`		`- if (!$p->isDefaultValueConstant() \|\| \defined($p->getDefaultValueConstantName())) {`
	`192`	`+ if (!$p->isDefaultValueConstant() \|\| $defined($p->getDefaultValueConstantName())) {`
`191`	`193`	`$defaults[$p->name] = $p->getDefaultValue();`
`192`	`194`
`193`	`195`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ public function provideHashedSignature(): iterable`
`164`	`164`
`165`	`165`	`yield [true, 17, 'public function ccc($bar = 187) {}'];`
`166`	`166`	`yield [true, 17, 'public function ccc($bar = ANOTHER_ONE_THAT_WILL_NEVER_BE_DEFINED_CCCCCCCCC) {}'];`
	`167`	`+ yield [true, 17, 'public function ccc($bar = parent::BOOM) {}'];`
`167`	`168`	`yield [true, 17, null, static function () { \define('A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC', 'foo'); }];`
`168`	`169`	`}`
`169`	`170`