Merge commit 'refs/pull/2871/head' of github.com:zendframework/zf2 in…

…to hotfix/change-logical-operator
zendframework · Oct 31, 2012 · e26851e · e26851e
3 parents 4e4acfe + 9e243bd + c473039
commit e26851e
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;