PHPStan Baseline: Mage_Wishlist

justinbeaty · justinbeaty · commit 806f7a2e8155 · 2025-03-13T09:11:34.000-07:00
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
@@ -35,11 +35,25 @@ public function __construct()
     #[\Override]
     protected function _prepareCollection()
     {
-        $collection = Mage::getModel('wishlist/item')->getCollection()
-            ->addCustomerIdFilter(Mage::registry('current_customer')->getId())
-            ->addDaysInWishlist(true)
-            ->addStoreData()
-            ->setInStockFilter(true);
+        $customer = Mage::registry('current_customer');
+        $storeIds = Mage::app()->getWebsite($this->getWebsiteId())->getStoreIds();
+
+        $wishlist = Mage::getModel('wishlist/wishlist')
+            ->setSharedStoreIds($storeIds)
+            ->loadByCustomer($customer, true);
+
+        if ($wishlist) {
+            $collection = $wishlist->getItemsCollection();
+        } else {
+            $collection = new Varien_Data_Collection();
+        }
+
+        $collection
+            ->setWebsiteId($customer->getWebsiteId())
+            ->setCustomerGroupId($customer->getGroupId())
+            ->resetSortOrder()
+            ->setDaysInWishlist(true)
+            ->addStoreData();
 
         $this->setCollection($collection);
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
@@ -90,7 +90,7 @@ protected function _prepareCollection()
             ->setWebsiteId($this->_getCustomer()->getWebsiteId())
             ->setCustomerGroupId($this->_getCustomer()->getGroupId())
             ->resetSortOrder()
-            ->addDaysInWishlist()
+            ->setDaysInWishlist(true)
             ->addStoreData();
 
         $this->setCollection($collection);
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
@@ -52,7 +52,7 @@ public function getItemCollection()
         if (is_null($collection)) {
             $collection = $this->getCreateOrderModel()->getCustomerWishlist(true);
             if ($collection) {
-                $collection = $collection->getItemCollection()->load();
+                $collection = $collection->getItemsCollection()->load();
             }
             $this->setData('item_collection', $collection);
         }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
@@ -38,7 +38,7 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController exte
     /**
      * Wishlist item we're working with
      *
-     * @var Mage_Wishlist_Model_Wishlist
+     * @var Mage_Wishlist_Model_Item
      */
     protected $_wishlistItem = null;
 
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
@@ -56,7 +56,7 @@ public function getWishlist()
         if (!$this->_wishlist) {
             $this->_wishlist = Mage::getModel('wishlist/wishlist')
                 ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer());
-            $this->_wishlist->getItemCollection()
+            $this->_wishlist->getItemsCollection()
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('price')
                 ->addAttributeToSelect('small_image')
@@ -67,7 +67,7 @@ public function getWishlist()
                 ->load();
         }
 
-        return $this->_wishlist->getItemCollection();
+        return $this->_wishlist->getItemsCollection();
     }
 
     /**
diff --git a/app/code/core/Mage/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php
@@ -104,7 +104,7 @@ protected function _prepareCollection($collection)
      */
     protected function _createWishlistItemCollection()
     {
-        return $this->_getWishlist()->getItemCollection();
+        return $this->_getWishlist()->getItemsCollection();
     }
 
     /**
diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php
@@ -109,7 +109,7 @@ public function getCacheTags()
         $helper = $this->helper('wishlist');
         $wishlist = $helper->getWishlist();
         $this->addModelTags($wishlist);
-        foreach ($wishlist->getItemCollection() as $item) {
+        foreach ($wishlist->getItemsCollection() as $item) {
             $this->addModelTags($item);
         }
         return parent::getCacheTags();
diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php
@@ -74,7 +74,7 @@ public function allcartAction()
         $hasOptions = [];
 
         $cart       = Mage::getSingleton('checkout/cart');
-        $collection = $wishlist->getItemCollection()
+        $collection = $wishlist->getItemsCollection()
                 ->setVisibilityFilter();
 
         $qtysString = $this->getRequest()->getParam('qty');
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -186,7 +186,7 @@ public function getItemCollection()
      */
     protected function _createWishlistItemCollection()
     {
-        return $this->getWishlist()->getItemCollection();
+        return $this->getWishlist()->getItemsCollection();
     }
 
     /**
diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php
@@ -104,9 +104,9 @@ public function processAddToCart($observer)
                 return;
             }
 
-            $wishlist->getItemCollection()->load();
+            $wishlist->getItemsCollection()->load();
 
-            foreach ($wishlist->getItemCollection() as $wishlistItem) {
+            foreach ($wishlist->getItemsCollection() as $wishlistItem) {
                 if ($wishlistItem->getId() == $wishlistId) {
                     $wishlistItem->delete();
                 }
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
@@ -113,14 +113,13 @@ protected function _afterLoad()
     {
         parent::_afterLoad();
 
-        /**
-         * Assign products
-         */
+        // Assign products
         $this->_assignOptions();
         $this->_assignProducts();
         $this->resetItemsDataChanged();
 
         $this->getPageSize();
