From daef95c0482b0f349b63a660bbec0df2d5612511 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:17:58 +0200 Subject: [PATCH 1/7] Update ecs using paths function --- ecs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs.php b/ecs.php index cd1db6b..1006466 100644 --- a/ecs.php +++ b/ecs.php @@ -7,7 +7,7 @@ return static function (ECSConfig $config): void { $config->import('vendor/sylius-labs/coding-standard/ecs.php'); - $config->parameters()->set(Option::PATHS, [ + $config->paths([ 'src', 'tests' ]); }; From 9a6ee81fd33174a0c9a37311ec1a14272ecf424f Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:27:16 +0200 Subject: [PATCH 2/7] Update CronExpressionType.php --- src/Doctrine/DBAL/Types/CronExpressionType.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Doctrine/DBAL/Types/CronExpressionType.php b/src/Doctrine/DBAL/Types/CronExpressionType.php index 04458ee..6b08ee5 100644 --- a/src/Doctrine/DBAL/Types/CronExpressionType.php +++ b/src/Doctrine/DBAL/Types/CronExpressionType.php @@ -32,12 +32,11 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr if (!is_string($value)) { if (class_exists(InvalidType::class)) { throw InvalidType::new($value, CronExpression::class, ['string']); - } else { - /** - * @psalm-suppress UndefinedMethod - */ - throw ConversionException::conversionFailedInvalidType($value, CronExpression::class, ['string']); } + /** + * @psalm-suppress UndefinedMethod + */ + throw ConversionException::conversionFailedInvalidType($value, CronExpression::class, ['string']); } if ('' === $value) { @@ -49,12 +48,11 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr } catch (\Throwable $e) { if (class_exists(ValueNotConvertible::class)) { throw ValueNotConvertible::new($value, CronExpression::class, null, $e); - } else { - /** - * @psalm-suppress UndefinedMethod - */ - throw ConversionException::conversionFailed($value, CronExpression::class, $e); } + /** + * @psalm-suppress UndefinedMethod + */ + throw ConversionException::conversionFailed($value, CronExpression::class, $e); } } From 92003f07065be01a0b80651aec3afe0b0610b00a Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:28:32 +0200 Subject: [PATCH 3/7] Update CronExpression.php --- src/Validator/CronExpression.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Validator/CronExpression.php b/src/Validator/CronExpression.php index 8f4defc..3533ea8 100644 --- a/src/Validator/CronExpression.php +++ b/src/Validator/CronExpression.php @@ -9,6 +9,7 @@ /** * @Annotation + * * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) */ #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] @@ -17,16 +18,13 @@ class CronExpression extends Constraint public string $message = '{{ value }} is not a valid cron expression.'; /** - * @param string|null $message * @param string[]|null $groups - * @param mixed $payload - * @param array $options */ public function __construct( string $message = null, ?array $groups = null, mixed $payload = null, - array $options = [] + array $options = [], ) { parent::__construct($options, $groups, $payload); From f12aff35dc72e3f3747fc9f349fb58973c98e464 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:29:47 +0200 Subject: [PATCH 4/7] Update CronExpressionTypeGuesser.php --- src/Form/TypeGuesser/CronExpressionTypeGuesser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Form/TypeGuesser/CronExpressionTypeGuesser.php b/src/Form/TypeGuesser/CronExpressionTypeGuesser.php index 558e17c..94a3e36 100644 --- a/src/Form/TypeGuesser/CronExpressionTypeGuesser.php +++ b/src/Form/TypeGuesser/CronExpressionTypeGuesser.php @@ -24,6 +24,7 @@ public function __construct(?PropertyTypeExtractorInterface $extractor = null) { $this->extractor = $extractor ?? $this->createExtractor(); } + /** * @param string $class * @param string $property @@ -34,7 +35,6 @@ public function guessType($class, $property): ?TypeGuess return null; } - $types = $this->extractor->getTypes($class, $property); if (!$types) { return null; @@ -45,6 +45,7 @@ public function guessType($class, $property): ?TypeGuess return new TypeGuess(CronExpressionType::class, [], Guess::VERY_HIGH_CONFIDENCE); } } + return null; } From 65cb4d266581e1f62bef21855f0db0b5d8ccf644 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:36:01 +0200 Subject: [PATCH 5/7] Update CronExpression.php fix php7.4 --- src/Validator/CronExpression.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Validator/CronExpression.php b/src/Validator/CronExpression.php index 3533ea8..b498e61 100644 --- a/src/Validator/CronExpression.php +++ b/src/Validator/CronExpression.php @@ -24,7 +24,7 @@ public function __construct( string $message = null, ?array $groups = null, mixed $payload = null, - array $options = [], + array $options = [] ) { parent::__construct($options, $groups, $payload); From 2f1db5ffdbdcd4b4c1e259e2757b694d676e363c Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:39:36 +0200 Subject: [PATCH 6/7] Update CronExpression.php fixed payload param --- src/Validator/CronExpression.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Validator/CronExpression.php b/src/Validator/CronExpression.php index b498e61..d5a8d55 100644 --- a/src/Validator/CronExpression.php +++ b/src/Validator/CronExpression.php @@ -19,11 +19,12 @@ class CronExpression extends Constraint /** * @param string[]|null $groups + * @param mixed|null $payload */ public function __construct( string $message = null, ?array $groups = null, - mixed $payload = null, + $payload = null, array $options = [] ) { parent::__construct($options, $groups, $payload); From 384dfc2cf24871aba8c340f30fc9da9d70d16414 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Mon, 21 Oct 2024 17:44:56 +0200 Subject: [PATCH 7/7] Update CronExpressionType.php code style --- src/Doctrine/DBAL/Types/CronExpressionType.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Doctrine/DBAL/Types/CronExpressionType.php b/src/Doctrine/DBAL/Types/CronExpressionType.php index 6b08ee5..88dcbc9 100644 --- a/src/Doctrine/DBAL/Types/CronExpressionType.php +++ b/src/Doctrine/DBAL/Types/CronExpressionType.php @@ -33,6 +33,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr if (class_exists(InvalidType::class)) { throw InvalidType::new($value, CronExpression::class, ['string']); } + /** * @psalm-suppress UndefinedMethod */ @@ -49,6 +50,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr if (class_exists(ValueNotConvertible::class)) { throw ValueNotConvertible::new($value, CronExpression::class, null, $e); } + /** * @psalm-suppress UndefinedMethod */