Commit101b608

authored and

committed

Handles null file in createrequest bridge.

Fixed PHP 5.3.3 array syntax

1 parent3664dc0 commit101b608Copy full SHA for 101b608

File tree

+39

-1

lines changed

+39

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,10 @@ private function getFiles(array $uploadedFiles)`
`86`	`86`	`$files =array();`
`87`	`87`
`88`	`88`	`foreach ($uploadedFilesas$key =>$value) {`
	`89`	`+if ($value ===null) {`
	`90`	`+$files[$key] =newDiactorosUploadedFile(null,0,UPLOAD_ERR_NO_FILE,null,null);`
	`91`	`+continue;`
	`92`	`+ }`
`89`	`93`	`if ($valueinstanceof UploadedFile) {`
`90`	`94`	`$files[$key] =$this->createUploadedFile($value);`
`91`	`95`	`}else {`
`@@ -107,7 +111,7 @@ private function createUploadedFile(UploadedFile $symfonyUploadedFile)`
`107`	`111`	`{`
`108`	`112`	`returnnewDiactorosUploadedFile(`
`109`	`113`	`$symfonyUploadedFile->getRealPath(),`
`110`		`-$symfonyUploadedFile->getSize(),`
	`114`	`+$symfonyUploadedFile->getClientSize(),`
`111`	`115`	`$symfonyUploadedFile->getError(),`
`112`	`116`	`$symfonyUploadedFile->getClientOriginalName(),`
`113`	`117`	`$symfonyUploadedFile->getClientMimeType()`

Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,38 @@ public function testCreateResponseFromBinaryFile()`
`161`	`161`
`162`	`162`	`$this->assertEquals('Binary',$psrResponse->getBody()->__toString());`
`163`	`163`	`}`
	`164`	`+`
	`165`	`+publicfunctiontestUploadErrNoFile()`
	`166`	`+ {`
	`167`	`+$file =newUploadedFile(null,null,null,0,UPLOAD_ERR_NO_FILE,true);`
	`168`	`+$this->assertEquals(0,$file->getSize());`
	`169`	`+$this->assertEquals(UPLOAD_ERR_NO_FILE,$file->getError());`
	`170`	`+`
	`171`	`+// SplFile returns false on error`
	`172`	`+$this->assertEquals('boolean',gettype(($file->getSize())));`
	`173`	`+$this->assertFalse($file->getSize());`
	`174`	`+`
	`175`	`+// This is an integer, oddly enough internally size is declared as a string`
	`176`	`+$this->assertTrue(is_int($file->getClientSize()));`
	`177`	`+`
	`178`	`+$request =newRequest(array(),array(),array(),array(),`
	`179`	`+array(`
	`180`	`+'f1' =>$file,`
	`181`	`+'f2' =>array('name' =>null,'type' =>null,'tmp_name' =>null,'error' =>UPLOAD_ERR_NO_FILE,'size' =>0),`
	`182`	`+ ),`
	`183`	`+array(`
	`184`	`+'REQUEST_METHOD' =>'POST',`
	`185`	`+'HTTP_HOST' =>'dunglas.fr',`
	`186`	`+'HTTP_X_SYMFONY' =>'2.8',`
	`187`	`+ ),`
	`188`	`+'Content'`
	`189`	`+ );`
	`190`	`+`
	`191`	`+$psrRequest =$this->factory->createRequest($request);`
	`192`	`+`
	`193`	`+$uploadedFiles =$psrRequest->getUploadedFiles();`
	`194`	`+`
	`195`	`+$this->assertEquals(UPLOAD_ERR_NO_FILE,$uploadedFiles['f1']->getError());`
	`196`	`+$this->assertEquals(UPLOAD_ERR_NO_FILE,$uploadedFiles['f2']->getError());`
	`197`	`+ }`
`164`	`198`	`}`

Comments

(0)