Merge branch '4.6'

# Conflicts:
#	phpstan-baseline-gte-8.0.neon
#	phpstan-baseline.neon
#	phpstan-baseline.neon.php
#	src/bundle/Core/URLChecker/Handler/HTTPHandler.php

Author: Steveb-p

phpstan-baseline-gte-8.1.neon

@@ -0,0 +1,13 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Possibly invalid array key type bool\|float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 3
+			path: src/lib/Persistence/Legacy/Content/Mapper.php
+
+		-
+			message: '#^Possibly invalid array key type bool\|float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 2
+			path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php

phpstan-baseline.neon

@@ -5490,18 +5490,6 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/Values/Content/Query/Criterion/FullText.php
 
-		-
-			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\Criterion\\IsFieldEmpty\:\:__construct\(\) has Ibexa\\Contracts\\Core\\Repository\\Exceptions\\InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/contracts/Repository/Values/Content/Query/Criterion/IsFieldEmpty.php
-
-		-
-			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\Criterion\\LogicalNot\:\:__construct\(\) has InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/contracts/Repository/Values/Content/Query/Criterion/LogicalNot.php
-
 		-
 			message: '#^Class Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\RelationList implements generic interface IteratorAggregate but does not specify its types\: TKey, TValue$#'
 			identifier: missingType.generics
@@ -5622,12 +5610,6 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/Values/ObjectState/ObjectStateCreateStruct.php
 
-		-
-			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Values\\URL\\Query\\Criterion\\LogicalNot\:\:__construct\(\) has InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/contracts/Repository/Values/URL/Query/Criterion/LogicalNot.php
-
 		-
 			message: '#^Class Ibexa\\Contracts\\Core\\Repository\\Values\\URL\\SearchResult implements generic interface IteratorAggregate but does not specify its types\: TKey, TValue$#'
 			identifier: missingType.generics
@@ -6486,12 +6468,6 @@ parameters:
 			count: 1
 			path: src/lib/FieldType/FieldType.php
 
-		-
-			message: '#^Method Ibexa\\Core\\FieldType\\FieldType\:\:validate\(\) has Ibexa\\Contracts\\Core\\Repository\\Exceptions\\InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/lib/FieldType/FieldType.php
-
 		-
 			message: '#^Method Ibexa\\Core\\FieldType\\FieldType\:\:validatorConfigurationFromHash\(\) has parameter \$validatorConfigurationHash with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -7182,12 +7158,6 @@ parameters:
 			count: 1
 			path: src/lib/FieldType/Null/Type.php
 
-		-
-			message: '#^Method Ibexa\\Core\\FieldType\\Null\\Type\:\:checkValueStructure\(\) has Ibexa\\Contracts\\Core\\Repository\\Exceptions\\InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/lib/FieldType/Null/Type.php
-
 		-
 			message: '#^Method Ibexa\\Core\\FieldType\\Null\\Type\:\:checkValueStructure\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -7512,12 +7482,6 @@ parameters:
 			count: 1
 			path: src/lib/FieldType/User/Type.php
 
-		-
-			message: '#^Method Ibexa\\Core\\FieldType\\User\\Type\:\:checkValueStructure\(\) has Ibexa\\Contracts\\Core\\Repository\\Exceptions\\InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/lib/FieldType/User/Type.php
-
 		-
 			message: '#^Method Ibexa\\Core\\FieldType\\User\\Type\:\:checkValueStructure\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -7914,12 +7878,6 @@ parameters:
 			count: 1
 			path: src/lib/Helper/TranslationHelper.php
 
-		-
-			message: '#^Method Ibexa\\Core\\Limitation\\BlockingLimitationType\:\:evaluate\(\) has Ibexa\\Contracts\\Core\\Repository\\Exceptions\\BadStateException in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: src/lib/Limitation/BlockingLimitationType.php
-
 		-
 			message: '#^Method Ibexa\\Core\\Limitation\\LanguageLimitation\\ContentDeleteEvaluator\:\:evaluate\(\) never returns null so it can be removed from the return type\.$#'
 			identifier: return.unusedType