+        $this->calculateDaysInWishlist();
 
         return $this;
     }
@@ -360,33 +359,44 @@ public function setInStockFilter($flag = true)
         return $this;
     }
 
+    /**
+     * Set add days in wishlist
+     */
+    public function setDaysInWishlist(bool $flag): self
+    {
+        $this->_addDaysInWishlist = $flag;
+        return $this;
+    }
+
     /**
      * Set add days in wishlist
      *
-     * This method appears in 1.5.0.0 in deprecated state, because:
-     * - we need it to make wishlist item collection interface as much as possible compatible with old
-     *   wishlist product collection
-     * - this method is useless because we can calculate days in php, and don't use MySQL for it
-     *
-     * @deprecated after 1.4.2.0
      * @return $this
+     * @deprecated use self::setDaysInWishlist($flag)
      */
     public function addDaysInWishlist()
     {
-        $this->_addDaysInWishlist = true;
-
-        $adapter = $this->getConnection();
-        $dateModel = Mage::getSingleton('core/date');
-        /** @var Mage_Core_Model_Resource_Helper_Mysql4 $resHelper */
-        $resHelper = Mage::getResourceHelper('core');
+        $this->setDaysInWishlist(true);
+        return $this;
+    }
 
-        $offsetFromDb = (int) $dateModel->getGmtOffset();
-        $startDate = $adapter->getDateAddSql('added_at', $offsetFromDb, Varien_Db_Adapter_Interface::INTERVAL_SECOND);
+    /**
+     * Calculate days in wishlist
+     *
+     * @return $this
+     */
+    protected function calculateDaysInWishlist(): self
+    {
+        if ($this->_addDaysInWishlist !== true) {
+            return $this;
+        }
 
-        $nowDate = $dateModel->date();
-        $dateDiff = $resHelper->getDateDiff($startDate, $adapter->formatDate($nowDate));
+        foreach ($this->getItems() as $item) {
+            $addedAt = new DateTimeImmutable($item->getAddedAt());
+            $now = new DateTimeImmutable('now');
+            $item->setDaysInWishlist($now->diff($addedAt)->format('%a'));
+        }
 
-        $this->getSelect()->columns(['days_in_wishlist' => $dateDiff]);
         return $this;
     }
 
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
@@ -112,30 +112,31 @@ public function resetSortOrder()
     }
 
     /**
-     * Add store data (days in wishlist)
+     * Add store data
      *
      * @return $this
      */
     public function addStoreData()
     {
-        $adapter = $this->getConnection();
-        if (!$this->getDaysInWishlist()) {
+        return $this;
+    }
+
+    /**
+     * Calculate days in wishlist
+     *
+     * @return $this
+     */
+    protected function calculateDaysInWishlist(): self
+    {
+        if ($this->_addDaysInWishlist !== true) {
             return $this;
         }
 
-        $this->setDaysInWishlist(false);
-
-        /** @var Mage_Core_Model_Resource_Helper_Mysql4 $resourceHelper */
-        $resourceHelper = Mage::getResourceHelper('core');
-        $nowDate = $adapter->formatDate(Mage::getSingleton('core/date')->date());
-
-        $this->joinField('store_name', 'core/store', 'name', 'store_id=item_store_id');
-        $this->joinField(
-            'days_in_wishlist',
-            'wishlist/item',
-            $resourceHelper->getDateDiff($this->_wishlistItemTableAlias . '.added_at', $nowDate),
-            'wishlist_item_id=wishlist_item_id',
-        );
+        foreach ($this->getItems() as $item) {
+            $addedAt = new DateTimeImmutable($item->getAddedAt());
+            $now = new DateTimeImmutable('now');
+            $item->setDaysInWishlist($now->diff($addedAt)->format('%a'));
+        }
 
         return $this;
     }
@@ -165,4 +166,17 @@ public function load($printQuery = false, $logQuery = false)
     {
         return $this;
     }
+
+    /**
+     * After load processing
+     *
+     * @return $this
+     */
+    #[\Override]
+    protected function _afterLoad()
+    {
+        parent::_afterLoad();
+        $this->calculateDaysInWishlist();
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -618,7 +618,7 @@ public function updateItem($itemId, $buyRequest, $params = null)
         $buyRequest = Mage::helper('catalog/product')->addParamsToBuyRequest($buyRequest, $params);
 
         $isForceSetQuantity = !array_any(
-            $this->getItemCollection()->getItems(),
+            $this->getItemsCollection()->getItems(),
             fn($wishlistItem) => $wishlistItem->getProductId() == $product->getId()
                 && $wishlistItem->representProduct($product)
                 && $wishlistItem->getId() != $item->getId(),
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -335,7 +335,7 @@ public function updateItemOptionsAction()
 
             Mage::helper('wishlist')->calculate();
             Mage::dispatchEvent('wishlist_update_item', [
-                'wishlist' => $wishlist, 'product' => $product, 'item' => $wishlist->getItem($id)]);
+                'wishlist' => $wishlist, 'product' => $product, 'item' => $wishlist->getItemById($id)]);
 
             Mage::helper('wishlist')->calculate();
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getItemCollection()`
`52`	`52`	`if (is_null($collection)) {`
`53`	`53`	`$collection = $this->getCreateOrderModel()->getCustomerWishlist(true);`
`54`	`54`	`if ($collection) {`
`55`		`- $collection = $collection->getItemCollection()->load();`
	`55`	`+ $collection = $collection->getItemsCollection()->load();`
`56`	`56`	`}`
`57`	`57`	`$this->setData('item_collection', $collection);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController exte`
`38`	`38`	`/**`
`39`	`39`	`* Wishlist item we're working with`
`40`	`40`	`*`
`41`		`- * @var Mage_Wishlist_Model_Wishlist`
	`41`	`+ * @var Mage_Wishlist_Model_Item`
`42`	`42`	`*/`
`43`	`43`	`protected $_wishlistItem = null;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ protected function _prepareCollection($collection)`
`104`	`104`	`*/`
`105`	`105`	`protected function _createWishlistItemCollection()`
`106`	`106`	`{`
`107`		`- return $this->_getWishlist()->getItemCollection();`
	`107`	`+ return $this->_getWishlist()->getItemsCollection();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function getCacheTags()`
`109`	`109`	`$helper = $this->helper('wishlist');`
`110`	`110`	`$wishlist = $helper->getWishlist();`
`111`	`111`	`$this->addModelTags($wishlist);`
`112`		`- foreach ($wishlist->getItemCollection() as $item) {`
	`112`	`+ foreach ($wishlist->getItemsCollection() as $item) {`
`113`	`113`	`$this->addModelTags($item);`
`114`	`114`	`}`
`115`	`115`	`return parent::getCacheTags();`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public function getItemCollection()`
`186`	`186`	`*/`
`187`	`187`	`protected function _createWishlistItemCollection()`
`188`	`188`	`{`
`189`		`- return $this->getWishlist()->getItemCollection();`
	`189`	`+ return $this->getWishlist()->getItemsCollection();`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ public function processAddToCart($observer)`
`104`	`104`	`return;`
`105`	`105`	`}`
`106`	`106`
`107`		`- $wishlist->getItemCollection()->load();`
	`107`	`+ $wishlist->getItemsCollection()->load();`
`108`	`108`
`109`		`- foreach ($wishlist->getItemCollection() as $wishlistItem) {`
	`109`	`+ foreach ($wishlist->getItemsCollection() as $wishlistItem) {`
`110`	`110`	`if ($wishlistItem->getId() == $wishlistId) {`
`111`	`111`	`$wishlistItem->delete();`
`112`	`112`	`}`