Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit e3fa71c9f505 · 2017-09-15T12:58:45.000+02:00
* 3.3:
  fix merge
diff --git a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -256,7 +256,7 @@ function () {},
 
         // assertEquals() does not like NAN values.
         $this->assertEquals($array[$i][0], 'float');
-        $this->assertNan($array[$i++][1]);
+        $this->assertTrue(is_nan($array[$i++][1]));
     }
 
     public function testRecursionInArguments()

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ function () {},`
`256`	`256`
`257`	`257`	`// assertEquals() does not like NAN values.`
`258`	`258`	`$this->assertEquals($array[$i][0], 'float');`
`259`		`- $this->assertNan($array[$i++][1]);`
	`259`	`+ $this->assertTrue(is_nan($array[$i++][1]));`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`public function testRecursionInArguments()`