Fixes Smile-SA#3030 deprecated access to an undefined property (2.10.x)

rbayet · Sep 5, 2023 · 99dc8e4 · 99dc8e4
1 parent f82f369
commit 99dc8e4
Show file tree

Hide file tree

Showing 16 changed files with 89 additions and 17 deletions.
diff --git a/...ule-elasticsuite-catalog-optimizer/Model/Optimizer/Functions/Provider/DefaultProvider.php b/...ule-elasticsuite-catalog-optimizer/Model/Optimizer/Functions/Provider/DefaultProvider.php
@@ -64,6 +64,11 @@ class DefaultProvider implements ProviderInterface
      */
     private $cacheLifeTime;
 
+    /**
+     * @var array
+     */
+    private $functions;
+
     /**
      * Provider constructor.
      *

diff --git a/src/module-elasticsuite-catalog-optimizer/Model/Optimizer/Preview.php b/src/module-elasticsuite-catalog-optimizer/Model/Optimizer/Preview.php
@@ -44,6 +44,11 @@ class Preview
      */
     private $optimizer;
 
+    /**
+     * @var ApplierListFactory
+     */
+    private $applierListFactory;
+
     /**
      * @var ContainerConfigurationInterface
      */

diff --git a/src/module-elasticsuite-catalog-optimizer/Model/Optimizer/Preview/ResultsBuilder.php b/src/module-elasticsuite-catalog-optimizer/Model/Optimizer/Preview/ResultsBuilder.php
@@ -26,6 +26,16 @@
  */
 class ResultsBuilder
 {
+    /**
+     * @var \Magento\Framework\Search\SearchEngineInterface
+     */
+    private $searchEngine;
+
+    /**
+     * @var RequestBuilder
+     */
+    private $requestBuilder;
+
     /**
      * ResultsBuilder constructor.
      *

diff --git a/...le-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php b/...le-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php
@@ -59,6 +59,11 @@ class FrontPlugin
      */
     private $booleanSource;
 
+    /**
+     * @var Registry
+     */
+    private $coreRegistry;
+
     /**
      * @var \Smile\ElasticsuiteCatalog\Model\Attribute\Source\FilterSortOrder
      */

diff --git a/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Datasource/AttributeData.php b/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Datasource/AttributeData.php
@@ -51,6 +51,11 @@ class AttributeData extends AbstractAttributeData implements DatasourceInterface
      */
     private $forbiddenChildrenAttributes = [];
 
+    /**
+     * @var boolean
+     */
+    private $isIndexingChildProductSkuEnabled;
+
     /**
      * Constructor
      *

diff --git a/src/module-elasticsuite-catalog/Plugin/Index/Indices/Config/ReaderPlugin.php b/src/module-elasticsuite-catalog/Plugin/Index/Indices/Config/ReaderPlugin.php
@@ -34,6 +34,11 @@ class ReaderPlugin
      */
     const XML_CATEGORY_NAME_WEIGHT = 'smile_elasticsuite_catalogsearch_settings/catalogsearch/category_name_weight';
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * ConfigPlugin constructor.
      *

diff --git a/src/module-elasticsuite-catalog/Plugin/Indexer/AbstractIndexerPlugin.php b/src/module-elasticsuite-catalog/Plugin/Indexer/AbstractIndexerPlugin.php
@@ -24,6 +24,11 @@
  */
 class AbstractIndexerPlugin
 {
+    /**
+     * @var \Magento\Framework\Indexer\IndexerRegistry
+     */
+    private $indexerRegistry;
+
     /**
      * @var \Smile\ElasticsuiteCatalog\Model\ResourceModel\Product\Indexer\Fulltext\Action\Full
      */

diff --git a/src/module-elasticsuite-catalog/Search/Request/Product/Coverage/Provider.php b/src/module-elasticsuite-catalog/Search/Request/Product/Coverage/Provider.php
@@ -27,6 +27,11 @@ class Provider
      */
     private $searchEngine;
 
+    /**
+     * @var \Smile\ElasticsuiteCore\Search\RequestInterface
+     */
+    private $request;
+
     /**
      * @var array
      */

diff --git a/src/module-elasticsuite-core/Model/ProductMetadata/ComposerInformation.php b/src/module-elasticsuite-core/Model/ProductMetadata/ComposerInformation.php
@@ -36,6 +36,11 @@ class ComposerInformation extends \Magento\Framework\Composer\ComposerInformatio
      */
     private $locker;
 
+    /**
+     * @var ComposerFactory
+     */
+    private $composerFactory;
+
     /**
      * @param \Magento\Framework\Composer\ComposerFactory $composerFactory Composer Factory
      */

diff --git a/src/module-elasticsuite-core/Model/Search/Request/RelevanceConfig/Reader/ContainerStore.php b/src/module-elasticsuite-core/Model/Search/Request/RelevanceConfig/Reader/ContainerStore.php
@@ -48,6 +48,11 @@ class ContainerStore
      */
     protected $containerReader;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
     /**
      * Constructor
      *

diff --git a/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Response/DocumentFactory.php b/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Response/DocumentFactory.php
@@ -32,6 +32,11 @@ class DocumentFactory
      */
     private $entityMetadata;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @var string
      */

diff --git a/src/module-elasticsuite-core/Search/Request/Aggregation/Bucket/Histogram.php b/src/module-elasticsuite-core/Search/Request/Aggregation/Bucket/Histogram.php
@@ -38,6 +38,11 @@ class Histogram extends AbstractBucket
      */
     private $minDocCount;
 
+    /**
+     * @var array
+     */
+    private $extendedBounds;
+
     /**
      * Constructor.
      *

diff --git a/src/module-elasticsuite-core/Setup/Validator.php b/src/module-elasticsuite-core/Setup/Validator.php
@@ -27,6 +27,11 @@
  */
 class Validator implements ValidatorInterface
 {
+    /**
+     * @var ClientInterface
+     */
+    private $client;
+
     /**
      * Validator constructor.
      *

diff --git a/src/module-elasticsuite-tracker/Cron/CleanTrackingData.php b/src/module-elasticsuite-tracker/Cron/CleanTrackingData.php
@@ -27,6 +27,11 @@ class CleanTrackingData
      */
     private $indexManager;
 
+    /**
+     * @var \Smile\ElasticsuiteTracker\Helper\Data
+     */
+    private $helper;
+
     /**
      * Constructor.
      *

diff --git a/src/module-elasticsuite-tracker/Model/IndexResolver.php b/src/module-elasticsuite-tracker/Model/IndexResolver.php
@@ -29,31 +29,19 @@ class IndexResolver
     private $indices = [];
 
     /**
-     * @var \Smile\ElasticsuiteCore\Api\Index\IndexInterfaceFactory
+     * @var IndexManager
      */
-    private $indexFactory;
-
-    /**
-     * @var \Smile\ElasticsuiteCore\Api\Index\IndexSettingsInterface
-     */
-    private $indexSettings;
-
+    private $indexManager;
 
     /**
      * Constructor.
      *
-     * @param \Smile\ElasticsuiteCore\Api\Index\IndexSettingsInterface $indexSettings Index settings.
-     * @param \Smile\ElasticsuiteCore\Api\Index\IndexInterfaceFactory  $indexFactory  Index factory.
-     * @param \Smile\ElasticsuiteTracker\Model\IndexManager            $indexManager  Index Manager.
+     * @param \Smile\ElasticsuiteTracker\Model\IndexManager $indexManager  Index Manager.
      */
     public function __construct(
-        \Smile\ElasticsuiteCore\Api\Index\IndexSettingsInterface $indexSettings,
-        \Smile\ElasticsuiteCore\Api\Index\IndexInterfaceFactory $indexFactory,
         IndexManager $indexManager
     ) {
-        $this->indexFactory  = $indexFactory;
-        $this->indexSettings = $indexSettings;
-        $this->indexManager  = $indexManager;
+        $this->indexManager = $indexManager;
     }
 
     /**

diff --git a/src/module-elasticsuite-virtual-category/Model/Url.php b/src/module-elasticsuite-virtual-category/Model/Url.php
@@ -18,6 +18,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
@@ -66,6 +67,11 @@ class Url
      */
     private $urlFinder;
 
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
     /**
      * @var VirtualCategoryRoot
      */
@@ -78,20 +84,23 @@ class Url
      * @param StoreManagerInterface     $storeManager              Store Manager Interface
      * @param CategoryCollectionFactory $categoryCollectionFactory Category Collection Factory
      * @param UrlFinderInterface        $urlFinder                 URL Finder
+     * @param UrlInterface              $urlBuilder                URL Builder
      * @param VirtualCategoryRoot       $virtualCategoryRoot       Virtual Category Root model
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
         CategoryCollectionFactory $categoryCollectionFactory,
         UrlFinderInterface $urlFinder,
+        UrlInterface $urlBuilder,
         VirtualCategoryRoot $virtualCategoryRoot
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
         $this->categoryCollectionFactory = $categoryCollectionFactory;
         $this->urlFinder = $urlFinder;
-        $this->virtualCategoryRoot       = $virtualCategoryRoot;
+        $this->urlBuilder = $urlBuilder;
+        $this->virtualCategoryRoot = $virtualCategoryRoot;
     }
 
     /**