From 48647795b40e070275e7f89e8e84940f5becfc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= Date: Sat, 30 Dec 2023 19:21:09 +0100 Subject: [PATCH] bump --- .github/workflows/main.yaml | 10 +++++----- README.md | 4 ++-- composer.json | 17 ++++++++--------- src/ContainerConstraintValidatorFactory.php | 7 +++---- src/DI/ValidatorExtension.php | 14 +++----------- tests/cases/ValidatorExtensionTest.php | 8 ++++---- 6 files changed, 25 insertions(+), 35 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 18f0065..a47de26 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - php-version: [ "8.0" ] + php-version: [ "8.3" ] operating-system: [ "ubuntu-latest" ] fail-fast: false @@ -82,7 +82,7 @@ jobs: strategy: matrix: - php-version: [ "8.0" ] + php-version: [ "8.3" ] operating-system: [ "ubuntu-latest" ] fail-fast: false @@ -138,11 +138,11 @@ jobs: strategy: matrix: - php-version: [ "7.4", "8.0", "8.1" ] + php-version: [ "8.1", "8.2", "8.3" ] operating-system: [ "ubuntu-latest" ] composer-args: [ "" ] include: - - php-version: "7.4" + - php-version: "8.1" operating-system: "ubuntu-latest" composer-args: "--prefer-lowest" fail-fast: false @@ -206,7 +206,7 @@ jobs: strategy: matrix: - php-version: [ "8.0" ] + php-version: [ "8.3" ] operating-system: [ "ubuntu-latest" ] fail-fast: false diff --git a/README.md b/README.md index 9106d79..d2b33b3 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ For details on how to use this package, check out our [documentation](.docs). | State | Version | Branch | Nette | PHP | |-------------|--------------|----------|----------|----------| -| stable | `^1.0` | `master` | `3.0+` | `>= 7.2` | -| development | `dev-master` | `master` | `3.0+` | `>= 7.2` | +| stable | `^2.0` | `master` | `3.0+` | `>= 8.1` | +| development | `dev-master` | `master` | `3.0+` | `>= 8.1` | ## Development diff --git a/composer.json b/composer.json index d618d6b..b16543a 100644 --- a/composer.json +++ b/composer.json @@ -17,24 +17,23 @@ } ], "require": { - "php": ">=7.4", + "php": ">=8.1", "nette/di": "^3.0.1", - "symfony/cache": "^5.0 || ^6.0", - "symfony/config": "^5.0 || ^6.0", - "symfony/validator": "^5.2 || ^6.0" + "symfony/cache": "^6.0 || ^7.0", + "symfony/config": "^6.0 || ^7.0", + "symfony/validator": "^6.4 || ^7.0" }, "require-dev": { - "doctrine/annotations": "^1.8", - "doctrine/cache": "^1.10", + "doctrine/cache": "^2.2", "nette/bootstrap": "^3.0", "nette/tester": "^2.4", - "ninjify/nunjuck": "^0.3.0", - "ninjify/qa": "^0.12", + "ninjify/nunjuck": "^0.4.0", + "ninjify/qa": "^0.13.0", "phpstan/phpstan": "^1.0", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-nette": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", - "symfony/translation": "^5.0" + "symfony/translation": "^7.0" }, "autoload": { "psr-4": { diff --git a/src/ContainerConstraintValidatorFactory.php b/src/ContainerConstraintValidatorFactory.php index 9baa4d3..1e82fc6 100644 --- a/src/ContainerConstraintValidatorFactory.php +++ b/src/ContainerConstraintValidatorFactory.php @@ -16,14 +16,13 @@ final class ContainerConstraintValidatorFactory implements ConstraintValidatorFactoryInterface { - private Container $container; - /** @var ConstraintValidatorInterface[] */ private array $validators; - public function __construct(Container $container) + public function __construct( + private readonly Container $container, + ) { - $this->container = $container; $this->validators = []; } diff --git a/src/DI/ValidatorExtension.php b/src/DI/ValidatorExtension.php index f37a023..1aeabc4 100644 --- a/src/DI/ValidatorExtension.php +++ b/src/DI/ValidatorExtension.php @@ -3,7 +3,6 @@ namespace Contributte\Validator\DI; use Contributte\Validator\ContainerConstraintValidatorFactory; -use Doctrine\Common\Annotations\Reader; use Nette\DI\CompilerExtension; use Nette\DI\Definitions\ServiceDefinition; use Nette\DI\Definitions\Statement; @@ -16,7 +15,6 @@ use Symfony\Component\Validator\ValidatorBuilder; use Symfony\Contracts\Translation\TranslatorInterface; use function assert; -use function interface_exists; use function is_string; /** @@ -29,7 +27,7 @@ public function getConfigSchema(): Schema { return Expect::structure([ 'mapping' => Expect::structure([ - 'annotations' => Expect::bool(interface_exists(Reader::class)), + 'attributes' => Expect::bool(true), 'xml' => Expect::listOf(Expect::string()->dynamic()), 'yaml' => Expect::listOf(Expect::string()->dynamic()), 'methods' => Expect::listOf(Expect::string()->dynamic()), @@ -77,14 +75,8 @@ public function beforeCompile(): void private function setupMapping(ServiceDefinition $validatorBuilder): void { - $validatorBuilder->addSetup('enableAnnotationMapping', [true]); - - if ($this->config->mapping->annotations) { - if ((bool) $this->getContainerBuilder()->findByType(Reader::class)) { - $validatorBuilder->addSetup('setDoctrineAnnotationReader'); - } else { - $validatorBuilder->addSetup('addDefaultDoctrineAnnotationReader'); - } + if ($this->config->mapping->attributes) { + $validatorBuilder->addSetup('enableAttributeMapping'); } $validatorBuilder->addSetup('addXmlMappings', [$this->config->mapping->xml]); diff --git a/tests/cases/ValidatorExtensionTest.php b/tests/cases/ValidatorExtensionTest.php index 5dd6b57..bebfd06 100644 --- a/tests/cases/ValidatorExtensionTest.php +++ b/tests/cases/ValidatorExtensionTest.php @@ -36,16 +36,16 @@ public function testCreateValidator(): void Assert::type(ValidatorInterface::class, $validator); } - public function testAnnotationMapping(): void + public function testAttributesMapping(): void { $container = $this->createContainer([ 'mapping' => [ - 'annotations' => true, + 'attributes' => true, ], ], __METHOD__); - $this->assertValidatorBuilderProperty($container, 'annotationReader', static function ($value): void { - Assert::type(Reader::class, $value); + $this->assertValidatorBuilderProperty($container, 'enableAttributeMapping', static function ($value): void { + Assert::true($value); }); }