Remove usage of deprecated ContainerAwareTrait

Author: adamwojs

src/bundle/ApiLoader/BoostFactorProviderFactory.php

@@ -8,17 +8,14 @@
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
 use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
-use Ibexa\Solr\FieldMapper\BoostFactorProvider;
-use LogicException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * BoostFactorProvider service factory takes into account boost factor semantic configuration.
  */
-class BoostFactorProviderFactory implements ContainerAwareInterface
+class BoostFactorProviderFactory
 {
-    use ContainerAwareTrait;
+    private ContainerInterface $container;
 
     private RepositoryConfigurationProviderInterface $repositoryConfigurationProvider;
 
@@ -37,21 +34,19 @@ class BoostFactorProviderFactory implements ContainerAwareInterface
      * @param string $boostFactorProviderClass
      */
     public function __construct(
+        ContainerInterface $container,
         RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
         $defaultConnection,
         $boostFactorProviderClass
     ) {
+        $this->container = $container;
         $this->repositoryConfigurationProvider = $repositoryConfigurationProvider;
         $this->defaultConnection = $defaultConnection;
         $this->boostFactorProviderClass = $boostFactorProviderClass;
     }
 
     public function buildService()
     {
-        if ($this->container === null) {
-            throw new LogicException(sprintf('Unable to build %s due to missing container reference', BoostFactorProvider::class));
-        }
-
         $repositoryConfig = $this->repositoryConfigurationProvider->getRepositoryConfig();
 
         $connection = $this->defaultConnection;

src/bundle/ApiLoader/IndexingDepthProviderFactory.php

@@ -9,14 +9,11 @@
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
 use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
-use Ibexa\Solr\FieldMapper\IndexingDepthProvider;
-use LogicException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class IndexingDepthProviderFactory implements ContainerAwareInterface
+class IndexingDepthProviderFactory
 {
-    use ContainerAwareTrait;
+    private ContainerInterface $container;
 
     private RepositoryConfigurationProviderInterface $repositoryConfigurationProvider;
 
@@ -25,21 +22,19 @@ class IndexingDepthProviderFactory implements ContainerAwareInterface
     private string $indexingDepthProviderClass;
 
     public function __construct(
+        ContainerInterface $container,
         RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
         string $defaultConnection,
         string $indexingDepthProviderClass
     ) {
+        $this->container = $container;
         $this->repositoryConfigurationProvider = $repositoryConfigurationProvider;
         $this->defaultConnection = $defaultConnection;
         $this->indexingDepthProviderClass = $indexingDepthProviderClass;
     }
 
     public function buildService()
     {
-        if ($this->container === null) {
-            throw new LogicException(sprintf('Unable to build %s due to missing container reference', IndexingDepthProvider::class));
-        }
-
         $repositoryConfig = $this->repositoryConfigurationProvider->getRepositoryConfig();
 
         $connection = $this->defaultConnection;

src/bundle/Resources/config/services.yml

@@ -44,19 +44,17 @@ services:
 
     Ibexa\Bundle\Solr\ApiLoader\BoostFactorProviderFactory:
         arguments:
+            - '@service_container'
             - '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider'
             - "%ibexa.solr.default_connection%"
-            - Ibexa\Solr\FieldMapper\BoostFactorProvider
-        calls:
-            - [setContainer, ["@service_container"]]
+            - 'Ibexa\Solr\FieldMapper\BoostFactorProvider'
 
     Ibexa\Bundle\Solr\ApiLoader\IndexingDepthProviderFactory:
         arguments:
+            - '@service_container'
             - '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider'
             - "%ibexa.solr.default_connection%"
             - Ibexa\Solr\FieldMapper\IndexingDepthProvider
-        calls:
-            - [setContainer, ["@service_container"]]
 
     Ibexa\Solr\FieldMapper\IndexingDepthProvider:
         class: Ibexa\Solr\FieldMapper\IndexingDepthProvider