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

…ange-logical-operator'
zendframework · Oct 31, 2012 · d43a2da · d43a2da
3 parents 4e4acfe + 9e243bd + e26851e
commit d43a2da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/File/Exists.php b/src/File/Exists.php
@@ -145,7 +145,7 @@ public function addDirectory($directory)
     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;