feature #18726 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ (teohhanhui)

nicolas-grekas · nicolas-grekas · commit b59664bc421e · 2016-05-30T09:55:31.000+02:00
This PR was submitted for the 2.8 branch but it was merged into the 3.2-dev branch instead (closes #18726). Discussion ---------- [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes? | New feature? | no | BC breaks? | no? | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | symfony/symfony-docs#6546 See symfony/symfony-standard#969 Commits ------- 2630c13 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -77,6 +77,8 @@ public static function register($class)
         if (0 < strpos($class, '\\Tests\\')) {
             $ns = str_replace('\\Tests\\', '\\', $class);
             $mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
+        } elseif (0 === strpos($class, 'Tests\\')) {
+            $mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);
         }
         foreach ($mockedNs as $ns) {
             if (function_exists($ns.'\time')) {

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ public static function register($class)`
`77`	`77`	`if (0 < strpos($class, '\\Tests\\')) {`
`78`	`78`	`$ns = str_replace('\\Tests\\', '\\', $class);`
`79`	`79`	`$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));`
	`80`	`+ } elseif (0 === strpos($class, 'Tests\\')) {`
	`81`	`+ $mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);`
`80`	`82`	`}`
`81`	`83`	`foreach ($mockedNs as $ns) {`
`82`	`84`	`if (function_exists($ns.'\time')) {`