From e58c82bb073d62948785b56694e221746914d610 Mon Sep 17 00:00:00 2001 From: Tomasz Kryszan Date: Tue, 12 Dec 2023 11:53:25 +0100 Subject: [PATCH 1/3] Changed expected min and max value types to numeric instead of int --- .../Values/Content/Query/Criterion.php | 4 ++-- .../Image/AbstractImageCompositeCriterion.php | 16 +++++++++----- .../Image/AbstractImageRangeCriterion.php | 22 +++++++++++-------- .../Query/Criterion/Image/FileSize.php | 7 ++++-- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/contracts/Repository/Values/Content/Query/Criterion.php b/src/contracts/Repository/Values/Content/Query/Criterion.php index 94899bdd5b..7e80664698 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion.php @@ -25,7 +25,7 @@ abstract class Criterion implements CriterionInterface /** * The value(s) matched by the criteria. * - * @var string[]|int[]|int|string|bool + * @var scalar[]|scalar */ public $value; @@ -50,7 +50,7 @@ abstract class Criterion implements CriterionInterface * @param string|null $operator * The operator the Criterion uses. If null is given, will default to Operator::IN if $value is an array, * Operator::EQ if it is not. - * @param string[]|int[]|int|string|bool $value + * @param scalar[]|scalar $value * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Value|null $valueData * * @todo Add a dedicated exception diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageCompositeCriterion.php b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageCompositeCriterion.php index f3b43d1e99..4baf235d00 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageCompositeCriterion.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageCompositeCriterion.php @@ -16,8 +16,8 @@ * @template TImageCriteria of array * * @phpstan-type Range array{ - * min?: int|null, - * max?: int|null, + * min?: numeric|null, + * max?: numeric|null, * } */ abstract class AbstractImageCompositeCriterion extends CompositeCriterion @@ -91,17 +91,21 @@ protected function validate( } /** - * @param array{min?: int|null} $data + * @param array{min?: numeric|null} $data + * + * @return numeric */ - protected function getMinValue(array $data): int + protected function getMinValue(array $data) { return $data['min'] ?? 0; } /** - * @param array{max?: int|null} $data + * @param array{max?: numeric|null} $data + * + * @return numeric|null */ - protected function getMaxValue(array $data): ?int + protected function getMaxValue(array $data) { return $data['max'] ?? null; } diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php index 31bc7c6c3d..b72c6f6dd6 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php @@ -16,19 +16,22 @@ abstract class AbstractImageRangeCriterion extends Criterion { /** + * @param numeric $minValue + * @param numeric|null $maxValue + * * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException */ public function __construct( string $fieldDefIdentifier, - int $minValue = 0, - ?int $maxValue = null + $minValue = 0, + $maxValue = null ) { $this->validate($minValue, $maxValue); $value[] = $minValue; $operator = Operator::GTE; - if ($maxValue >= 1) { + if ($maxValue > 0) { $operator = Operator::BETWEEN; $value[] = $maxValue; } @@ -57,12 +60,13 @@ public function getSpecifications(): array } /** + * @param numeric $minValue + * @param numeric|null $maxValue + * * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException */ - protected function validate( - int $minValue, - ?int $maxValue - ): void { + protected function validate($minValue, $maxValue): void + { if ($minValue < 0) { throw new InvalidArgumentException( '$minValue', @@ -72,11 +76,11 @@ protected function validate( if ( null !== $maxValue - && $maxValue < 1 + && $maxValue <= 0 ) { throw new InvalidArgumentException( '$maxValue', - 'Value should be grater or equal 1' + 'Value should be grater than 0' ); } diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/Image/FileSize.php b/src/contracts/Repository/Values/Content/Query/Criterion/Image/FileSize.php index 63fc9f64d9..f3f7f2db41 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion/Image/FileSize.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion/Image/FileSize.php @@ -11,12 +11,15 @@ final class FileSize extends AbstractImageRangeCriterion { /** + * @param numeric $minFileSize + * @param numeric|null $maxFileSize + * * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException */ public function __construct( string $fieldDefIdentifier, - int $minFileSize = 0, - ?int $maxFileSize = null + $minFileSize = 0, + $maxFileSize = null ) { if ($minFileSize > 0) { $minFileSize *= 1024 * 1024; From b9cfcca99e5abfbd351075fe14f122f0e829612a Mon Sep 17 00:00:00 2001 From: Tomasz Kryszan Date: Tue, 12 Dec 2023 11:53:55 +0100 Subject: [PATCH 2/3] [PHPStan] Regenerated baseline --- phpstan-baseline-7.4.neon | 4 +- phpstan-baseline-8.0.neon | 4 +- phpstan-baseline.neon | 113 +++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 66 deletions(-) diff --git a/phpstan-baseline-7.4.neon b/phpstan-baseline-7.4.neon index 63e48aa8de..d02e7d9c04 100644 --- a/phpstan-baseline-7.4.neon +++ b/phpstan-baseline-7.4.neon @@ -376,12 +376,12 @@ parameters: path: src/lib/Search/Common/FieldNameResolver.php - - message: "#^Parameter \\#1 \\$str of function trim expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$str of function trim expects string, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Ancestor.php - - message: "#^Parameter \\#1 \\$str of function trim expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$str of function trim expects string, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Ancestor.php diff --git a/phpstan-baseline-8.0.neon b/phpstan-baseline-8.0.neon index a9b6e51067..9d005984cb 100644 --- a/phpstan-baseline-8.0.neon +++ b/phpstan-baseline-8.0.neon @@ -311,12 +311,12 @@ parameters: path: src/lib/Search/Common/FieldNameResolver.php - - message: "#^Parameter \\#1 \\$string of function trim expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of function trim expects string, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Ancestor.php - - message: "#^Parameter \\#1 \\$string of function trim expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of function trim expects string, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Ancestor.php diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f077a780f9..293e5cf7e8 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -7150,11 +7150,6 @@ parameters: count: 1 path: src/contracts/Repository/Values/Content/Query/Criterion.php - - - message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\:\\:\\$value \\(array\\\\|bool\\|int\\|string\\) does not accept array\\\\|bool\\|int\\|string\\.$#" - count: 1 - path: src/contracts/Repository/Values/Content/Query/Criterion.php - - message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\:\\:\\$valueData \\(Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\Value\\) does not accept Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\Value\\|null\\.$#" count: 1 @@ -7240,11 +7235,6 @@ parameters: count: 1 path: src/contracts/Repository/Values/Content/Query/Criterion/LogicalOperator.php - - - message: "#^Parameter \\#3 \\$value of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\:\\:__construct\\(\\) expects array\\\\|bool\\|int\\|string, array\\\\|float given\\.$#" - count: 1 - path: src/contracts/Repository/Values/Content/Query/Criterion/MapLocationDistance.php - - message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\\\MapLocationDistance\\:\\:\\$boost type has no value type specified in iterable type array\\.$#" count: 1 @@ -18486,52 +18476,52 @@ parameters: path: src/lib/Persistence/Legacy/Exception/TypeGroupNotFound.php - - message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Content/ContentIdQueryBuilder.php - - message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Content/Section/IdQueryBuilder.php - - message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(int\\|string\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: array\\ given\\.$#" + message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(bool\\|float\\|int\\|string\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: array\\ given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/AncestorQueryBuilder.php - - message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/AncestorQueryBuilder.php - - message: "#^Parameter \\#2 \\$criterionValue of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Filter\\\\Doctrine\\\\FilteringQueryBuilder\\:\\:buildOperatorBasedCriterionConstraint\\(\\) expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$criterionValue of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Filter\\\\Doctrine\\\\FilteringQueryBuilder\\:\\:buildOperatorBasedCriterionConstraint\\(\\) expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/DepthQueryBuilder.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/IsMainLocationQueryBuilder.php - - message: "#^Parameter \\#2 \\$criterionValue of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Filter\\\\Doctrine\\\\FilteringQueryBuilder\\:\\:buildOperatorBasedCriterionConstraint\\(\\) expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$criterionValue of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Filter\\\\Doctrine\\\\FilteringQueryBuilder\\:\\:buildOperatorBasedCriterionConstraint\\(\\) expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/PriorityQueryBuilder.php - - message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(int\\|string\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: string given\\.$#" + message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(bool\\|float\\|int\\|string\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/SubtreeQueryBuilder.php - - message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/SubtreeQueryBuilder.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 2 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/VisibilityQueryBuilder.php @@ -18541,7 +18531,7 @@ parameters: path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/VisibilityQueryBuilder.php - - message: "#^Parameter \\#2 \\$visibleFlag of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\Location\\\\VisibilityQueryBuilder\\:\\:getVisibilityColumnsExpressions\\(\\) expects int, int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$visibleFlag of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\Location\\\\VisibilityQueryBuilder\\:\\:getVisibilityColumnsExpressions\\(\\) expects int, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/VisibilityQueryBuilder.php @@ -18566,22 +18556,22 @@ parameters: path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/LogicalOrQueryBuilder.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/User/IsUserBasedQueryBuilder.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/User/IsUserEnabledQueryBuilder.php - - message: "#^Parameter \\#1 \\$value of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\User\\\\BaseUserCriterionQueryBuilder\\:\\:transformCriterionValueForLikeExpression\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$value of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\User\\\\BaseUserCriterionQueryBuilder\\:\\:transformCriterionValueForLikeExpression\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/User/UserEmailQueryBuilder.php - - message: "#^Parameter \\#1 \\$value of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\User\\\\BaseUserCriterionQueryBuilder\\:\\:transformCriterionValueForLikeExpression\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$value of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Filter\\\\CriterionQueryBuilder\\\\User\\\\BaseUserCriterionQueryBuilder\\:\\:transformCriterionValueForLikeExpression\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/User/UserLoginQueryBuilder.php @@ -22116,7 +22106,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentTypeId.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentTypeIdentifier.php @@ -22126,7 +22116,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentTypeIdentifier.php - - message: "#^Parameter \\#1 \\$identifier of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Type\\\\Handler\\:\\:loadByIdentifier\\(\\) expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$identifier of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Type\\\\Handler\\:\\:loadByIdentifier\\(\\) expects string, bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentTypeIdentifier.php @@ -22176,7 +22166,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldBase.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldEmpty.php @@ -22231,12 +22221,12 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Converter.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php - - message: "#^Cannot access offset 1 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 1 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php @@ -22261,12 +22251,12 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:lowerCase\\(\\) expects string, int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:lowerCase\\(\\) expects string, bool\\|float\\|int\\|string given\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:prepareLikeString\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:prepareLikeString\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php @@ -22276,7 +22266,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php - - message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php @@ -22286,12 +22276,12 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:prepareLikeString\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:prepareLikeString\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler/Collection.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:lowerCase\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FieldValue\\\\Handler\\:\\:lowerCase\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FieldValue/Handler/Simple.php @@ -22331,7 +22321,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FullText.php - - message: "#^Parameter \\#2 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FullText\\:\\:getWordIdSubquery\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$string of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\FullText\\:\\:getWordIdSubquery\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FullText.php @@ -22346,7 +22336,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/IsUserBased.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/IsUserBased.php @@ -22356,7 +22346,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/IsUserEnabled.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/IsUserEnabled.php @@ -22376,7 +22366,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/LanguageCode.php - - message: "#^Parameter \\#1 \\$languageCodes of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\Language\\\\MaskGenerator\\:\\:generateLanguageMaskFromLanguageCodes\\(\\) expects array\\, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$languageCodes of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\Language\\\\MaskGenerator\\:\\:generateLanguageMaskFromLanguageCodes\\(\\) expects array\\, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/LanguageCode.php @@ -22411,12 +22401,12 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/LogicalOr.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/MapLocationDistance.php - - message: "#^Cannot access offset 1 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 1 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/MapLocationDistance.php @@ -22461,7 +22451,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/MapLocationDistance.php - - message: "#^Parameter \\#3 \\$distance of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\MapLocationDistance\\:\\:getBoundingConstraints\\(\\) expects float, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#3 \\$distance of method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Common\\\\Gateway\\\\CriterionHandler\\\\MapLocationDistance\\:\\:getBoundingConstraints\\(\\) expects float, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/MapLocationDistance.php @@ -22506,7 +22496,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/UserEmail.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Persistence\\\\TransformationProcessor\\:\\:transformByGroup\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Persistence\\\\TransformationProcessor\\:\\:transformByGroup\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/UserEmail.php @@ -22521,7 +22511,7 @@ parameters: path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/UserLogin.php - - message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Persistence\\\\TransformationProcessor\\:\\:transformByGroup\\(\\) expects string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$string of method Ibexa\\\\Core\\\\Persistence\\\\TransformationProcessor\\:\\:transformByGroup\\(\\) expects string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/UserLogin.php @@ -22691,7 +22681,7 @@ parameters: path: src/lib/Search/Legacy/Content/Gateway.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Ancestor.php @@ -22699,7 +22689,6 @@ parameters: message: "#^Method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Gateway\\\\CriterionHandler\\\\Ancestor\\:\\:handle\\(\\) has parameter \\$languageSettings with no value type specified in iterable type array\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Ancestor.php - - message: "#^Method Ibexa\\\\Core\\\\Search\\\\Legacy\\\\Content\\\\Gateway\\\\CriterionHandler\\\\LocationId\\:\\:handle\\(\\) has parameter \\$languageSettings with no value type specified in iterable type array\\.$#" count: 1 @@ -22716,7 +22705,7 @@ parameters: path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/ParentLocationId.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/PermissionSubtree.php @@ -22726,7 +22715,7 @@ parameters: path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/PermissionSubtree.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Subtree.php @@ -22736,7 +22725,7 @@ parameters: path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Subtree.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Gateway/CriterionHandler/Visibility.php @@ -22946,7 +22935,7 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Ancestor.php @@ -22956,12 +22945,12 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Ancestor.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Depth.php - - message: "#^Cannot access offset 1 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 1 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Depth.php @@ -22976,17 +22965,17 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Depth.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Depth.php - - message: "#^Parameter \\#2 \\$y of method Doctrine\\\\DBAL\\\\Query\\\\Expression\\\\ExpressionBuilder\\:\\:in\\(\\) expects array\\\\|string, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#2 \\$y of method Doctrine\\\\DBAL\\\\Query\\\\Expression\\\\ExpressionBuilder\\:\\:in\\(\\) expects array\\\\|string, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Depth.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/IsMainLocation.php @@ -22996,12 +22985,12 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/IsMainLocation.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Priority.php - - message: "#^Cannot access offset 1 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 1 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Priority.php @@ -23016,7 +23005,7 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Priority.php - - message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|int\\|string given\\.$#" + message: "#^Parameter \\#1 \\$array of function reset expects array\\|object, array\\\\|bool\\|float\\|int\\|string given\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Location/Priority.php @@ -23036,7 +23025,7 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/ParentLocationId.php - - message: "#^Argument of an invalid type array\\\\|bool\\|int\\|string supplied for foreach, only iterables are supported\\.$#" + message: "#^Argument of an invalid type array\\\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#" count: 1 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Subtree.php @@ -23046,7 +23035,7 @@ parameters: path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Subtree.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 2 path: src/lib/Search/Legacy/Content/Location/Gateway/CriterionHandler/Visibility.php @@ -37086,7 +37075,7 @@ parameters: path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php - - message: "#^Cannot access offset 0 on array\\\\|bool\\|int\\|string\\.$#" + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" count: 1 path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php @@ -37101,7 +37090,7 @@ parameters: path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php - - message: "#^Part \\$criterion\\-\\>value \\(array\\\\|bool\\|int\\|string\\) of encapsed string cannot be cast to string\\.$#" + message: "#^Part \\$criterion\\-\\>value \\(array\\\\|bool\\|float\\|int\\|string\\) of encapsed string cannot be cast to string\\.$#" count: 1 path: tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php From 84fb7d4bdbc65d7dd3df717c98edb02fea86d5be Mon Sep 17 00:00:00 2001 From: Maciej Kobus Date: Thu, 4 Jan 2024 15:57:57 +0100 Subject: [PATCH 3/3] Fixed typo in validation messages: grater to greater --- .../Query/Criterion/Image/AbstractImageRangeCriterion.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php index b72c6f6dd6..7540c6a3d5 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion/Image/AbstractImageRangeCriterion.php @@ -70,7 +70,7 @@ protected function validate($minValue, $maxValue): void if ($minValue < 0) { throw new InvalidArgumentException( '$minValue', - 'Value should be grater or equal 0' + 'Value should be greater or equal 0' ); } @@ -80,7 +80,7 @@ protected function validate($minValue, $maxValue): void ) { throw new InvalidArgumentException( '$maxValue', - 'Value should be grater than 0' + 'Value should be greater than 0' ); } @@ -90,7 +90,7 @@ protected function validate($minValue, $maxValue): void ) { throw new InvalidArgumentException( '$minValue', - 'Value should be grater than' . $maxValue + 'Value should be greater than' . $maxValue ); } }