[HttpFoundation] fixed PHP 5.4 regression

fabpot · fabpot · commit 3043fa08784c · 2011-10-26T14:13:44.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -445,15 +445,16 @@ class File extends \SplFileInfo
     /**
      * Constructs a new file from the given path.
      *
-     * @param string $path The path to the file
+     * @param string  $path      The path to the file
+     * @param Boolean $checkPath Whether to check the path or not
      *
      * @throws FileNotFoundException If the given path is not a file
      *
      * @api
      */
-    public function __construct($path)
+    public function __construct($path, $checkPath = true)
     {
-        if (!is_file($path)) {
+        if ($checkPath && !is_file($path)) {
             throw new FileNotFoundException($path);
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -100,9 +100,7 @@ public function __construct($path, $originalName, $mimeType = null, $size = null
         $this->error = $error ?: UPLOAD_ERR_OK;
         $this->test = (Boolean) $test;
 
-        if (UPLOAD_ERR_OK === $this->error) {
-            parent::__construct($path);
-        }
+        parent::__construct($path, UPLOAD_ERR_OK === $this->error);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -445,15 +445,16 @@ class File extends \SplFileInfo`
`445`	`445`	`/**`
`446`	`446`	`* Constructs a new file from the given path.`
`447`	`447`	`*`
`448`		`- * @param string $path The path to the file`
	`448`	`+ * @param string $path The path to the file`
	`449`	`+ * @param Boolean $checkPath Whether to check the path or not`
`449`	`450`	`*`
`450`	`451`	`* @throws FileNotFoundException If the given path is not a file`
`451`	`452`	`*`
`452`	`453`	`* @api`
`453`	`454`	`*/`
`454`		`- public function __construct($path)`
	`455`	`+ public function __construct($path, $checkPath = true)`
`455`	`456`	`{`
`456`		`- if (!is_file($path)) {`
	`457`	`+ if ($checkPath && !is_file($path)) {`
`457`	`458`	`throw new FileNotFoundException($path);`
`458`	`459`	`}`
`459`	`460`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,7 @@ public function __construct($path, $originalName, $mimeType = null, $size = null`
`100`	`100`	`$this->error = $error ?: UPLOAD_ERR_OK;`
`101`	`101`	`$this->test = (Boolean) $test;`
`102`	`102`
`103`		`- if (UPLOAD_ERR_OK === $this->error) {`
`104`		`- parent::__construct($path);`
`105`		`- }`
	`103`	`+ parent::__construct($path, UPLOAD_ERR_OK === $this->error);`
`106`	`104`	`}`
`107`	`105`
`108`	`106`	`/**`