Rector: CQ - SimplifyIfReturnBoolRector

.ddev/commands/web/rector

@@ -4,5 +4,4 @@
 ## Usage: rector
 ## Example: ddev rector <path-to-files>
 
-cp -n vendor/sreichel/openmage-rector/rector.php rector.php
 php vendor/bin/rector process "$@"

.github/labeler.yml

@@ -897,6 +897,7 @@
       dev/test/*,
       dev/phpunit*,
       dev/sonar*,
+      phpunit*,
       .github/workflows/phpunit.yml,
       .github/workflows/sonar.yml
     ]
@@ -907,3 +908,10 @@
       .ddev/*,
       .ddev/**/*
     ]
+
+'rector':
+  - changed-files:
+      - any-glob-to-any-file: [
+        rector.php,
+        .github/workflows/rector.yml
+      ]

.github/workflows/check-files.yml

@@ -87,6 +87,7 @@ jobs:
             **phpcs**
             **php-cs-fixer**
             **phpstan**
+            rector.php
             dev/tests/
             dev/phpunit*
             dev/sonar*

.github/workflows/rector.yml

@@ -0,0 +1,37 @@
+name: Rector
+
+on:
+  workflow_call:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  rector:
+    name: Validation
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
+
+      - name: Rector
+        run: php vendor/bin/rector process --dry-run

.github/workflows/workflow.yml

@@ -106,6 +106,14 @@ jobs:
     if: needs.check.outputs.xml > 0
     uses: ./.github/workflows/syntax-xml.yml
 
+  rector:
+    name: Rector
+    needs: [check, phpcs, php-cs-fixer]
+    if: |
+      needs.check.outputs.php > 0 ||
+      needs.check.outputs.workflow > 0
+    uses: ./.github/workflows/rector.yml
+
   # DOES NOT run by default
   # runs on schedule or when worklfow or unit tests changed
   sonar:

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

@@ -696,11 +696,7 @@ public function isResetPasswordLinkTokenExpired()
         }
 
         $hoursDifference = floor(($currentTimestamp - $tokenTimestamp) / (60 * 60));
-        if ($hoursDifference >= $tokenExpirationPeriod) {
-            return true;
-        }
-
-        return false;
+        return $hoursDifference >= $tokenExpirationPeriod;
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php

@@ -55,10 +55,7 @@ public function getCategoryPath()
     public function hasStoreRootCategory()
     {
         $root = $this->getRoot();
-        if ($root && $root->getId()) {
-            return true;
-        }
-        return false;
+        return $root && $root->getId();
     }
 
     public function getStore()

app/code/core/Mage/Adminhtml/Block/Catalog/Product.php

@@ -73,9 +73,6 @@ public function getGridHtml()
      */
     public function isSingleStoreMode()
     {
-        if (!Mage::app()->isSingleStoreMode()) {
-            return false;
-        }
-        return true;
+        return Mage::app()->isSingleStoreMode();
     }
 }

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php

@@ -112,10 +112,7 @@ public function isReadonly()
 
     public function isNew()
     {
-        if ($this->getProduct()->getId()) {
-            return false;
-        }
-        return true;
+        return !$this->getProduct()->getId();
     }
 
     public function getFieldSuffix()

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php

@@ -309,10 +309,7 @@ public function isScopeGlobal()
      */
     public function isShowWebsiteColumn()
     {
-        if ($this->isScopeGlobal() || Mage::app()->isSingleStoreMode()) {
-            return false;
-        }
-        return true;
+        return !($this->isScopeGlobal() || Mage::app()->isSingleStoreMode());
     }
 
     /**
@@ -322,9 +319,6 @@ public function isShowWebsiteColumn()
      */
     public function isAllowChangeWebsite()
     {
-        if (!$this->isShowWebsiteColumn() || $this->getProduct()->getStoreId()) {
-            return false;
-        }
-        return true;
+        return !(!$this->isShowWebsiteColumn() || $this->getProduct()->getStoreId());
     }
 }

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php

@@ -56,11 +56,7 @@ public function getLabel()
      */
     public function canDisplayUseDefault($attribute)
     {
-        if (!$attribute->isScopeGlobal() && $this->getDataObject()->getStoreId()) {
-            return true;
-        }
-
-        return false;
+        return !$attribute->isScopeGlobal() && $this->getDataObject()->getStoreId();
     }
 
     /**
@@ -161,12 +157,7 @@ public function getAttributeReadonly($attribute)
         if (is_object($attribute)) {
             $attribute = $attribute->getAttributeCode();
         }
-
-        if ($this->getDataObject()->isLockedAttribute($attribute)) {
-            return true;
-        }
-
-        return false;
+        return $this->getDataObject()->isLockedAttribute($attribute);
     }
 
     public function toHtml()

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php

@@ -224,21 +224,15 @@ public function getTabTitle()
      */
     public function canShowTab()
     {
-        if (Mage::registry('current_customer')->getId()) {
-            return true;
-        }
-        return false;
+        return (bool) Mage::registry('current_customer')->getId();
     }
 
     /**
      * @return bool
      */
     public function isHidden()
     {
-        if (Mage::registry('current_customer')->getId()) {
-            return false;
-        }
-        return true;
+        return !Mage::registry('current_customer')->getId();
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Denied.php

@@ -22,9 +22,6 @@ class Mage_Adminhtml_Block_Denied extends Mage_Adminhtml_Block_Template
     public function hasAvailaleResources()
     {
         $user = Mage::getSingleton('admin/session')->getUser();
-        if ($user && $user->hasAvailableResources()) {
-            return true;
-        }
-        return false;
+        return $user && $user->hasAvailableResources();
     }
 }

