Commite9a9557

committed

Cleanup after bump to Symfony v4.4

1 parent3d10a6c commite9a9557Copy full SHA for e9a9557

File tree

-30

lines changed

-30

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,22 +112,10 @@ private function createUploadedFile(UploadedFileInterface $psrUploadedFile)`
`112`	`112`	`$clientFileName =$psrUploadedFile->getClientFilename();`
`113`	`113`	`}`
`114`	`114`
`115`		`-if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {`
`116`		`-// Symfony 4.1+`
`117`		`-returnnewUploadedFile(`
`118`		`-$temporaryPath,`
`119`		`-null ===$clientFileName ?'' :$clientFileName,`
`120`		`-$psrUploadedFile->getClientMediaType(),`
`121`		`-$psrUploadedFile->getError(),`
`122`		`-true`
`123`		`- );`
`124`		`- }`
`125`		`-`
`126`	`115`	`returnnewUploadedFile(`
`127`	`116`	`$temporaryPath,`
`128`	`117`	`null ===$clientFileName ?'' :$clientFileName,`
`129`	`118`	`$psrUploadedFile->getClientMediaType(),`
`130`		`-$psrUploadedFile->getSize(),`
`131`	`119`	`$psrUploadedFile->getError(),`
`132`	`120`	`true`
`133`	`121`	`);`

Lines changed: 3 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,7 @@ private function createUploadedFile($content, $originalName, $mimeType, $error)`
`132`	`132`	`$path =tempnam($this->tmpDir,uniqid());`
`133`	`133`	`file_put_contents($path,$content);`
`134`	`134`
`135`		`-if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {`
`136`		`-// Symfony 4.1+`
`137`		`-returnnewUploadedFile($path,$originalName,$mimeType,$error,true);`
`138`		`- }`
`139`		`-`
`140`		`-returnnewUploadedFile($path,$originalName,$mimeType,filesize($path),$error,true);`
	`135`	`+returnnewUploadedFile($path,$originalName,$mimeType,$error,true);`
`141`	`136`	`}`
`142`	`137`
`143`	`138`	`publicfunctiontestCreateResponse()`
`@@ -189,12 +184,8 @@ public function testCreateResponseFromBinaryFile()`
`189`	`184`
`190`	`185`	`publicfunctiontestUploadErrNoFile()`
`191`	`186`	`{`
`192`		`-if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {`
`193`		`-// Symfony 4.1+`
`194`		`-$file =newUploadedFile('','',null,UPLOAD_ERR_NO_FILE,true);`
`195`		`- }else {`
`196`		`-$file =newUploadedFile('','',null,0,UPLOAD_ERR_NO_FILE,true);`
`197`		`- }`
	`187`	`+$file =newUploadedFile('','',null,UPLOAD_ERR_NO_FILE,true);`
	`188`	`+`
`198`	`189`	`$this->assertEquals(0,$file->getSize());`
`199`	`190`	`$this->assertEquals(UPLOAD_ERR_NO_FILE,$file->getError());`
`200`	`191`	`$this->assertFalse($file->getSize(),'SplFile::getSize() returns false on error');`

Lines changed: 1 addition & 6 deletions

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`		`-returnnewUploadedFile($path,$originalName,$mimeType,$error,true);`
`235`		`- }`
`236`		`-`
`237`		`-returnnewUploadedFile($path,$originalName,$mimeType,filesize($path),$error,true);`
	`232`	`+returnnewUploadedFile($path,$originalName,$mimeType,$error,true);`
`238`	`233`	`}`
`239`	`234`	`}`

Comments

(0)