Merge branch 'feature/7232' into develop

Close zendframework/zendframework#7232
zendframework · Feb 25, 2015 · 27f99e1 · 27f99e1
commit 27f99e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Adapter/DbTable/AbstractAdapter.php b/src/Adapter/DbTable/AbstractAdapter.php
@@ -148,7 +148,7 @@ public function setCredentialColumn($credentialColumn)
     public function setAmbiguityIdentity($flag)
     {
         if (is_int($flag)) {
-            $this->ambiguityIdentity = (1 === $flag ? true : false);
+            $this->ambiguityIdentity = (1 === $flag);
         } elseif (is_bool($flag)) {
             $this->ambiguityIdentity = $flag;
         }

diff --git a/src/Result.php b/src/Result.php
@@ -85,7 +85,7 @@ public function __construct($code, $identity, array $messages = array())
      */
     public function isValid()
     {
-        return ($this->code > 0) ? true : false;
+        return ($this->code > 0);
     }
 
     /**