Simplified true/false (#1398)

sreichel · kiatng · web-flow · commit 6f2c8eec3e17 · 2021-03-12T19:14:20.000+01:00
* Simplified true/false

* Update app/code/core/Mage/Api/Model/User.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

* Update app/code/core/Mage/Api/Model/User.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

* Update app/code/core/Mage/Admin/Model/User.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

* Update app/code/core/Mage/Core/Model/Config.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

* Update app/code/core/Mage/Admin/Model/User.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

* Update app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;

Co-authored-by: Ng Kiat Siong &lt;kiatsiong.ng@gmail.com&gt;
diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php
@@ -272,7 +272,7 @@ public function deleteFromRole()
     public function roleUserExists()
     {
         $result = $this->_getResource()->roleUserExists($this);
-        return (is_array($result) && count($result) > 0) ? true : false;
+        return is_array($result) && count($result) > 0;
     }
 
     /**
@@ -294,7 +294,7 @@ public function add()
     public function userExists()
     {
         $result = $this->_getResource()->userExists($this);
-        return (is_array($result) && count($result) > 0) ? true : false;
+        return is_array($result) && count($result) > 0;
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -242,7 +242,7 @@ protected function _getNodeJson($node, $level = 0)
         $allowMove = $this->_isCategoryMoveable($node);
         $item['allowDrop'] = $allowMove;
         // disallow drag if it's first level and category is root of a store
-        $item['allowDrag'] = $allowMove && (($node->getLevel()==1 && $rootForStores) ? false : true);
+        $item['allowDrag'] = $allowMove && !($node->getLevel() == 1 && $rootForStores);
 
         if ((int)$node->getChildrenCount()>0) {
             $item['children'] = array();
diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php
@@ -57,7 +57,7 @@ protected function _beforeToHtml()
                 'content'   => $this->getLayout()->createBlock('adminhtml/poll_edit_tab_answers')
                                 ->append($this->getLayout()->createBlock('adminhtml/poll_edit_tab_answers_list'))
                                 ->toHtml(),
-                'active'    => ( $this->getRequest()->getParam('tab') == 'answers_section' ) ? true : false,
+                'active'    => $this->getRequest()->getParam('tab') == 'answers_section',
             ));
         return parent::_beforeToHtml();
     }
diff --git a/app/code/core/Mage/Adminhtml/Model/Report/Item.php b/app/code/core/Mage/Adminhtml/Model/Report/Item.php
@@ -55,7 +55,7 @@ public function setChildren($children)
 
     public function hasChildren()
     {
-        return (count($this->_children) > 0) ? true : false;
+        return count($this->_children) > 0;
     }
 
     public function addChild($child)
diff --git a/app/code/core/Mage/Api/Model/Resource/Roles.php b/app/code/core/Mage/Api/Model/Resource/Roles.php
@@ -147,6 +147,6 @@ private function _updateRoleUsersAcl(Mage_Api_Model_Roles $role)
                 array('user_id IN(?)' => $users)
             );
         }
-        return ($rowsCount > 0) ? true : false;
+        return $rowsCount > 0;
     }
 }
diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php
@@ -176,7 +176,7 @@ public function deleteFromRole()
     public function roleUserExists()
     {
         $result = $this->_getResource()->roleUserExists($this);
-        return ( is_array($result) && count($result) > 0 ) ? true : false;
+        return is_array($result) && count($result) > 0;
     }
 
     /**
@@ -198,7 +198,7 @@ public function add()
     public function userExists()
     {
         $result = $this->_getResource()->userExists($this);
-        return ( is_array($result) && count($result) > 0 ) ? true : false;
+        return is_array($result) && count($result) > 0;
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
@@ -396,7 +396,7 @@ public function getProductsSalableStatus($products, Mage_Core_Model_Website $web
         $query = $read->query($select, $bind);
         while ($row = $query->fetch()) {
             $salable = isset($row['salable']) ? $row['salable'] : true;
-            $website = $row['website_id'] > 0 ? true : false;
+            $website = $row['website_id'] > 0;
             $status  = $row['status'];
 
             $productsData[$row['entity_id']] = $salable && $status && $website;
diff --git a/app/code/core/Mage/Centinel/Model/Api/Client.php b/app/code/core/Mage/Centinel/Model/Api/Client.php
@@ -55,7 +55,7 @@ public function sendHttp($url, $connectTimeout = "", $timeout)
 
             // Execute the request.
             $result = curl_exec($ch);
-            $succeeded = curl_errno($ch) == 0 ? true : false;
+            $succeeded = curl_errno($ch) == 0;
 
             // close cURL resource, and free up system resources
             curl_close($ch);
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
@@ -833,7 +833,7 @@ protected function _loadDeclaredModules($mergeConfig = null)
             $moduleDepends[$moduleName] = array(
                 'module'    => $moduleName,
                 'depends'   => $depends,
-                'active'    => ('true' === (string)$moduleNode->active ? true : false),
+                'active'    => (string)$moduleNode->active === 'true',
             );
         }
 
diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php
@@ -1194,7 +1194,7 @@ public function useSessionIdForUrl($secure = false)
      */
     public function sessionVarCallback($match)
     {
-        if ($this->useSessionIdForUrl($match[2] == 'S' ? true : false)) {
+        if ($this->useSessionIdForUrl($match[2] == 'S')) {
             $session = Mage::getSingleton('core/session');
             /* @var Mage_Core_Model_Session $session */
             return $match[1]
diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php
@@ -113,8 +113,8 @@ public function getFormats()
                 $path = sprintf('%s%s', self::XML_PATH_ADDRESS_TEMPLATE, $typeCode);
                 $type = new Varien_Object();
                 $htmlEscape = strtolower($typeConfig->htmlEscape);
-                $htmlEscape = $htmlEscape == 'false' || $htmlEscape == '0' || $htmlEscape == 'no'
-                        || !strlen($typeConfig->htmlEscape) ? false : true;
+                $htmlEscape = !($htmlEscape == 'false' || $htmlEscape == '0' || $htmlEscape == 'no'
+                    || !strlen($typeConfig->htmlEscape));
                 $type->setCode($typeCode)
                     ->setTitle((string)$typeConfig->title)
                     ->setDefaultFormat(Mage::getStoreConfig($path, $store))
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -1003,7 +1003,7 @@ public function editPostAction()
                 }
 
                 // If email change was requested then set flag
-                $isChangeEmail = ($customer->getOldEmail() != $customer->getEmail()) ? true : false;
+                $isChangeEmail = $customer->getOldEmail() != $customer->getEmail();
                 $customer->setIsChangeEmail($isChangeEmail);
 
                 // If password change was requested then add it to common validation scheme
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -87,7 +87,7 @@ public function parse()
 
         $batchIoAdapter->open(false);
 
-        $isFieldNames = $this->getVar('fieldnames', '') == 'true' ? true : false;
+        $isFieldNames = $this->getVar('fieldnames', '') == 'true';
         if (!$isFieldNames && is_array($this->getVar('map'))) {
             $fieldNames = $this->getVar('map');
         }
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -87,7 +87,7 @@ public function parse()
 
         $batchIoAdapter->open(false);
 
-        $isFieldNames = $this->getVar('fieldnames', '') == 'true' ? true : false;
+        $isFieldNames = $this->getVar('fieldnames', '') == 'true';
         if (!$isFieldNames && is_array($this->getVar('map'))) {
             $this->_parseFieldNames = $this->getVar('map');
         }
diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php
@@ -331,7 +331,7 @@ public function subscribe($email)
             $this->setSubscriberConfirmCode($this->randomSequence());
         }
 
-        $isConfirmNeed   = (Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1) ? true : false;
+        $isConfirmNeed   = Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1;
         $isOwnSubscribes = false;
         $ownerId = Mage::getModel('customer/customer')
             ->setWebsiteId(Mage::app()->getStore()->getWebsiteId())
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -360,7 +360,7 @@ protected function _getOrderFromResponse()
             Mage::throwException($response->getRespmsg());
         }
 
-        $amountCompared = ($response->getAmt() == $order->getPayment()->getBaseAmountAuthorized()) ? true : false;
+        $amountCompared = $response->getAmt() == $order->getPayment()->getBaseAmountAuthorized();
         if (!$order->getId()
             || $order->getState() != Mage_Sales_Model_Order::STATE_PENDING_PAYMENT
             || !$amountCompared
diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
@@ -160,7 +160,7 @@ public function verifyToken()
     public function canPerformAction($customerIdSession)
     {
         // Get the customer id from billing agreement and compare to logged in customer id
-        return ((int)$this->getCustomerId() === (int)$customerIdSession) ? true : false;
+        return (int)$this->getCustomerId() === (int)$customerIdSession;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public function deleteFromRole()`
`272`	`272`	`public function roleUserExists()`
`273`	`273`	`{`
`274`	`274`	`$result = $this->_getResource()->roleUserExists($this);`
`275`		`- return (is_array($result) && count($result) > 0) ? true : false;`
	`275`	`+ return is_array($result) && count($result) > 0;`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/**`
`@@ -294,7 +294,7 @@ public function add()`
`294`	`294`	`public function userExists()`
`295`	`295`	`{`
`296`	`296`	`$result = $this->_getResource()->userExists($this);`
`297`		`- return (is_array($result) && count($result) > 0) ? true : false;`
	`297`	`+ return is_array($result) && count($result) > 0;`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected function _beforeToHtml()`
`57`	`57`	`'content' => $this->getLayout()->createBlock('adminhtml/poll_edit_tab_answers')`
`58`	`58`	`->append($this->getLayout()->createBlock('adminhtml/poll_edit_tab_answers_list'))`
`59`	`59`	`->toHtml(),`
`60`		`- 'active' => ( $this->getRequest()->getParam('tab') == 'answers_section' ) ? true : false,`
	`60`	`+ 'active' => $this->getRequest()->getParam('tab') == 'answers_section',`
`61`	`61`	`));`
`62`	`62`	`return parent::_beforeToHtml();`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function setChildren($children)`
`55`	`55`
`56`	`56`	`public function hasChildren()`
`57`	`57`	`{`
`58`		`- return (count($this->_children) > 0) ? true : false;`
	`58`	`+ return count($this->_children) > 0;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function addChild($child)`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,6 @@ private function _updateRoleUsersAcl(Mage_Api_Model_Roles $role)`
`147`	`147`	`array('user_id IN(?)' => $users)`
`148`	`148`	`);`
`149`	`149`	`}`
`150`		`- return ($rowsCount > 0) ? true : false;`
	`150`	`+ return $rowsCount > 0;`
`151`	`151`	`}`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function deleteFromRole()`
`176`	`176`	`public function roleUserExists()`
`177`	`177`	`{`
`178`	`178`	`$result = $this->_getResource()->roleUserExists($this);`
`179`		`- return ( is_array($result) && count($result) > 0 ) ? true : false;`
	`179`	`+ return is_array($result) && count($result) > 0;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/**`
