Merge branch '3.0'

nicolas-grekas · nicolas-grekas · commit 8e1c60af3c0a · 2016-04-01T10:39:52.000+02:00
* 3.0:
  [Intl] Fix int32 min boundary check
  [VarDumper] Relax tests to pass on appveyor
  Fixed the styles of the Symfony icon in the web debug toolbar
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="40" height="40" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24" height="24" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <path fill="#AAAAAA" d="M12,0.9C5.8,0.9,0.9,5.8,0.9,12s5,11.1,11.1,11.1s11.1-5,11.1-11.1S18.2,0.9,12,0.9z M18.5,6.9
     c-0.6,0-0.9-0.3-0.9-0.8c0-0.2,0-0.4,0.2-0.6c0.1-0.3,0.2-0.3,0.2-0.4c0-0.3-0.5-0.4-0.6-0.4c-1.8,0.1-2.3,2.5-2.7,4.4l-0.2,1
     c1,0.2,1.8,0,2.2-0.3c0.6-0.4-0.2-0.7-0.1-1.2c0.1-0.3,0.5-0.5,0.7-0.6c0.5,0,0.7,0.5,0.7,0.9c0,0.7-1,1.8-3,1.8
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -851,7 +851,7 @@ private function getInt64Value($value)
             return false;
         }
 
-        if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value <= -self::$int32Max - 1)) {
+        if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value < -self::$int32Max - 1)) {
             return (float) $value;
         }
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -57,12 +57,6 @@ public function getCastFileInfoTests()
   pathname: "https://google.com/about"
   extension: ""
   realPath: false
-  writable: false
-  readable: false
-  executable: false
-  file: false
-  dir: false
-  link: false
 %A}
 EOTXT
             ),

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ private function getInt64Value($value)`
`851`	`851`	`return false;`
`852`	`852`	`}`
`853`	`853`
`854`		`- if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max \|\| $value <= -self::$int32Max - 1)) {`
	`854`	`+ if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max \|\| $value < -self::$int32Max - 1)) {`
`855`	`855`	`return (float) $value;`
`856`	`856`	`}`
`857`	`857`