Forward port zendframework/zendframework#2941

Maks3w · Maks3w · commit 07e1aabab426 · 2012-11-14T23:58:56.000+01:00
Conflicts:
	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
	library/Zend/Validator/File/ExcludeExtension.php
	library/Zend/Validator/File/ImageSize.php
	library/Zend/Validator/File/NotExists.php
diff --git a/src/File/ExcludeExtension.php b/src/File/ExcludeExtension.php
@@ -66,7 +66,7 @@ public function isValid($value)
         $extension  = substr($filename, strrpos($filename, '.') + 1);
         $extensions = $this->getExtension();
 
-        if ($this->getCase() and (!in_array($extension, $extensions))) {
+        if ($this->getCase() && (!in_array($extension, $extensions))) {
             return true;
         } elseif (!$this->getCase()) {
             foreach ($extensions as $ext) {
diff --git a/src/File/ImageSize.php b/src/File/ImageSize.php
@@ -351,7 +351,7 @@ public function isValid($value)
         $size = getimagesize($file);
         ErrorHandler::stop();
 
-        if (empty($size) or ($size[0] === 0) or ($size[1] === 0)) {
+        if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
             $this->error(self::NOT_DETECTED);
             return false;
         }
@@ -362,15 +362,15 @@ public function isValid($value)
             $this->error(self::WIDTH_TOO_SMALL);
         }
 
-        if (($this->getMaxWidth() !== null) and ($this->getMaxWidth() < $this->width)) {
+        if (($this->getMaxWidth() !== null) && ($this->getMaxWidth() < $this->width)) {
             $this->error(self::WIDTH_TOO_BIG);
         }
 
         if ($this->height < $this->getMinHeight()) {
             $this->error(self::HEIGHT_TOO_SMALL);
         }
 
-        if (($this->getMaxHeight() !== null) and ($this->getMaxHeight() < $this->height)) {
+        if (($this->getMaxHeight() !== null) && ($this->getMaxHeight() < $this->height)) {
             $this->error(self::HEIGHT_TOO_BIG);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public function isValid($value)`
`351`	`351`	`$size = getimagesize($file);`
`352`	`352`	`ErrorHandler::stop();`
`353`	`353`
`354`		`- if (empty($size) or ($size[0] === 0) or ($size[1] === 0)) {`
	`354`	`+ if (empty($size) \|\| ($size[0] === 0) \|\| ($size[1] === 0)) {`
`355`	`355`	`$this->error(self::NOT_DETECTED);`
`356`	`356`	`return false;`
`357`	`357`	`}`
`@@ -362,15 +362,15 @@ public function isValid($value)`
`362`	`362`	`$this->error(self::WIDTH_TOO_SMALL);`
`363`	`363`	`}`
`364`	`364`
`365`		`- if (($this->getMaxWidth() !== null) and ($this->getMaxWidth() < $this->width)) {`
	`365`	`+ if (($this->getMaxWidth() !== null) && ($this->getMaxWidth() < $this->width)) {`
`366`	`366`	`$this->error(self::WIDTH_TOO_BIG);`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`if ($this->height < $this->getMinHeight()) {`
`370`	`370`	`$this->error(self::HEIGHT_TOO_SMALL);`
`371`	`371`	`}`
`372`	`372`
`373`		`- if (($this->getMaxHeight() !== null) and ($this->getMaxHeight() < $this->height)) {`
	`373`	`+ if (($this->getMaxHeight() !== null) && ($this->getMaxHeight() < $this->height)) {`
`374`	`374`	`$this->error(self::HEIGHT_TOO_BIG);`
`375`	`375`	`}`
`376`	`376`