Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f59a0baa95ec · 2015-07-01T20:24:26.000+02:00
* 2.7:
  Update DateTimeToArrayTransformer.php
  Mock microtime() and time() in transient tests
  Azerbaijani language pluralization rule
  Move HHVM tests out of the allowed failures
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,6 @@ matrix:
         - php: hhvm
     allow_failures:
         - php: nightly
-        - php: hhvm
     fast_finish: true
 
 services: mongodb
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -179,15 +179,16 @@ public function reverseTransform($value)
 
         try {
             $dateTime = new \DateTime(sprintf(
-                '%s-%s-%s %s:%s:%s %s',
+                '%s-%s-%s %s:%s:%s',
                 empty($value['year']) ? '1970' : $value['year'],
                 empty($value['month']) ? '1' : $value['month'],
                 empty($value['day']) ? '1' : $value['day'],
                 empty($value['hour']) ? '0' : $value['hour'],
                 empty($value['minute']) ? '0' : $value['minute'],
-                empty($value['second']) ? '0' : $value['second'],
-                $this->outputTimezone
-            ));
+                empty($value['second']) ? '0' : $value['second']
+                ),
+                new \DateTimeZone($this->outputTimezone)
+            );
 
             if ($this->inputTimezone !== $this->outputTimezone) {
                 $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
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.
  *
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -55,6 +55,7 @@ public static function get($number, $locale)
          * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
          */
         switch ($locale) {
+            case 'az':
             case 'bo':
             case 'dz':
             case 'id':
@@ -73,7 +74,6 @@ public static function get($number, $locale)
                 break;
 
             case 'af':
-            case 'az':
             case 'bn':
             case 'bg':
             case 'ca':

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`	`/**`