@@ -12150,18 +12108,6 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/Gateway.php
 
-		-
-			message: '#^Argument of an invalid type DOMNodeList\<DOMNode\>\|false supplied for foreach, only iterables are supported\.$#'
-			identifier: foreach.nonIterable
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php
-
-		-
-			message: '#^Cannot call method removeChild\(\) on DOMNode\|null\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php
-
 		-
 			message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Gateway\\DoctrineDatabase\:\:deleteTranslationFromContentNames\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -13086,6 +13032,12 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/Mapper.php
 
+		-
+			message: '#^Possibly invalid array key type bool\|float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 3
+			path: src/lib/Persistence/Legacy/Content/Mapper.php
+
 		-
 			message: '#^Property Ibexa\\Contracts\\Core\\Persistence\\Content\\CreateStruct\:\:\$isHidden \(bool\) on left side of \?\? is not nullable\.$#'
 			identifier: nullCoalesce.property
@@ -18246,6 +18198,12 @@ parameters:
 			count: 2
 			path: src/lib/Repository/URLWildcardService.php
 
+		-
+			message: '#^Parameter \#3 \$hashType of method Ibexa\\Contracts\\Core\\Repository\\PasswordHashService\:\:isValidPassword\(\) expects int\|null, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/lib/Repository/User/PasswordValidator.php
+
 		-
 			message: '#^Dead catch \- Exception is never thrown in the try block\.$#'
 			identifier: catch.neverThrown
@@ -18306,6 +18264,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/UserService.php
 
+		-
+			message: '#^Parameter \#3 \$hashAlgorithm of method Ibexa\\Core\\Repository\\UserService\:\:comparePasswordHashes\(\) expects int, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/lib/Repository/UserService.php
+
 		-
 			message: '#^Property Ibexa\\Contracts\\Core\\Repository\\Values\\User\\UserUpdateStruct\:\:\$contentMetadataUpdateStruct \(Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\ContentMetadataUpdateStruct\) in empty\(\) is not falsy\.$#'
 			identifier: empty.property
@@ -35634,6 +35598,12 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php
 
+		-
+			message: '#^Possibly invalid array key type bool\|float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 2
+			path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php
+
 		-
 			message: '#^Access to an undefined property Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject\:\:\$remoteId\.$#'
 			identifier: property.notFound
@@ -60522,12 +60492,6 @@ parameters:
 			count: 1
 			path: tests/lib/Search/Legacy/Content/AbstractTestCase.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Search\\Legacy\\Content\\AbstractTestCase\:\:getContentTypeHandler\(\) has Doctrine\\DBAL\\Exception in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: tests/lib/Search/Legacy/Content/AbstractTestCase.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Search\\Legacy\\Content\\AbstractTestCase\:\:getConverterRegistry\(\) has no return type specified\.$#'
 			identifier: missingType.return

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

@@ -26,23 +26,43 @@ public function getPlaceholder(ImageValue $value, array $options = []): string
         $options = $this->resolveOptions($options);
 
         $path = $this->getTemporaryPath();
+        if ($path === '') {
+            throw new RuntimeException('Temporary file path is empty.');
+        }
+
         $placeholderUrl = $this->getPlaceholderUrl($options['url_pattern'], $value);
+        if ($placeholderUrl === '') {
+            throw new RuntimeException('Placeholder URL must be a non-empty string.');
+        }
 
