From 591259d1713fb63294c46f1af2e4aa618bc6ffb1 Mon Sep 17 00:00:00 2001 From: Massimiliano Arione Date: Sat, 10 Aug 2024 15:30:43 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20drop=20php=208.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 - .github/workflows/build.yaml | 7 +++---- .php-cs-fixer.php | 5 ++--- CHANGELOG.md | 7 ------- composer.json | 10 +++++----- phpunit.xml.dist | 14 +++++++++----- src/Form/Messenger/AbstractBusType.php | 2 +- src/Form/SimpleBus/AbstractBusType.php | 2 +- 8 files changed, 21 insertions(+), 27 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/.gitattributes b/.gitattributes index c60a4b0..62ae6af 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,5 @@ /.git* export-ignore /.php-cs-fixer.* export-ignore -/CHANGELOG.md export-ignore /docs/ export-ignore /phpstan*.neon export-ignore /phpunit.xml.dist export-ignore diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9920797..4874f5d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,19 +30,18 @@ jobs: strategy: matrix: php: - - '8.1' - '8.2' - '8.3' include: - description: 'Lowest' - php: '8.1' + php: '8.2' composer_option: '--prefer-lowest' - description: 'Symfony 6.4' php: '8.2' symfony: 6.4.* - - description: 'Symfony 7.0' + - description: 'Symfony 7.1' php: '8.3' - symfony: 7.0.* + symfony: 7.1.* name: PHP ${{ matrix.php }} tests (${{ matrix.description }}) steps: - name: Checkout diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 77e9050..55e66d5 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -10,9 +10,8 @@ ->setRules([ '@Symfony' => true, '@Symfony:risky' => true, - '@PHP71Migration:risky' => true, - '@PHPUnit75Migration:risky' => true, - 'ordered_imports' => true, + '@PHP82Migration' => true, + '@PHPUnit100Migration:risky' => true, 'declare_strict_types' => false, 'native_function_invocation' => ['include' => ['@all']], ]) diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 0250620..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,7 +0,0 @@ -# CHANGELOG - -## 0.8 - -* [BC BREAK] moved AbstractBusFormType and BusType to `SimpleBus` namespace -* [BC BREAK] AbstractBusFormType now accepts only objects in `$command` argument -* Added new AbstractBusFormType for Symfony Messenger diff --git a/composer.json b/composer.json index a969758..48dfc25 100644 --- a/composer.json +++ b/composer.json @@ -10,14 +10,14 @@ } ], "require": { - "php": "^8.1", - "symfony/form": "^6.4 || ^7.0", - "symfony/framework-bundle": "^6.4 || ^7.0" + "php": "^8.2", + "symfony/form": "^6.4 || ^7.1", + "symfony/framework-bundle": "^6.4 || ^7.1" }, "require-dev": { "phpunit/phpunit": "^11.3", - "simple-bus/message-bus": "^6.0", - "symfony/messenger": "^6.4 || ^7.0" + "simple-bus/message-bus": "^6.3", + "symfony/messenger": "^6.4 || ^7.1" }, "extra": { "branch-alias": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index da88f0c..5c5d784 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,14 +1,18 @@ - - + - tests + tests - + src - + diff --git a/src/Form/Messenger/AbstractBusType.php b/src/Form/Messenger/AbstractBusType.php index 2d3e30e..fc8ba8a 100644 --- a/src/Form/Messenger/AbstractBusType.php +++ b/src/Form/Messenger/AbstractBusType.php @@ -22,7 +22,7 @@ public function __construct(private Bus $bus) */ public function buildForm(FormBuilderInterface $builder, array $options): void { - if (isset($options['data']) && is_object($options['data'])) { + if (isset($options['data']) && \is_object($options['data'])) { $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($options): void { $this->handle($event, $options['data']); }); diff --git a/src/Form/SimpleBus/AbstractBusType.php b/src/Form/SimpleBus/AbstractBusType.php index aa8c942..a5f9639 100644 --- a/src/Form/SimpleBus/AbstractBusType.php +++ b/src/Form/SimpleBus/AbstractBusType.php @@ -21,7 +21,7 @@ public function __construct(private Bus $bus) */ public function buildForm(FormBuilderInterface $builder, array $options): void { - if (isset($options['data']) && is_object($options['data'])) { + if (isset($options['data']) && \is_object($options['data'])) { $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($options): void { $this->handle($event, $options['data']); });