rector: NumberCompareToMaxFuncCallRector (#4870)

- see https://getrector.com/rule-detail/number-compare-to-max-func-call-rector

Author: sreichel

.rector.php

@@ -64,7 +64,6 @@
             CodeQuality\If_\SimplifyIfReturnBoolRector::class,
             CodeQuality\Include_\AbsolutizeRequireAndIncludePathRector::class, # todo: TMP
             CodeQuality\Isset_\IssetOnPropertyObjectToPropertyExistsRector::class, # todo: TMP
-            CodeQuality\Ternary\NumberCompareToMaxFuncCallRector::class, # todo: TMP
             CodeQuality\Ternary\SwitchNegatedTernaryRector::class, # todo: TMP
             CodeQuality\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector::class, # todo: TMP
             CodeQuality\Ternary\UnnecessaryTernaryExpressionRector::class, # todo: TMP

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

@@ -790,6 +790,6 @@ public function getMinAdminPasswordLength()
     {
         $minLength = Mage::getStoreConfigAsInt(self::XML_PATH_MIN_ADMIN_PASSWORD_LENGTH);
         $absoluteMinLength = Mage_Core_Model_App::ABSOLUTE_MIN_PASSWORD_LENGTH;
-        return ($minLength < $absoluteMinLength) ? $absoluteMinLength : $minLength;
+        return max($absoluteMinLength, $minLength);
     }
 }

app/code/core/Mage/Core/Model/File/Storage/Database.php

@@ -160,8 +160,8 @@ public function importDirectories($dirs)
      */
     public function exportFiles($offset = 0, $count = 100)
     {
-        $offset = ((int) $offset >= 0) ? (int) $offset : 0;
-        $count  = ((int) $count >= 1) ? (int) $count : 1;
+        $offset = max((int) $offset, 0);
+        $count  = max((int) $count, 1);
 
         $result = $this->_getResource()->getFiles($offset, $count);
         if (empty($result)) {

app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php

@@ -144,8 +144,8 @@ public function createRecursive($path)
      */
     public function exportDirectories($offset = 0, $count = 100)
     {
-        $offset = ((int) $offset >= 0) ? (int) $offset : 0;
-        $count  = ((int) $count >= 1) ? (int) $count : 1;
+        $offset = max((int) $offset, 0);
+        $count  = max((int) $count, 1);
 
         $result = $this->_getResource()->exportDirectories($offset, $count);
 

app/code/core/Mage/Core/Model/File/Storage/File.php

@@ -111,8 +111,8 @@ public function collectData($offset = 0, $count = 100, $type = 'files')
             return false;
         }
 
-        $offset = ((int) $offset >= 0) ? (int) $offset : 0;
-        $count  = ((int) $count >= 1) ? (int) $count : 1;
+        $offset = max((int) $offset, 0);
+        $count  = max((int) $count, 1);
 
         if (is_null($this->_data)) {
             $this->_data = $this->getStorageData();

app/code/core/Mage/Customer/Model/Customer.php

@@ -1660,6 +1660,6 @@ public function getMinPasswordLength()
     {
         $minLength = Mage::getStoreConfigAsInt(self::XML_PATH_MIN_PASSWORD_LENGTH);
         $absoluteMinLength = Mage_Core_Model_App::ABSOLUTE_MIN_PASSWORD_LENGTH;
-        return ($minLength < $absoluteMinLength) ? $absoluteMinLength : $minLength;
+        return max($absoluteMinLength, $minLength);
     }
 }

app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php

@@ -104,7 +104,7 @@ protected function _getMultiSelectHtml(Mage_Eav_Model_Entity_Attribute $attribut
                 'name'         => $this->getFilterElementName($attribute->getAttributeCode()) . '[]',
                 'id'           => $this->getFilterElementId($attribute->getAttributeCode()),
                 'class'        => 'multiselect',
-                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : ($size < 2 ? 2 : $size))
+                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : (max(2, $size)))
                                 . '" style="width:280px"',
             ]);
             return $selectBlock->setOptions($options)->getHtml();
@@ -237,7 +237,7 @@ protected function _getMultiSelectHtmlWithValue(Mage_Eav_Model_Entity_Attribute
                 'name'         => $this->getFilterElementName($attribute->getAttributeCode()) . '[]',
                 'id'           => $this->getFilterElementId($attribute->getAttributeCode()),
                 'class'        => 'multiselect multiselect-export-filter',
-                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : ($size < 2 ? 2 : $size)),
+                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : (max(2, $size))),
             ]);
             return $selectBlock->setOptions($options)
                 ->setValue($value)

app/code/core/Mage/Persistent/Helper/Data.php

@@ -86,7 +86,7 @@ public function isShoppingCartPersist($store = null)
     public function getLifeTime($store = null)
     {
         $lifeTime = Mage::getStoreConfigAsInt(self::XML_PATH_LIFE_TIME, $store);
-        return ($lifeTime < 0) ? 0 : $lifeTime;
+        return max(0, $lifeTime);
     }
 
     /**

lib/Varien/Image/Adapter/Gd2.php

@@ -115,7 +115,7 @@ protected function _convertToByte($memoryValue)
         }
         $memoryValue = (int) $memoryValue;
 
-        return $memoryValue > 0 ? $memoryValue : 0;
+        return max($memoryValue, 0);
     }
 
     public function save($destination = null, $newName = null)