-        try {
-            $handler = curl_init();
+        $fp = fopen($path, 'wb');
+        if ($fp === false) {
+            throw new RuntimeException("Unable to open temp file for writing: {$path}");
+        }
 
-            curl_setopt_array($handler, [
-                CURLOPT_URL => $placeholderUrl,
-                CURLOPT_FILE => fopen($path, 'wb'),
-                CURLOPT_TIMEOUT => $options['timeout'],
-                CURLOPT_FAILONERROR => true,
-            ]);
+        $handler = \curl_init();
+        if ($handler === false) {
+            throw new RuntimeException('Unable to initialize cURL.');
+        }
+
+        $timeout = $options['timeout'];
 
+        curl_setopt_array($handler, [
+            CURLOPT_URL => $placeholderUrl, // non-empty-string
+            CURLOPT_FILE => $fp,             // resource
+            CURLOPT_TIMEOUT => $timeout,        // int
+            CURLOPT_FAILONERROR => true,            // bool
+        ]);
+
+        try {
             if (curl_exec($handler) === false) {
-                throw new RuntimeException("Unable to download placeholder for {$value->id} ($placeholderUrl): " . curl_error($handler));
+                throw new RuntimeException(
+                    "Unable to download placeholder for {$value->id} ({$placeholderUrl}): " . curl_error($handler)
+                );
             }
         } finally {
             curl_close($handler);
+            fclose($fp);
         }
 
         return $path;

src/bundle/Core/URLChecker/Handler/HTTPHandler.php

@@ -9,7 +9,9 @@
 
 use CurlHandle;
 use Ibexa\Contracts\Core\Repository\Values\URL\URL;
+use InvalidArgumentException;
 use LogicException;
+use RuntimeException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class HTTPHandler extends AbstractConfigResolverBasedURLHandler
@@ -116,9 +118,18 @@ private function createCurlHandlerForUrl(URL $url, array &$handlers, int $connec
     {
         $options = $this->getOptions();
         $handler = curl_init();
+        if ($handler === false) {
+            throw new RuntimeException('Unable to initialize cURL handler.');
+        }
+
+        $urlString = $url->getUrl();
+        if ($urlString === '') {
+            throw new InvalidArgumentException('URL must be a non-empty string.');
+        }
 
+        /** @var non-empty-string $urlString */
         curl_setopt_array($handler, [
-            CURLOPT_URL => $url->getUrl(),
+            CURLOPT_URL => $urlString,
             CURLOPT_RETURNTRANSFER => false,
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_CONNECTTIMEOUT => $connectionTimeout,
@@ -127,18 +138,14 @@ private function createCurlHandlerForUrl(URL $url, array &$handlers, int $connec
             CURLOPT_NOBODY => true,
         ]);
 
-        if ($options['ignore_certificate']) {
+        if (!empty($options['ignore_certificate'])) {
             curl_setopt_array($handler, [
                 CURLOPT_SSL_VERIFYPEER => false,
-                CURLOPT_SSL_VERIFYHOST => false,
+                CURLOPT_SSL_VERIFYHOST => 0,
             ]);
         }
 
-        $handlers[(int)$handler] = $url;
-
-        if (false === $handler) {
-            throw new LogicException("Failed to create Curl handler for '{$url->getUrl()}' URL", 1);
-        }
+        $handlers[(int) $handler] = $url;
 
         return $handler;
     }

src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php

@@ -14,6 +14,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Query\QueryBuilder as DoctrineQueryBuilder;
 use DOMDocument;
+use DOMElement;
 use DOMXPath;
 use Ibexa\Contracts\Core\Persistence\Content;
 use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
@@ -37,6 +38,7 @@
 use Ibexa\Core\Persistence\Legacy\Content\StorageFieldValue;
 use Ibexa\Core\Persistence\Legacy\SharedGateway\Gateway as SharedGateway;
 use LogicException;
+use RuntimeException;
 
 /**
  * Doctrine database based content gateway.
@@ -1187,8 +1189,14 @@ private function removeRelationFromRelationListField(int $contentId, array $row)
         $xpathExpression = "//related-objects/relation-list/relation-item[@contentobject-id='{$contentId}']";
 
         $relationItems = $xpath->query($xpathExpression);
+        if ($relationItems === false) {
+            throw new RuntimeException('Invalid XPath: ' . $xpathExpression);
+        }
+
         foreach ($relationItems as $relationItem) {
-            $relationItem->parentNode->removeChild($relationItem);
+            if ($relationItem instanceof DOMElement && $relationItem->parentNode !== null) {
+                $relationItem->parentNode->removeChild($relationItem);
+            }
         }
 
         $query = $this->connection->createQueryBuilder();