Merge pull request #1467 from algolia/feature/MAGE-817

Update deprecated registry for current product
algolia · Feb 2, 2024 · f1ecc92 · f1ecc92
2 parents 702073a + ade1ec5
commit f1ecc92
Show file tree

Hide file tree

Showing 23 changed files with 235 additions and 106 deletions.
diff --git a/Block/Adminhtml/Category/Merchandising.php b/Block/Adminhtml/Category/Merchandising.php
@@ -6,15 +6,15 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Magento\Backend\Block\Template\Context;
 use Magento\Catalog\Model\Category;
-use Magento\Framework\Registry;
+use Algolia\AlgoliaSearch\Registry\CurrentCategory;
 
 class Merchandising extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'catalog/category/edit/merchandising.phtml';
 
-    /** @var Registry */
-    protected $registry;
+    /** @var CurrentCategory */
+    protected $currentCategory;
 
     /** @var ConfigHelper */
     private $configHelper;
@@ -27,19 +27,19 @@ class Merchandising extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param Registry $registry
+     * @param CurrentCategory $currentCategory
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        Registry $registry,
+        CurrentCategory $currentCategory,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
     ) {
-        $this->registry = $registry;
+        $this->currentCategory = $currentCategory;
         $this->configHelper = $configHelper;
         $this->coreHelper = $coreHelper;
         $this->storeManager = $context->getStoreManager();
@@ -50,7 +50,7 @@ public function __construct(
     /** @return Category | null */
     public function getCategory()
     {
-        return $this->registry->registry('category');
+        return $this->currentCategory->get();
     }
 
     /** @return bool */

diff --git a/Block/Adminhtml/Job/View.php b/Block/Adminhtml/Job/View.php
@@ -3,28 +3,28 @@
 namespace Algolia\AlgoliaSearch\Block\Adminhtml\Job;
 
 use Magento\Backend\Block\Widget\Button;
-use Magento\Framework\Registry;
+use Magento\Framework\Session\SessionManager;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 
 class View extends Template
 {
-    /** @var \Magento\Framework\Registry */
-    protected $coreRegistry;
+    /** @var SessionManager */
+    protected $backendSession;
 
     /**
-     * @param Context       $context
-     * @param Registry      $coreRegistry
-     * @param array         $data
+     * @param Context $context
+     * @param SessionManager $backendSession
+     * @param array $data
      */
     public function __construct(
-        Context       $context,
-        Registry      $coreRegistry,
+        Context          $context,
+        SessionManager   $backendSession,
         array $data = []
     ) {
         parent::__construct($context, $data);
 
-        $this->coreRegistry = $coreRegistry;
+        $this->backendSession = $backendSession;
     }
 
     /** @inheritdoc */
@@ -48,7 +48,7 @@ protected function _prepareLayout()
     /** @return \Algolia\AlgoliaSearch\Model\Job */
     public function getCurrentJob()
     {
-        return $this->coreRegistry->registry('current_job');
+        return $this->backendSession->getData('current_job');
     }
 
     /**  @return string */

diff --git a/Block/Adminhtml/LandingPage/SearchConfiguration.php b/Block/Adminhtml/LandingPage/SearchConfiguration.php
@@ -6,15 +6,15 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Algolia\AlgoliaSearch\Model\LandingPage;
 use Magento\Backend\Block\Template\Context;
-use Magento\Framework\Registry;
+use Magento\Backend\Model\Session;
 
 class SearchConfiguration extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'landingpage/search-configuration.phtml';
 
-    /** @var Registry */
-    protected $registry;
+    /** @var Session */
+    protected $backendSession;
 
     /** @var ConfigHelper */
     private $configHelper;
@@ -27,19 +27,19 @@ class SearchConfiguration extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param Registry $registry
+     * @param Session $backendSession
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        Registry $registry,
+        Session $backendSession,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
     ) {
-        $this->registry = $registry;
+        $this->backendSession = $backendSession;
         $this->configHelper = $configHelper;
         $this->coreHelper = $coreHelper;
 
@@ -49,7 +49,7 @@ public function __construct(
     /** @return LandingPage | null */
     public function getLandingPage()
     {
-        return $this->registry->registry('algoliasearch_landing_page');
+        return $this->backendSession->getData('algoliasearch_landing_page');
     }
 
     /** @return ConfigHelper */

diff --git a/Block/Adminhtml/Query/Merchandising.php b/Block/Adminhtml/Query/Merchandising.php
@@ -6,15 +6,15 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Algolia\AlgoliaSearch\Model\Query;
 use Magento\Backend\Block\Template\Context;
-use Magento\Framework\Registry;
+use Magento\Backend\Model\Session;
 
 class Merchandising extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'query/edit/merchandising.phtml';
 
-    /** @var Registry */
-    protected $registry;
+    /** @var Session */
+    protected $backendSession;
 
     /** @var ConfigHelper */
     private $configHelper;
@@ -27,19 +27,19 @@ class Merchandising extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param Registry $registry
+     * @param Session $backendSession
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        Registry $registry,
+        Session $backendSession,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
     ) {
-        $this->registry = $registry;
+        $this->backendSession = $backendSession;
         $this->configHelper = $configHelper;
         $this->coreHelper = $coreHelper;
         $this->storeManager = $context->getStoreManager();
@@ -50,7 +50,7 @@ public function __construct(
     /** @return Query | null */
     public function getCurrentQuery()
     {
-        return $this->registry->registry('algoliasearch_query');
+        return $this->backendSession->getData('algoliasearch_query');
     }
 
     /** @return ConfigHelper */

diff --git a/Block/Adminhtml/QueueArchive/View.php b/Block/Adminhtml/QueueArchive/View.php
@@ -3,28 +3,28 @@
 namespace Algolia\AlgoliaSearch\Block\Adminhtml\QueueArchive;
 
 use Magento\Backend\Block\Widget\Button;
-use Magento\Framework\Registry;
+use Magento\Framework\Session\SessionManager;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 
 class View extends Template
 {
-    /** @var Registry */
-    protected $coreRegistry;
+    /** @var SessionManager */
+    protected $backendSession;
 
     /**
-     * @param Context       $context
-     * @param Registry      $coreRegistry
-     * @param array         $data
+     * @param Context $context
+     * @param SessionManager $backendSession
+     * @param array $data
      */
     public function __construct(
-        Context       $context,
-        Registry      $coreRegistry,
+        Context          $context,
+        SessionManager   $backendSession,
         array $data = []
     ) {
         parent::__construct($context, $data);
 
-        $this->coreRegistry = $coreRegistry;
+        $this->backendSession = $backendSession;
     }
 
     /** @inheritdoc */
@@ -48,7 +48,7 @@ protected function _prepareLayout()
     /** @return \Algolia\AlgoliaSearch\Model\QueueArchive */
     public function getCurrentJob()
     {
-        return $this->coreRegistry->registry('current_job');
+        return $this->backendSession->getData('current_job');
     }
 
     /**  @return string */

diff --git a/Block/Algolia.php b/Block/Algolia.php
@@ -20,7 +20,7 @@
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Locale\Currency;
 use Magento\Framework\Locale\Format;
-use Magento\Framework\Registry;
+use Algolia\AlgoliaSearch\Registry\CurrentProduct;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\Helper\Data;
 use Magento\Framework\View\Element\Template;
@@ -38,9 +38,9 @@ class Algolia extends Template implements CollectionDataSourceInterface
      */
     protected $catalogSearchHelper;
     /**
-     * @var Registry
+     * @var CurrentProduct
      */
-    protected $registry;
+    protected $currentProduct;
     /**
      * @var ProductHelper
      */
@@ -110,7 +110,7 @@ class Algolia extends Template implements CollectionDataSourceInterface
      * @param ProductHelper $productHelper
      * @param Currency $currency
      * @param Format $format
-     * @param Registry $registry
+     * @param CurrentProduct $currentProduct
      * @param AlgoliaHelper $algoliaHelper
      * @param Data $urlHelper
      * @param FormKey $formKey
@@ -131,7 +131,7 @@ public function __construct(
         ProductHelper $productHelper,
         Currency $currency,
         Format $format,
-        Registry $registry,
+        CurrentProduct $currentProduct,
         AlgoliaHelper $algoliaHelper,
         Data $urlHelper,
         FormKey $formKey,
@@ -151,7 +151,7 @@ public function __construct(
         $this->productHelper = $productHelper;
         $this->currency = $currency;
         $this->format = $format;
-        $this->registry = $registry;
+        $this->currentProduct = $currentProduct;
         $this->algoliaHelper = $algoliaHelper;
         $this->urlHelper = $urlHelper;
         $this->formKey = $formKey;
@@ -267,7 +267,7 @@ public function getCurrentCategory()
     /** @return Product */
     public function getCurrentProduct()
     {
-        return $this->registry->registry('product');
+        return $this->currentProduct->get();
     }
 
     /** @return Order */

diff --git a/Block/RecommendProductView.php b/Block/RecommendProductView.php
@@ -8,7 +8,7 @@
 
 use Magento\Catalog\Model\Product;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
-use Magento\Framework\Registry;
+use Algolia\AlgoliaSearch\Registry\CurrentProduct;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 
@@ -20,11 +20,9 @@ class RecommendProductView extends Template
     protected $product = null;
 
     /**
-     * Core registry
-     *
-     * @var Registry
+     * @var CurrentProduct
      */
-    protected $coreRegistry = null;
+    protected $currentProduct;
 
     /**
      * @var ConfigHelper
@@ -33,17 +31,17 @@ class RecommendProductView extends Template
 
     /**
      * @param Context $context
-     * @param Registry $registry
+     * @param CurrentProduct $currentProduct
      * @param ConfigHelper $configHelper
      * @param array $data
      */
     public function __construct(
         Context      $context,
-        Registry     $registry,
+        CurrentProduct     $currentProduct,
         ConfigHelper $configHelper,
         array        $data = []
     ) {
-        $this->coreRegistry = $registry;
+        $this->currentProduct = $currentProduct;
         $this->configHelper = $configHelper;
         parent::__construct($context, $data);
     }
@@ -56,7 +54,7 @@ public function __construct(
     public function getProduct()
     {
         if (!$this->product) {
-            $this->product = $this->coreRegistry->registry('product');
+            $this->product = $this->currentProduct->get();
         }
         return $this->product;
     }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGE LOG
 
+## 3.13.1
+
+### Bug Fixes
+- Fixed the issue with PHP8.2 compatibility for recommendations on the cart page
+
 ## 3.13.0
 
 ### Updates