Merge branch '4.6' into main

Author: barw4

.github/workflows/browser-tests.yaml

@@ -17,3 +17,6 @@ jobs:
             test-suite: "--mode=standard --profile=core --tags='~@broken&&~@setup'"
         secrets:
             SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
+            AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
+            AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}

phpstan-baseline.neon

@@ -19020,6 +19020,12 @@ parameters:
 			count: 1
 			path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/DateMetadata.php
 
+		-
+			message: '#^Cannot access an offset on list\|string\|false\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/Field.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Search\\Legacy\\Content\\Common\\Gateway\\CriterionHandler\\Field\:\:getFieldsInformation\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue

src/bundle/Core/Command/ResizeOriginalImagesCommand.php

@@ -16,6 +16,7 @@
 use Ibexa\Contracts\Core\Repository\UserService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentValue;
 use Ibexa\Core\FieldType\Image\Value;
 use Ibexa\Core\IO\IOServiceInterface;
 use Ibexa\Core\IO\Values\BinaryFile;
@@ -290,7 +291,7 @@ private function resize(OutputInterface $output, SearchHit $hit, string $imageFi
      * @param \Ibexa\Core\FieldType\Image\Value $image
      *
      * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException
-     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentValue
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      *
      * @return \Ibexa\Core\IO\Values\BinaryFile
      */
@@ -299,6 +300,10 @@ private function store(BinaryInterface $binary, Value $image): BinaryFile
         $tmpFile = tmpfile();
         fwrite($tmpFile, $binary->getContent());
         $tmpMetadata = stream_get_meta_data($tmpFile);
+        if (!isset($tmpMetadata['uri'])) {
+            throw new InvalidArgumentValue('uri', '', BinaryInterface::class);
+        }
+
         $binaryCreateStruct = $this->ioService->newBinaryCreateStructFromLocalFile($tmpMetadata['uri']);
         $binaryCreateStruct->id = $image->id;
         $newBinaryFile = $this->ioService->createBinaryFile($binaryCreateStruct);

src/bundle/Core/Imagine/IORepositoryResolver.php

@@ -10,6 +10,7 @@
 use Ibexa\Bundle\Core\Variation\PathResolver;
 use Ibexa\Contracts\Core\Variation\VariationPathGenerator;
 use Ibexa\Contracts\Core\Variation\VariationPurger;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentValue;
 use Ibexa\Core\Base\Exceptions\NotFoundException;
 use Ibexa\Core\IO\IOServiceInterface;
 use Ibexa\Core\IO\Values\MissingBinaryFile;
@@ -72,14 +73,21 @@ public function resolve($path, $filter): string
     /**
      * Stores image alias in the IO Repository.
      * A temporary file is created to dump the filtered image and is used as basis for creation in the IO Repository.
+     *
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      */
     public function store(BinaryInterface $binary, $path, $filter): void
     {
         $tmpFile = tmpfile();
         fwrite($tmpFile, $binary->getContent());
         $tmpMetadata = stream_get_meta_data($tmpFile);
 
+        if (!isset($tmpMetadata['uri'])) {
+            throw new InvalidArgumentValue('uri', '', BinaryInterface::class);
+        }
+
         $binaryCreateStruct = $this->ioService->newBinaryCreateStructFromLocalFile($tmpMetadata['uri']);
+
         $binaryCreateStruct->id = $this->getFilePath($path, $filter);
         $this->ioService->createBinaryFile($binaryCreateStruct);
 

src/bundle/Core/Imagine/PlaceholderProvider/GenericProvider.php

@@ -8,6 +8,7 @@
 namespace Ibexa\Bundle\Core\Imagine\PlaceholderProvider;
 
 use Ibexa\Bundle\Core\Imagine\PlaceholderProvider;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentValue;
 use Ibexa\Core\FieldType\Image\Value as ImageValue;
 use Imagine\Image as Image;
 use Imagine\Image\ImagineInterface;
@@ -83,9 +84,17 @@ private function getPlaceholderText(string $pattern, ImageValue $value): string
         ]);
     }
 
+    /**
+     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentValue
+     */
     private function getTemporaryPath(): string
     {
-        return stream_get_meta_data(tmpfile())['uri'];
+        $path = stream_get_meta_data(tmpfile())['uri'] ?? null;
+        if ($path === null) {
+            throw new InvalidArgumentValue('uri', '');
+        }
+
+        return $path;
     }
 
     private function resolveOptions(array $options): array

