Merge pull request zendframework/zendframework#2941 branch 'hotfix/ch…

…ange-logical-operator'

src/File/ExcludeExtension.php

@@ -59,7 +59,7 @@ public function isValid($value, $file = null)
 
         $extensions = $this->getExtension();
 
-        if ($this->getCase() and (!in_array($info['extension'], $extensions))) {
+        if ($this->getCase() && (!in_array($info['extension'], $extensions))) {
             return true;
         } elseif (!$this->getCase()) {
             $found = false;

src/File/ImageSize.php

@@ -342,7 +342,7 @@ public function isValid($value, $file = null)
         ErrorHandler::stop();
         $this->setValue($file);
 
-        if (empty($size) or ($size[0] === 0) or ($size[1] === 0)) {
+        if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
             return $this->throwError($file, self::NOT_DETECTED);
         }
 
@@ -352,15 +352,15 @@ public function isValid($value, $file = null)
             $this->throwError($file, self::WIDTH_TOO_SMALL);
         }
 
-        if (($this->getMaxWidth() !== null) and ($this->getMaxWidth() < $this->width)) {
+        if (($this->getMaxWidth() !== null) && ($this->getMaxWidth() < $this->width)) {
             $this->throwError($file, self::WIDTH_TOO_BIG);
         }
 
         if ($this->height < $this->getMinHeight()) {
             $this->throwError($file, self::HEIGHT_TOO_SMALL);
         }
 
-        if (($this->getMaxHeight() !== null) and ($this->getMaxHeight() < $this->height)) {
+        if (($this->getMaxHeight() !== null) && ($this->getMaxHeight() < $this->height)) {
             $this->throwError($file, self::HEIGHT_TOO_BIG);
         }
 

src/File/NotExists.php

@@ -40,7 +40,7 @@ class NotExists extends Exists
     public function isValid($value, $file = null)
     {
         $directories = $this->getDirectory(true);
-        if (($file !== null) and (!empty($file['destination']))) {
+        if (($file !== null) && (!empty($file['destination']))) {
             $directories[] = $file['destination'];
         } elseif (!isset($file['name'])) {
             $file['name'] = $value;