Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 7090495250a5 · 2018-06-21T13:10:19.000+02:00
* 2.8:
  [HttpKernel] fix test compat with PHP 5.3
  fix file lock on SunOS
  change `evaluate()` docblock return type from string to mixed
  Set serialize_precision explicitly to avoid fancy float rounding
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -71,7 +71,7 @@ public function compile($expression, $names = array())
      * @param Expression|string $expression The expression to compile
      * @param array             $values     An array of values
      *
-     * @return string The result of the evaluation of the expression
+     * @return mixed The result of the evaluation of the expression
      */
     public function evaluate($expression, $values = array())
     {
diff --git a/src/Symfony/Component/Filesystem/LockHandler.php b/src/Symfony/Component/Filesystem/LockHandler.php
@@ -81,12 +81,12 @@ public function lock($blocking = false)
             $error = $msg;
         });
 
-        if (!$this->handle = fopen($this->file, 'r')) {
+        if (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
             if ($this->handle = fopen($this->file, 'x')) {
                 chmod($this->file, 0444);
-            } elseif (!$this->handle = fopen($this->file, 'r')) {
+            } elseif (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
                 usleep(100); // Give some time for chmod() to complete
-                $this->handle = fopen($this->file, 'r');
+                $this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r');
             }
         }
         restore_error_handler();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -16,6 +16,15 @@
 
 class JsonResponseTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!defined('HHVM_VERSION')) {
+            $this->iniSet('serialize_precision', 14);
+        }
+    }
+
     public function testConstructorEmptyCreatesJsonObject()
     {
         $response = new JsonResponse();

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function compile($expression, $names = array())`
`71`	`71`	`* @param Expression\|string $expression The expression to compile`
`72`	`72`	`* @param array $values An array of values`
`73`	`73`	`*`
`74`		`- * @return string The result of the evaluation of the expression`
	`74`	`+ * @return mixed The result of the evaluation of the expression`
`75`	`75`	`*/`
`76`	`76`	`public function evaluate($expression, $values = array())`
`77`	`77`	`{`