src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php

@@ -8,6 +8,7 @@
 namespace Ibexa\Bundle\Core\Imagine\PlaceholderProvider;
 
 use Ibexa\Bundle\Core\Imagine\PlaceholderProvider;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentValue;
 use Ibexa\Core\FieldType\Image\Value as ImageValue;
 use RuntimeException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -58,7 +59,12 @@ private function getPlaceholderUrl(string $urlPattern, ImageValue $value): strin
 
     private function getTemporaryPath(): string
     {
-        return stream_get_meta_data(tmpfile())['uri'];
+        $path = stream_get_meta_data(tmpfile())['uri'] ?? null;
+        if ($path === null) {
+            throw new InvalidArgumentValue('uri', '');
+        }
+
+        return $path;
     }
 
     private function resolveOptions(array $options): array

src/contracts/Persistence/Content/Type/CriterionHandlerInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\Core\Persistence\Content\Type;
+
+use Doctrine\DBAL\Query\QueryBuilder;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
+use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
+
+/**
+ * @template TCriterion of \Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface
+ */
+interface CriterionHandlerInterface
+{
+    /**
+     * @phpstan-param TCriterion $criterion
+     */
+    public function supports(CriterionInterface $criterion): bool;
+
+    /**
+     * @phpstan-param TCriterion $criterion
+     *
+     * @return string|\Doctrine\DBAL\Query\Expression\CompositeExpression
+     */
+    public function apply(
+        CriterionVisitor $criterionVisitor,
+        QueryBuilder $qb,
+        CriterionInterface $criterion
+    );
+}

src/contracts/Persistence/Content/Type/Handler.php

@@ -10,6 +10,7 @@
 use Ibexa\Contracts\Core\Persistence\Content\Type;
 use Ibexa\Contracts\Core\Persistence\Content\Type\Group\CreateStruct as GroupCreateStruct;
 use Ibexa\Contracts\Core\Persistence\Content\Type\Group\UpdateStruct as GroupUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\ContentTypeQuery;
 
 interface Handler
 {
@@ -92,6 +93,13 @@ public function loadContentTypes($groupId, $status = Type::STATUS_DEFINED);
      */
     public function loadContentTypeList(array $contentTypeIds): array;
 
+    /**
+     * @param list<string> $prioritizedLanguages Used as prioritized language code on translated properties of returned object.
+     *
+     * @return array{count: int, items: array<string, mixed>}
+     */
+    public function findContentTypes(?ContentTypeQuery $query = null, array $prioritizedLanguages = []): array;
+
     /**
      * @return \Ibexa\Contracts\Core\Persistence\Content\Type[]
      */

src/contracts/Repository/ContentTypeService.php

@@ -18,6 +18,8 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\ContentTypeQuery;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\SearchResult;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 
 interface ContentTypeService
@@ -173,6 +175,11 @@ public function loadContentTypeDraft(int $contentTypeId, bool $ignoreOwnership =
      */
     public function loadContentTypeList(array $contentTypeIds, array $prioritizedLanguages = []): iterable;
 
+    /**
+     * @param list<string> $prioritizedLanguages Used as prioritized language code on translated properties of returned object.
+     */
+    public function findContentTypes(?ContentTypeQuery $query = null, array $prioritizedLanguages = []): SearchResult;
+
     /**
      * Get content type objects which belong to the given content type group.
      *

src/contracts/Repository/Decorator/ContentTypeServiceDecorator.php

@@ -19,6 +19,8 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\ContentTypeQuery;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\SearchResult;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 
 abstract class ContentTypeServiceDecorator implements ContentTypeService
@@ -106,6 +108,11 @@ public function loadContentTypeList(
         return $this->innerService->loadContentTypeList($contentTypeIds, $prioritizedLanguages);
     }
 
+    public function findContentTypes(?ContentTypeQuery $query = null, array $prioritizedLanguages = []): SearchResult
+    {
+        return $this->innerService->findContentTypes($query, $prioritizedLanguages);
+    }
+
     public function loadContentTypes(
         ContentTypeGroup $contentTypeGroup,
         array $prioritizedLanguages = []