bug #16455 [Bridge\PhpUnit] Fix clock-mock registration (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d2531360b38b · 2015-11-04T10:21:15.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Bridge\PhpUnit] Fix clock-mock registration | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Once a method has been executed, PHP ignores any new function that could be injected in the namespace afterwards (HHVM does not ignore them btw). Which means we have to inject clock-mocking functions into all clock-mocked namespaces before any actual implementation is used in that namespace. This PR does it. Commits ------- 0a6a10a [Bridge\PhpUnit] Fix clock-mock registration
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -56,6 +56,11 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
                     }
                 }
             }
+            foreach ($suite->tests() as $test) {
+                if ($test instanceof \PHPUnit_Framework_TestSuite && in_array('time-sensitive', \PHPUnit_Util_Test::getGroups($test->getName()), true)) {
+                    ClockMock::register($test->getName());
+                }
+            }
         } elseif (2 === $this->state) {
             $skipped = array();
             foreach ($suite->tests() as $test) {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+ foreach ($suite->tests() as $test) {`
	`60`	`+ if ($test instanceof \PHPUnit_Framework_TestSuite && in_array('time-sensitive', \PHPUnit_Util_Test::getGroups($test->getName()), true)) {`
	`61`	`+ ClockMock::register($test->getName());`
	`62`	`+ }`
	`63`	`+ }`
`59`	`64`	`} elseif (2 === $this->state) {`
`60`	`65`	`$skipped = array();`
`61`	`66`	`foreach ($suite->tests() as $test) {`