Cleanup after bump to Symfony v4.4

nicolas-grekas · nicolas-grekas · commit e9a9557fa6d1 · 2019-11-25T19:14:23.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ vendor/
 composer.lock
 phpunit.xml
 .php_cs.cache
+.phpunit.result.cache
diff --git a/Factory/HttpFoundationFactory.php b/Factory/HttpFoundationFactory.php
@@ -112,22 +112,10 @@ private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
             $clientFileName = $psrUploadedFile->getClientFilename();
         }
 
-        if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {
-            // Symfony 4.1+
-            return new UploadedFile(
-                $temporaryPath,
-                null === $clientFileName ? '' : $clientFileName,
-                $psrUploadedFile->getClientMediaType(),
-                $psrUploadedFile->getError(),
-                true
-            );
-        }
-
         return new UploadedFile(
             $temporaryPath,
             null === $clientFileName ? '' : $clientFileName,
             $psrUploadedFile->getClientMediaType(),
-            $psrUploadedFile->getSize(),
             $psrUploadedFile->getError(),
             true
         );
diff --git a/Tests/Factory/AbstractHttpMessageFactoryTest.php b/Tests/Factory/AbstractHttpMessageFactoryTest.php
@@ -132,12 +132,7 @@ private function createUploadedFile($content, $originalName, $mimeType, $error)
         $path = tempnam($this->tmpDir, uniqid());
         file_put_contents($path, $content);
 
-        if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {
-            // Symfony 4.1+
-            return new UploadedFile($path, $originalName, $mimeType, $error, true);
-        }
-
-        return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);
+        return new UploadedFile($path, $originalName, $mimeType, $error, true);
     }
 
     public function testCreateResponse()
@@ -189,12 +184,8 @@ public function testCreateResponseFromBinaryFile()
 
     public function testUploadErrNoFile()
     {
-        if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {
-            // Symfony 4.1+
-            $file = new UploadedFile('', '', null, UPLOAD_ERR_NO_FILE, true);
-        } else {
-            $file = new UploadedFile('', '', null, 0, UPLOAD_ERR_NO_FILE, true);
-        }
+        $file = new UploadedFile('', '', null, UPLOAD_ERR_NO_FILE, true);
+
         $this->assertEquals(0, $file->getSize());
         $this->assertEquals(UPLOAD_ERR_NO_FILE, $file->getError());
         $this->assertFalse($file->getSize(), 'SplFile::getSize() returns false on error');
diff --git a/Tests/Functional/CovertTest.php b/Tests/Functional/CovertTest.php
@@ -229,11 +229,6 @@ private function createUploadedFile($content, $originalName, $mimeType, $error)
         $path = tempnam($this->tmpDir, uniqid());
         file_put_contents($path, $content);
 
-        if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {
-            // Symfony 4.1+
-            return new UploadedFile($path, $originalName, $mimeType, $error, true);
-        }
-
-        return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);
+        return new UploadedFile($path, $originalName, $mimeType, $error, true);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -229,11 +229,6 @@ private function createUploadedFile($content, $originalName, $mimeType, $error)`
`229`	`229`	`$path = tempnam($this->tmpDir, uniqid());`
`230`	`230`	`file_put_contents($path, $content);`
`231`	`231`
`232`		`- if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {`
`233`		`- // Symfony 4.1+`
`234`		`- return new UploadedFile($path, $originalName, $mimeType, $error, true);`
`235`		`- }`
`236`		`-`
`237`		`- return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);`
	`232`	`+ return new UploadedFile($path, $originalName, $mimeType, $error, true);`
`238`	`233`	`}`
`239`	`234`	`}`