rector: RemoveNonExistingVarAnnotationRector (OpenMage#4999)

* rector: `RemoveNonExistingVarAnnotationRector`

* Update app/code/core/Mage/ProductAlert/controllers/AddController.php

Co-authored-by: Copilot <[email protected]>

* phpStan

* docblock

---------

Co-authored-by: Copilot <[email protected]>

Author: sreichel

.phpstan.dist.baseline.neon

@@ -1788,12 +1788,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Abstract.php
 
-		-
-			rawMessage: 'PHPDoc tag @var with type Mage_Catalog_Model_Entity_Attribute is not subtype of native type non-empty-array<mixed, mixed>.'
-			identifier: varTag.nativeType
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Resource/Abstract.php
-
 		-
 			rawMessage: 'Parameter #1 $object of method Mage_Catalog_Model_Resource_Abstract::load() expects Mage_Core_Model_Abstract, Varien_Object given.'
 			identifier: argument.type
@@ -4020,12 +4014,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ProductAlert/controllers/AddController.php
 
-		-
-			rawMessage: 'PHPDoc tag @var with type Mage_Catalog_Model_Product is not subtype of native type 0|0.0|''''|''0''|array{}|false|null.'
-			identifier: varTag.nativeType
-			count: 1
-			path: app/code/core/Mage/ProductAlert/controllers/AddController.php
-
 		-
 			rawMessage: 'Method Mage_Rating_Model_Resource_Rating_Collection::getItemById() invoked with 1 parameter, 0 required.'
 			identifier: arguments.count

.rector.php

@@ -94,10 +94,8 @@
             DeadCode\FunctionLike\RemoveDeadReturnRector::class, # todo: TMP
             DeadCode\If_\ReduceAlwaysFalseIfOrRector::class, # todo: TMP
             DeadCode\If_\RemoveAlwaysTrueIfConditionRector::class, # todo: TMP
-            DeadCode\If_\RemoveDeadInstanceOfRector::class, # todo: TMP
             DeadCode\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector::class, # todo: TMP
             DeadCode\If_\SimplifyIfElseWithSameContentRector::class, # todo: TMP
-            DeadCode\Node\RemoveNonExistingVarAnnotationRector::class, # todo: TMP  (!?!)
             DeadCode\Plus\RemoveDeadZeroAndOneOperationRector::class, # todo: TMP  (!?!)
             DeadCode\Property\RemoveUnusedPrivatePropertyRector::class, # todo: TMP
             DeadCode\PropertyProperty\RemoveNullPropertyInitializationRector::class, # todo: TMP

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php

@@ -37,8 +37,6 @@ class Mage_Catalog_Block_Seo_Sitemap_Tree_Category extends Mage_Catalog_Block_Se
      */
     protected function _prepareLayout()
     {
-        $helper = Mage::helper('catalog/category');
-        /** @var Mage_Catalog_Helper_Category $helper */
         $parent = Mage::getModel('catalog/category')
             ->setStoreId(Mage::app()->getStore()->getId())
             ->load(Mage::app()->getStore()->getRootCategoryId());

app/code/core/Mage/Catalog/Model/Resource/Abstract.php

@@ -588,8 +588,8 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         $adapter            = $this->_getReadAdapter();
         $getPerStore        = false;
 
+        /** @var Mage_Catalog_Model_Entity_Attribute $_attribute */
         foreach ($attribute as $_attribute) {
-            /** @var Mage_Catalog_Model_Entity_Attribute $attribute */
             $_attribute = $this->getAttribute($_attribute);
             if (!$_attribute) {
                 continue;

app/code/core/Mage/Eav/Model/Entity/Abstract.php

@@ -336,7 +336,7 @@ public function unsetAttributes($attributes = null)
      *
      * If attribute is not found false is returned
      *
-     * @param string|int|Mage_Core_Model_Config_Element $attribute
+     * @param string|int|Mage_Core_Model_Config_Element|Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @return Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Catalog_Model_Resource_Eav_Attribute|false
      */
     public function getAttribute($attribute)

app/code/core/Mage/ProductAlert/controllers/AddController.php

@@ -48,9 +48,9 @@ public function priceAction()
             return ;
         }
 
+        /** @var Mage_Catalog_Model_Product $product */
         $product = Mage::getModel('catalog/product')->load($productId);
         if (!$product->getId()) {
-            /** @var Mage_Catalog_Model_Product $product */
             $session->addError($this->__('Not enough parameters.'));
             if ($this->_isUrlInternal($backUrl)) {
                 $this->_redirectUrl($backUrl);
@@ -78,17 +78,19 @@ public function priceAction()
 
     public function stockAction()
     {
-        $session = Mage::getSingleton('catalog/session');
         /** @var Mage_Catalog_Model_Session $session */
+        $session = Mage::getSingleton('catalog/session');
         $backUrl    = $this->getRequest()->getParam(Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED);
         $productId  = (int) $this->getRequest()->getParam('product_id');
         if (!$backUrl || !$productId) {
             $this->_redirect('/');
             return ;
         }
 
-        if (!$product = Mage::getModel('catalog/product')->load($productId)) {
-            /** @var Mage_Catalog_Model_Product $product */
+        /** @var Mage_Catalog_Model_Product $product */
+        $product = Mage::getModel('catalog/product')->load($productId);
+
+        if (!$product->getId()) {
             $session->addError($this->__('Not enough parameters.'));
             $this->_redirectUrl($backUrl);
             return ;

app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php

@@ -37,12 +37,12 @@ public function priceAction()
             return;
         }
 
+        /** @var Mage_Catalog_Model_Session $session */
         $session    = Mage::getSingleton('catalog/session');
 
-        /** @var Mage_Catalog_Model_Session $session */
+        /** @var Mage_Catalog_Model_Product $product */
         $product = Mage::getModel('catalog/product')->load($productId);
         if (!$product->getId() || !$product->isVisibleInCatalog()) {
-            /** @var Mage_Catalog_Model_Product $product */
             Mage::getSingleton('customer/session')->addError($this->__('The product is not found.'));
             $this->_redirect('customer/account/');
             return ;

app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml

@@ -11,6 +11,5 @@
  * New directory template for Wysiwyg Images
  *
  * @see Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Newfolder
- * @var Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Newfolder $this 
  */
 ?>