Merge branch '4.5'

ibexa · Oct 3, 2023 · 3344bea · 3344bea
2 parents 2894870 + c40d411
commit 3344bea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/bundle/ApiLoader/BoostFactorProviderFactory.php b/src/bundle/ApiLoader/BoostFactorProviderFactory.php
@@ -7,6 +7,8 @@
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Solr\FieldMapper\BoostFactorProvider;
+use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -48,6 +50,10 @@ public function __construct(
 
     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;

diff --git a/src/bundle/ApiLoader/IndexingDepthProviderFactory.php b/src/bundle/ApiLoader/IndexingDepthProviderFactory.php
@@ -9,6 +9,8 @@
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
 use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Solr\FieldMapper\IndexingDepthProvider;
+use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -43,6 +45,10 @@ public function __construct(
 
     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;

diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php
@@ -70,7 +70,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
 
         foreach ($criterion->value as $identifier) {
             try {
-                $validIds[] = $contentTypeHandler->loadByIdentifier($identifier)->id;
+                $validIds[] = $contentTypeHandler->loadByIdentifier((string) $identifier)->id;
             } catch (NotFoundException $e) {
                 // Filter out non-existing content types, but track for code below
                 $invalidIdentifiers[] = $identifier;

diff --git a/src/lib/Query/Content/CriterionVisitor/Ancestor.php b/src/lib/Query/Content/CriterionVisitor/Ancestor.php
@@ -36,7 +36,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
     {
         $idSet = [];
         foreach ($criterion->value as $value) {
-            foreach (explode('/', trim($value, '/')) as $id) {
+            foreach (explode('/', trim((string)$value, '/')) as $id) {
                 $idSet[$id] = true;
             }
         }

diff --git a/src/lib/Query/Location/CriterionVisitor/Ancestor.php b/src/lib/Query/Location/CriterionVisitor/Ancestor.php
@@ -36,7 +36,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
     {
         $idSet = [];
         foreach ($criterion->value as $value) {
-            foreach (explode('/', trim($value, '/')) as $id) {
+            foreach (explode('/', trim((string)$value, '/')) as $id) {
                 $idSet[$id] = true;
             }
         }