set phpstan to bleedingEdge config

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

@@ -40,8 +40,9 @@ public function getCategory()
 
     public function getCategoryId()
     {
-        if ($this->getCategory()) {
-            return $this->getCategory()->getId();
+        $category = $this->getCategory();
+        if (is_object($category) && $category->getId()) {
+            return $category->getId();
         }
         return Mage_Catalog_Model_Category::TREE_ROOT_ID;
     }
@@ -93,8 +94,9 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
             $tree = Mage::getResourceSingleton('catalog/category_tree')
                 ->load(null, $recursionLevel);
 
-            if ($this->getCategory()) {
-                $tree->loadEnsuredNodes($this->getCategory(), $tree->getNodeById($rootId));
+            $category = $this->getCategory();
+            if (is_object($category) and $category->getId()) {
+                $tree->loadEnsuredNodes($category, $tree->getNodeById($rootId));
             }
 
             $tree->addCollectionData($this->getCategoryCollection());
@@ -132,9 +134,7 @@ public function getRootByIds($ids)
             $tree   = $categoryTreeResource->loadByIds($ids);
             $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
             $root   = $tree->getNodeById($rootId);
-            if ($root && $rootId != Mage_Catalog_Model_Category::TREE_ROOT_ID) {
-                $root->setIsVisible(true);
-            } elseif ($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) {
+            if ($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) {
                 $root->setName(Mage::helper('catalog')->__('Root'));
             }
 
@@ -148,9 +148,7 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
     {
         $tree = Mage::getResourceModel('catalog/category_tree');
 
-        $nodeId     = $parentNodeCategory->getId();
-        $parentId   = $parentNodeCategory->getParentId();
-
+        $nodeId = $parentNodeCategory->getId();
         $node = $tree->loadNode($nodeId);
         $node->loadChildren($recursionLevel);
 

app/code/core/Mage/Adminhtml/controllers/PollController.php

@@ -141,48 +141,44 @@ public function validateAction()
                     Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
                 }
 
-                if (is_array($stores)) {
-                    $storeIds = [];
-                    foreach ($stores as $storeIdList) {
-                        $storeIdList = explode(',', $storeIdList);
-                        if (!$storeIdList) {
-                            continue;
-                        }
-                        foreach ($storeIdList as $storeId) {
-                            if ($storeId > 0) {
-                                $storeIds[] = $storeId;
-                            }
-                        }
+                $storeIds = [];
+                foreach ($stores as $storeIdList) {
+                    $storeIdList = explode(',', $storeIdList);
+                    if (!$storeIdList) {
+                        continue;
                     }
-                    if (count($storeIds) === 0) {
-                        Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
+                    foreach ($storeIdList as $storeId) {
+                        if ($storeId > 0) {
+                            $storeIds[] = $storeId;
+                        }
                     }
-                    $pollModel->setStoreIds($storeIds);
                 }
+                if (count($storeIds) === 0) {
+                    Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
+                }
+                $pollModel->setStoreIds($storeIds);
 
                 $answers = $this->getRequest()->getParam('answer');
 
                 if (!is_array($answers) || !count($answers)) {
                     Mage::throwException(Mage::helper('adminhtml')->__('Please, add some answers to this poll first.'));
                 }
 
-                if (is_array($answers)) {
-                    $_titles = [];
-                    foreach ($answers as $key => $answer) {
-                        if (in_array($answer['title'], $_titles)) {
-                            Mage::throwException(Mage::helper('adminhtml')->__('Your answers contain duplicates.'));
-                        }
-                        $_titles[] = $answer['title'];
-
-                        $answerModel = Mage::getModel('poll/poll_answer');
-                        if ((int) $key > 0) {
-                            $answerModel->setId($key);
-                        }
-                        $answerModel->setAnswerTitle($answer['title'])
-                            ->setVotesCount($answer['votes']);
+                $_titles = [];
+                foreach ($answers as $key => $answer) {
+                    if (in_array($answer['title'], $_titles)) {
+                        Mage::throwException(Mage::helper('adminhtml')->__('Your answers contain duplicates.'));
+                    }
+                    $_titles[] = $answer['title'];
 
-                        $pollModel->addAnswer($answerModel);
+                    $answerModel = Mage::getModel('poll/poll_answer');
+                    if ((int) $key > 0) {
+                        $answerModel->setId($key);
                     }
+                    $answerModel->setAnswerTitle($answer['title'])
+                        ->setVotesCount($answer['votes']);
+
+                    $pollModel->addAnswer($answerModel);
                 }
 
                 $pollModel->save();

app/code/core/Mage/Api2/Model/Resource.php

@@ -765,12 +765,11 @@ protected function _applyFilter(Varien_Data_Collection_Db $collection)
         if (!is_array($filter)) {
             $this->_critical(self::RESOURCE_COLLECTION_FILTERING_ERROR);
         }
+
         if (method_exists($collection, 'addAttributeToFilter')) {
             $methodName = 'addAttributeToFilter';
-        } elseif (method_exists($collection, 'addFieldToFilter')) {
-            $methodName = 'addFieldToFilter';
         } else {
-            return $this;
+            $methodName = 'addFieldToFilter';
         }
         $allowedAttributes = $this->getFilter()->getAllowedAttributes(self::OPERATION_ATTRIBUTE_READ);
 

app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php

@@ -122,10 +122,6 @@ public function prepareTierPrices($product, $tierPrices = null)
             return null;
         }
 
-        if (!is_array($tierPrices)) {
-            $this->_fault('data_invalid', Mage::helper('catalog')->__('Invalid Tier Prices'));
-        }
-
         $updateValue = [];
 
         foreach ($tierPrices as $tierPrice) {

app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php

@@ -43,7 +43,7 @@ class Mage_CatalogSearch_Model_Resource_Fulltext_Collection extends Mage_Catalog
     /**
      * Sort order by relevance
      *
-     * @var null
+     * @var int
      */
     protected $_relevanceSortOrder = SORT_DESC;
 

app/code/core/Mage/Customer/Helper/Address.php

@@ -229,9 +229,7 @@ public function convertStreetLines($origStreets, $toCount)
                     --$modulo;
                 }
                 $values = array_slice($origStreets, $offset, $neededLinesCount);
-                if (is_array($values)) {
-                    $lines[] = implode(' ', $values);
-                }
+                $lines[] = implode(' ', $values);
             }
         }
 

app/code/core/Mage/Sales/controllers/DownloadController.php

@@ -169,7 +169,7 @@ public function downloadCustomOptionAction()
         $optionId = null;
         if (strpos($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX) === 0) {
             $optionId = str_replace(Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX, '', $option->getCode());
-            if ((int)$optionId != $optionId) {
+            if (!is_numeric($optionId)) {
                 $optionId = null;
             }
         }

app/code/core/Mage/Tax/Model/Resource/Calculation.php

@@ -307,7 +307,7 @@ protected function _getRates($request)
                 ->where("rate.tax_region_id IN(?)", [0, (int)$regionId]);
             $postcodeIsNumeric = is_numeric($postcode);
             $postcodeIsRange = false;
-            if (is_string($postcode) && preg_match('/^(.+)-(.+)$/', $postcode, $matches)) {
+            if (preg_match('/^(.+)-(.+)$/', $postcode, $matches)) {
                 if (is_numeric($matches[2]) && strlen($matches[2]) < 5) {
                     $postcodeIsNumeric = true;
                 } else {

app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php

@@ -1494,7 +1494,7 @@ protected function _formShipmentRequest(Varien_Object $request)
 
         $deliveryConfirmation = $packageParams->getDeliveryConfirmation();
         if ($deliveryConfirmation) {
-            /** @var SimpleXMLElement $serviceOptionsNode */
+            /** @var SimpleXMLElement|null $serviceOptionsNode */
             $serviceOptionsNode = null;
             switch ($this->_getDeliveryConfirmationLevel($request->getRecipientAddressCountryCode())) {
                 case self::DELIVERY_CONFIRMATION_PACKAGE:

app/code/core/Mage/Wishlist/controllers/IndexController.php

@@ -730,7 +730,7 @@ public function downloadCustomOptionAction()
         $optionId = null;
         if (strpos($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX) === 0) {
             $optionId = str_replace(Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX, '', $option->getCode());
-            if ((int)$optionId != $optionId) {
+            if (!is_numeric($optionId)) {
                 return $this->_forward('noRoute');
             }
         }

lib/Mage/HTTP/Client/Curl.php

@@ -104,7 +104,7 @@ class Mage_HTTP_Client_Curl implements Mage_HTTP_IClient
      * User ovverides options hash
      * Are applied before curl_exec
      *
-     * @var array();
+     * @var array
      */
     protected $_curlUserOptions = [];
 

lib/Varien/Data/Form/Element/Obscure.php

@@ -51,7 +51,7 @@ public function getEscapedValue($index = null)
     /**
      * Returns list of html attributes possible to output in HTML
      *
-     * @return array()
+     * @return array
      */
     public function getHtmlAttributes()
     {

lib/Varien/Image/Adapter/Gd2.php

@@ -440,8 +440,6 @@ public function watermark($watermarkImage, $positionX = 0, $positionY = 0, $wate
             'Unsupported watermark image format.'
         ), $watermarkImage);
 
-        $merged = false;
-
         if ($this->getWatermarkWidth() &&
             $this->getWatermarkHeigth() &&
             ($this->getWatermarkPosition() != self::POSITION_STRETCH)
@@ -559,7 +557,7 @@ public function watermark($watermarkImage, $positionX = 0, $positionY = 0, $wate
             );
         }
 
-        if ($repeat === false && $merged === false) {
+        if ($repeat === false) {
             imagecopymerge(
                 $this->_imageHandler,
                 $watermark,