`@@ -198,7 +198,7 @@ public function add()`
`198`	`198`	`public function userExists()`
`199`	`199`	`{`
`200`	`200`	`$result = $this->_getResource()->userExists($this);`
`201`		`- return ( is_array($result) && count($result) > 0 ) ? true : false;`
	`201`	`+ return is_array($result) && count($result) > 0;`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -833,7 +833,7 @@ protected function _loadDeclaredModules($mergeConfig = null)`
`833`	`833`	`$moduleDepends[$moduleName] = array(`
`834`	`834`	`'module' => $moduleName,`
`835`	`835`	`'depends' => $depends,`
`836`		`- 'active' => ('true' === (string)$moduleNode->active ? true : false),`
	`836`	`+ 'active' => (string)$moduleNode->active === 'true',`
`837`	`837`	`);`
`838`	`838`	`}`
`839`	`839`
Original file line number	Diff line number	Diff line change
`@@ -1194,7 +1194,7 @@ public function useSessionIdForUrl($secure = false)`
`1194`	`1194`	`*/`
`1195`	`1195`	`public function sessionVarCallback($match)`
`1196`	`1196`	`{`
`1197`		`- if ($this->useSessionIdForUrl($match[2] == 'S' ? true : false)) {`
	`1197`	`+ if ($this->useSessionIdForUrl($match[2] == 'S')) {`
`1198`	`1198`	`$session = Mage::getSingleton('core/session');`
`1199`	`1199`	`/* @var Mage_Core_Model_Session $session */`
`1200`	`1200`	`return $match[1]`