minor #15166 Mock microtime() and time() in transient tests (nicolas-grekas)

fabpot · fabpot · commit 6bcdee057e79 · 2015-07-01T19:11:21.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- Mock microtime() and time() in transient tests | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 8319ca3 Mock microtime() and time() in transient tests
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ClockMock.php b/src/Symfony/Component/HttpFoundation/Tests/ClockMock.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation;
+
+function time($asFloat = false)
+{
+    return Tests\time();
+}
+
+namespace Symfony\Component\HttpFoundation\Tests;
+
+function time()
+{
+    return $_SERVER['REQUEST_TIME'];
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\HttpFoundation\Cookie;
 
+require_once __DIR__.'/ClockMock.php';
+
 /**
  * CookieTest.
  *
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -14,6 +14,8 @@
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\Cookie;
 
+require_once __DIR__.'/ClockMock.php';
+
 class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Stopwatch/Tests/ClockMock.php b/src/Symfony/Component/Stopwatch/Tests/ClockMock.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Stopwatch;
+
+function microtime($asFloat = false)
+{
+    return Tests\microtime($asFloat);
+}
+
+namespace Symfony\Component\Stopwatch\Tests;
+
+function usleep($us)
+{
+    static $now;
+
+    if (null === $now) {
+        $now = \microtime(true);
+    }
+
+    return $now += $us / 1000000;
+}
+
+function microtime($asFloat = false)
+{
+    if (!$asFloat) {
+        return \microtime(false);
+    }
+
+    return usleep(1);
+}
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
+require_once __DIR__.'/ClockMock.php';
+
 /**
  * StopwatchEventTest.
  *
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\Stopwatch\Stopwatch;
 
+require_once __DIR__.'/ClockMock.php';
+
 /**
  * StopwatchTest.
  *

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpFoundation\Cookie;`
`15`	`15`
	`16`	`+require_once __DIR__.'/ClockMock.php';`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* CookieTest.`
`18`	`20`	`*`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`use Symfony\Component\HttpFoundation\ResponseHeaderBag;`
`15`	`15`	`use Symfony\Component\HttpFoundation\Cookie;`
`16`	`16`
	`17`	`+require_once __DIR__.'/ClockMock.php';`
	`18`	`+`
`17`	`19`	`class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase`
`18`	`20`	`{`
`19`	`21`	`/**`