Merge pull request zendframework/zendframework#2941 branch 'hotfix/change-logical-operator'

Maks3w · Maks3w · commit 4434323b5f6c · 2012-11-14T23:50:40.000+01:00
diff --git a/src/File/ExcludeExtension.php b/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;
diff --git a/src/File/ImageSize.php b/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);
         }
 
diff --git a/src/File/NotExists.php b/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;

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public function isValid($value, $file = null)`
`342`	`342`	`ErrorHandler::stop();`
`343`	`343`	`$this->setValue($file);`
`344`	`344`
`345`		`- if (empty($size) or ($size[0] === 0) or ($size[1] === 0)) {`
	`345`	`+ if (empty($size) \|\| ($size[0] === 0) \|\| ($size[1] === 0)) {`
`346`	`346`	`return $this->throwError($file, self::NOT_DETECTED);`
`347`	`347`	`}`
`348`	`348`
`@@ -352,15 +352,15 @@ public function isValid($value, $file = null)`
`352`	`352`	`$this->throwError($file, self::WIDTH_TOO_SMALL);`
`353`	`353`	`}`
`354`	`354`
`355`		`- if (($this->getMaxWidth() !== null) and ($this->getMaxWidth() < $this->width)) {`
	`355`	`+ if (($this->getMaxWidth() !== null) && ($this->getMaxWidth() < $this->width)) {`
`356`	`356`	`$this->throwError($file, self::WIDTH_TOO_BIG);`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`if ($this->height < $this->getMinHeight()) {`
`360`	`360`	`$this->throwError($file, self::HEIGHT_TOO_SMALL);`
`361`	`361`	`}`
`362`	`362`
`363`		`- if (($this->getMaxHeight() !== null) and ($this->getMaxHeight() < $this->height)) {`
	`363`	`+ if (($this->getMaxHeight() !== null) && ($this->getMaxHeight() < $this->height)) {`
`364`	`364`	`$this->throwError($file, self::HEIGHT_TOO_BIG);`
`365`	`365`	`}`
`366`	`366`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class NotExists extends Exists`
`40`	`40`	`public function isValid($value, $file = null)`
`41`	`41`	`{`
`42`	`42`	`$directories = $this->getDirectory(true);`
`43`		`- if (($file !== null) and (!empty($file['destination']))) {`
	`43`	`+ if (($file !== null) && (!empty($file['destination']))) {`
`44`	`44`	`$directories[] = $file['destination'];`
`45`	`45`	`} elseif (!isset($file['name'])) {`
`46`	`46`	`$file['name'] = $value;`