Commit5ec5f40

committed

fix merge

1 parent28c0168 commit5ec5f40Copy full SHA for 5ec5f40

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class Image extends File`
`58`	`58`	`self::CORRUPTED_IMAGE_ERROR =>'CORRUPTED_IMAGE_ERROR',`
`59`	`59`	`];`
`60`	`60`
`61`		`-publicarray\|string$mimeTypes ='image/*';`
	`61`	`+publicarray\|string$mimeTypes =[];`
`62`	`62`	`public ?int$minWidth =null;`
`63`	`63`	`public ?int$maxWidth =null;`
`64`	`64`	`public ?int$maxHeight =null;`
`@@ -220,7 +220,7 @@ public function __construct(`
`220`	`220`	`$this->allowPortraitMessage =$allowPortraitMessage ??$this->allowPortraitMessage;`
`221`	`221`	`$this->corruptedMessage =$corruptedMessage ??$this->corruptedMessage;`
`222`	`222`
`223`		`-if (null ===$this->mimeTypes && [] ===$this->extensions) {`
	`223`	`+if ([] ===$this->mimeTypes && [] ===$this->extensions) {`
`224`	`224`	`$this->mimeTypes ='image/*';`
`225`	`225`	`}`
`226`	`226`

Comments

(0)