MAGETWO-63599: Check of image size is moved to _canProcess() method

MorozovaNP · stkorf · commit 346edaccad06 · 2019-06-10T13:14:31.000Z
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -307,7 +307,7 @@ public function getImageType()
         if ($this->_fileType) {
             return $this->_fileType;
         } else {
-            if ($this->_canProcess() && filesize($this->_fileName) > 0) {
+            if ($this->_canProcess()) {
                 list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);
                 return $this->_fileType;
             }
@@ -709,7 +709,7 @@ protected function _prepareDestination($destination = null, $newName = null)
      */
     protected function _canProcess()
     {
-        return !empty($this->_fileName);
+        return !empty($this->_fileName) && filesize($this->_fileName) > 0;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public function getImageType()`
`307`	`307`	`if ($this->_fileType) {`
`308`	`308`	`return $this->_fileType;`
`309`	`309`	`} else {`
`310`		`- if ($this->_canProcess() && filesize($this->_fileName) > 0) {`
	`310`	`+ if ($this->_canProcess()) {`
`311`	`311`	`list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);`
`312`	`312`	`return $this->_fileType;`
`313`	`313`	`}`
`@@ -709,7 +709,7 @@ protected function _prepareDestination($destination = null, $newName = null)`
`709`	`709`	`*/`
`710`	`710`	`protected function _canProcess()`
`711`	`711`	`{`
`712`		`- return !empty($this->_fileName);`
	`712`	`+ return !empty($this->_fileName) && filesize($this->_fileName) > 0;`
`713`	`713`	`}`
`714`	`714`
`715`	`715`	`/**`