Update deprecated registry code

Author: mohitalgolia

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 */

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 */

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 */

Controller/Adminhtml/Queue/AbstractAction.php

@@ -5,13 +5,13 @@
 use Algolia\AlgoliaSearch\Model\JobFactory;
 use Algolia\AlgoliaSearch\Model\ResourceModel\Job as JobResourceModel;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Registry;
+use Magento\Framework\Session\SessionManager;
 use Magento\Indexer\Model\IndexerFactory;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
-    /** @var Registry */
-    protected $coreRegistry;
+    /** @var SessionManager */
+    protected $backendSession;
 
     /** @var \Algolia\AlgoliaSearch\Model\JobFactory */
     protected $jobFactory;
@@ -24,21 +24,21 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context          $context
-     * @param Registry         $coreRegistry
+     * @param SessionManager          $backendSession
      * @param JobFactory       $jobFactory
      * @param JobResourceModel $jobResourceModel
      * @param IndexerFactory   $indexerFactory
      */
     public function __construct(
         Context $context,
-        Registry $coreRegistry,
+        SessionManager $backendSession,
         JobFactory $jobFactory,
         JobResourceModel $jobResourceModel,
         IndexerFactory $indexerFactory
     ) {
         parent::__construct($context);
 
-        $this->coreRegistry     = $coreRegistry;
+        $this->backendSession   = $backendSession;
         $this->jobFactory       = $jobFactory;
         $this->jobResourceModel = $jobResourceModel;
         $this->indexerFactory   = $indexerFactory;
@@ -68,7 +68,7 @@ protected function initJob()
         }
 
         // Register model to use later in blocks
-        $this->coreRegistry->register('current_job', $model);
+        $this->backendSession->setData('current_job', $model);
 
         return $model;
     }

Controller/Adminhtml/QueueArchive/AbstractAction.php

@@ -5,13 +5,13 @@
 use Algolia\AlgoliaSearch\Model\QueueArchiveFactory;
 use Algolia\AlgoliaSearch\Model\ResourceModel\QueueArchive as QueueArchiveResourceModel;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Registry;
+use Magento\Framework\Session\SessionManager;
 use Magento\Indexer\Model\IndexerFactory;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
-    /** @var Registry */
-    protected $coreRegistry;
+    /** @var SessionManager */
+    protected $backendSession;
 
     /** @var \Algolia\AlgoliaSearch\Model\QueueArchiveFactory */
     protected $queueArchiveFactory;
@@ -24,21 +24,21 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context          $context
-     * @param Registry         $coreRegistry
+     * @param SessionManager          $backendSession
      * @param QueueArchiveFactory       $queueArchiveFactory
      * @param QueueArchiveResourceModel $queueArchiveResourceModel
      * @param IndexerFactory   $indexerFactory
      */
     public function __construct(
         Context $context,
-        Registry $coreRegistry,
+        SessionManager $backendSession,
         QueueArchiveFactory $queueArchiveFactory,
         QueueArchiveResourceModel $queueArchiveResourceModel,
         IndexerFactory $indexerFactory
     ) {
         parent::__construct($context);
 
-        $this->coreRegistry     = $coreRegistry;
+        $this->backendSession     = $backendSession;
         $this->queueArchiveFactory       = $queueArchiveFactory;
         $this->queueArchiveResourceModel = $queueArchiveResourceModel;
         $this->indexerFactory   = $indexerFactory;
@@ -68,7 +68,7 @@ protected function initJob()
         }
 
         // Register model to use later in blocks
-        $this->coreRegistry->register('current_job', $model);
+        $this->backendSession->setData('current_job', $model);
 
         return $model;
     }