app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php

@@ -53,13 +53,8 @@ public function isShow()
         if ($this->getRequest()->getControllerName() === 'notification') {
             return false;
         }
-        if ($this->getCriticalCount() == 0 && $this->getMajorCount() == 0 && $this->getMinorCount() == 0
-            && $this->getNoticeCount() == 0
-        ) {
-            return false;
-        }
-
-        return true;
+        return !($this->getCriticalCount() == 0 && $this->getMajorCount() == 0 && $this->getMinorCount() == 0
+            && $this->getNoticeCount() == 0);
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php

@@ -562,10 +562,7 @@ public function canShipPartially($order = null)
             $order = Mage::registry('current_shipment')->getOrder();
         }
         $value = $order->getCanShipPartially();
-        if (!is_null($value) && !$value) {
-            return false;
-        }
-        return true;
+        return !(!is_null($value) && !$value);
     }
 
     /**
@@ -580,17 +577,11 @@ public function canShipPartiallyItem($order = null)
             $order = Mage::registry('current_shipment')->getOrder();
         }
         $value = $order->getCanShipPartiallyItem();
-        if (!is_null($value) && !$value) {
-            return false;
-        }
-        return true;
+        return !(!is_null($value) && !$value);
     }
 
     public function isShipmentRegular()
     {
-        if (!$this->canShipPartiallyItem() || !$this->canShipPartially()) {
-            return false;
-        }
-        return true;
+        return !(!$this->canShipPartiallyItem() || !$this->canShipPartially());
     }
 }

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php

@@ -40,10 +40,7 @@ protected function _canUseMethod($method)
     public function hasMethods()
     {
         $methods = $this->getMethods();
-        if (is_array($methods) && count($methods)) {
-            return true;
-        }
-        return false;
+        return is_array($methods) && count($methods);
     }
 
     /**
@@ -86,9 +83,6 @@ public function hasSsCardType()
     {
         $availableTypes = explode(',', $this->getQuote()->getPayment()->getMethod()->getConfigData('cctypes'));
         $ssPresenations = array_intersect(['SS', 'SM', 'SO'], $availableTypes);
-        if ($availableTypes && count($ssPresenations) > 0) {
-            return true;
-        }
-        return false;
+        return $availableTypes && count($ssPresenations) > 0;
     }
 }

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php

@@ -53,9 +53,6 @@ public function getCommentNote()
     public function getNoteNotify()
     {
         $notify = $this->getQuote()->getCustomerNoteNotify();
-        if (is_null($notify) || $notify) {
-            return true;
-        }
-        return false;
+        return is_null($notify) || $notify;
     }
 }

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php

@@ -102,10 +102,7 @@ public function hasInvoiceShipmentTypeMismatch()
     public function canShipPartiallyItem()
     {
         $value = $this->getOrder()->getCanShipPartiallyItem();
-        if (!is_null($value) && !$value) {
-            return false;
-        }
-        return true;
+        return !(!is_null($value) && !$value);
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php

@@ -231,10 +231,7 @@ public function displayCustomsValue()
             $storeId
         );
         $recipientAddressCountryCode = $address->getCountryId();
-        if ($shipperAddressCountryCode != $recipientAddressCountryCode) {
-            return true;
-        }
-        return false;
+        return $shipperAddressCountryCode != $recipientAddressCountryCode;
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php

@@ -68,10 +68,7 @@ public function displayCustomsValue()
             $storeId
         );
         $recipientAddressCountryCode = $address->getCountryId();
-        if ($shipperAddressCountryCode != $recipientAddressCountryCode) {
-            return true;
-        }
-        return false;
+        return $shipperAddressCountryCode != $recipientAddressCountryCode;
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

@@ -565,10 +565,7 @@ public function canUseDefaultValue($field)
         if ($this->getScope() == self::SCOPE_STORES && $field) {
             return true;
         }
-        if ($this->getScope() == self::SCOPE_WEBSITES && $field) {
-            return true;
-        }
-        return false;
+        return $this->getScope() == self::SCOPE_WEBSITES && $field;
     }
 
     /**
@@ -577,10 +574,7 @@ public function canUseDefaultValue($field)
      */
     public function canUseWebsiteValue($field)
     {
-        if ($this->getScope() == self::SCOPE_STORES && $field) {
-            return true;
-        }
-        return false;
+        return $this->getScope() == self::SCOPE_STORES && $field;
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Widget/Grid.php

@@ -1395,10 +1395,7 @@ public function getExcel($filename = '')
      */
     public function canDisplayContainer()
     {
-        if ($this->getRequest()->getQuery('ajax')) {
-            return false;
-        }
-        return true;
+        return !$this->getRequest()->getQuery('ajax');
     }
 
     /**
@@ -1817,10 +1814,7 @@ public function shouldRenderCell($item, $column)
         if ($this->isColumnGrouped($column) && $item->getIsEmpty()) {
             return true;
         }
-        if (!$item->getIsEmpty()) {
-            return true;
-        }
-        return false;
+        return !$item->getIsEmpty();
     }
 
     /**