bug #37543 [PhpUnitBridge] consider traits imported in parent classes (xabbuh)

nicolas-grekas · nicolas-grekas · commit 2b18acc8afdf · 2020-07-09T18:35:35.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [PhpUnitBridge] consider traits imported in parent classes | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | A public method declared in a trait can be used by a class without importing the trait itself when the trait is already imported by one of the parent classes from the inheritance chain. Commits ------- eac6369 consider traits imported in parent classes
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -232,7 +232,7 @@ public function startTest($test)
             if (isset($annotations['class']['expectedDeprecation'])) {
                 $test->getTestResultObject()->addError($test, new AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0);
             }
-            if (isset($annotations['method']['expectedDeprecation']) || $this->checkNumAssertions = \in_array(ExpectDeprecationTrait::class, class_uses($test), true)) {
+            if (isset($annotations['method']['expectedDeprecation']) || $this->checkNumAssertions = method_exists($test, 'expectDeprecation') && (new \ReflectionMethod($test, 'expectDeprecation'))->getFileName() === (new \ReflectionMethod(ExpectDeprecationTrait::class, 'expectDeprecation'))->getFileName()) {
                 if (isset($annotations['method']['expectedDeprecation'])) {
                     self::$expectedDeprecations = $annotations['method']['expectedDeprecation'];
                     self::$previousErrorHandler = set_error_handler([self::class, 'handleError']);

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public function startTest($test)`
`232`	`232`	`if (isset($annotations['class']['expectedDeprecation'])) {`
`233`	`233`	$test->getTestResultObject()->addError($test, new AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0);
`234`	`234`	`}`
`235`		`- if (isset($annotations['method']['expectedDeprecation']) \|\| $this->checkNumAssertions = \in_array(ExpectDeprecationTrait::class, class_uses($test), true)) {`
	`235`	`+ if (isset($annotations['method']['expectedDeprecation']) \|\| $this->checkNumAssertions = method_exists($test, 'expectDeprecation') && (new \ReflectionMethod($test, 'expectDeprecation'))->getFileName() === (new \ReflectionMethod(ExpectDeprecationTrait::class, 'expectDeprecation'))->getFileName()) {`
`236`	`236`	`if (isset($annotations['method']['expectedDeprecation'])) {`
`237`	`237`	`self::$expectedDeprecations = $annotations['method']['expectedDeprecation'];`
`238`	`238`	`self::$previousErrorHandler = set_error_handler([self::class, 'handleError']);`