Merge pull request zendframework/zendframework#7232 from 27cm/iif

Remove unnecessary ternary operators Conflicts: library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
zendframework · Feb 25, 2015 · a52775b · a52775b
commit a52775b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/Server.php b/src/Server.php
@@ -257,7 +257,7 @@ public function fault($fault = null, $code = 404)
      */
     public function setReturnResponse($flag = true)
     {
-        $this->returnResponse = ($flag) ? true : false;
+        $this->returnResponse = (bool) $flag;
         return $this;
     }
 

diff --git a/test/FaultTest.php b/test/FaultTest.php
@@ -190,20 +190,20 @@ protected function _testXmlFault($xml)
     {
         $sx = new \SimpleXMLElement($xml);
 
-        $this->assertTrue($sx->fault ? true : false, $xml);
-        $this->assertTrue($sx->fault->value ? true : false, $xml);
-        $this->assertTrue($sx->fault->value->struct ? true : false, $xml);
+        $this->assertTrue((bool) $sx->fault, $xml);
+        $this->assertTrue((bool) $sx->fault->value, $xml);
+        $this->assertTrue((bool) $sx->fault->value->struct, $xml);
         $count = 0;
         foreach ($sx->fault->value->struct->member as $member) {
             $count++;
-            $this->assertTrue($member->name ? true : false, $xml);
-            $this->assertTrue($member->value ? true : false, $xml);
+            $this->assertTrue((bool) $member->name, $xml);
+            $this->assertTrue((bool) $member->value, $xml);
             if ('faultCode' == (string) $member->name) {
-                $this->assertTrue($member->value->int ? true : false, $xml);
+                $this->assertTrue((bool) $member->value->int, $xml);
                 $this->assertEquals(1000, (int) $member->value->int, $xml);
             }
             if ('faultString' == (string) $member->name) {
-                $this->assertTrue($member->value->string ? true : false, $xml);
+                $this->assertTrue((bool) $member->value->string, $xml);
                 $this->assertEquals('Fault message', (string) $member->value->string, $xml);
             }
         }

diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -166,10 +166,10 @@ protected function _testXmlResponse($xml)
     {
         $sx = new \SimpleXMLElement($xml);
 
-        $this->assertTrue($sx->params ? true : false);
-        $this->assertTrue($sx->params->param ? true : false);
-        $this->assertTrue($sx->params->param->value ? true : false);
-        $this->assertTrue($sx->params->param->value->string ? true : false);
+        $this->assertTrue((bool) $sx->params);
+        $this->assertTrue((bool) $sx->params->param);
+        $this->assertTrue((bool) $sx->params->param->value);
+        $this->assertTrue((bool) $sx->params->param->value->string);
         $this->assertEquals('return value', (string) $sx->params->param->value->string);
     }