From 50c2ba066ad932d232172bd9d86d52e9c54dadcc Mon Sep 17 00:00:00 2001 From: SonataCI Date: Thu, 7 Dec 2023 04:12:24 +0000 Subject: [PATCH 1/7] DevKit updates --- rector.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/rector.php b/rector.php index dd4380e3..2456d3ec 100644 --- a/rector.php +++ b/rector.php @@ -19,7 +19,6 @@ use Rector\Config\RectorConfig; use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector; -use Rector\Php71\Rector\FuncCall\CountOnNullRector; use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector; use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector; use Rector\PHPUnit\Set\PHPUnitLevelSetList; @@ -41,7 +40,6 @@ $rectorConfig->importNames(); $rectorConfig->importShortClasses(false); $rectorConfig->skip([ - CountOnNullRector::class, ExceptionHandlerTypehintRector::class, AddSeeTestAnnotationRector::class, PreferPHPUnitThisCallRector::class, From 8b908afc62fd4151bfea160e8f3b259cb432f914 Mon Sep 17 00:00:00 2001 From: SonataCI Date: Thu, 7 Dec 2023 16:12:09 +0000 Subject: [PATCH 2/7] DevKit updates --- .github/workflows/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aa96e451..ce1f8cd5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -50,13 +50,13 @@ jobs: - php-version: '8.2' dependencies: highest allowed-to-fail: false - symfony-require: 6.2.* - variant: symfony/symfony:"6.2.*" + symfony-require: 6.3.* + variant: symfony/symfony:"6.3.*" - php-version: '8.2' dependencies: highest allowed-to-fail: false - symfony-require: 6.3.* - variant: symfony/symfony:"6.3.*" + symfony-require: 6.4.* + variant: symfony/symfony:"6.4.*" - php-version: '8.2' dependencies: highest allowed-to-fail: false From f2c321749d5f44ed1d4731bf6a313307b3ce58b9 Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Sun, 17 Dec 2023 10:01:47 +0100 Subject: [PATCH 3/7] Fix psalm --- src/Bridge/Symfony/DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bridge/Symfony/DependencyInjection/Configuration.php b/src/Bridge/Symfony/DependencyInjection/Configuration.php index 2943d6f5..1c3ce4cc 100644 --- a/src/Bridge/Symfony/DependencyInjection/Configuration.php +++ b/src/Bridge/Symfony/DependencyInjection/Configuration.php @@ -38,7 +38,7 @@ public function getConfigTreeBuilder(): TreeBuilder /** * Returns configuration for flash messages. * - * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod + * @psalm-suppress UndefinedInterfaceMethod * * @see https://github.com/psalm/psalm-plugin-symfony/issues/174 */ From e1766a80518d15614ef5929df7aac5c325c95824 Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Sun, 17 Dec 2023 10:13:04 +0100 Subject: [PATCH 4/7] Fix tests for sf >= 6.4 --- tests/Type/FormChoiceWidgetTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Type/FormChoiceWidgetTest.php b/tests/Type/FormChoiceWidgetTest.php index f10a3a00..d613ecdd 100644 --- a/tests/Type/FormChoiceWidgetTest.php +++ b/tests/Type/FormChoiceWidgetTest.php @@ -36,7 +36,7 @@ public function testLabelRendering(): void ); $html = $this->renderWidget($choice->createView()); - if (0 !== preg_match("/7\..\../", Kernel::VERSION)) { + if (version_compare(Kernel::VERSION, '6.4.0', '>=')) { static::assertStringContainsString( $this->cleanHtmlWhitespace( <<<'HTML' From 6d8cc4ad64ecf51dca2e4b90217764ab71252ccf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 09:17:58 +0000 Subject: [PATCH 5/7] Bump @adobe/css-tools from 4.3.1 to 4.3.2 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7919f685..0cff1f71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,9 +77,9 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", - "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", + "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==", "dev": true }, "node_modules/@ampproject/remapping": { From 85c9516e5d6a0e7ee65a4c67de1dbf237b2465cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 09:21:40 +0000 Subject: [PATCH 6/7] Bump vite from 4.5.0 to 4.5.1 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.1/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.1/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cff1f71..348faa26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13806,9 +13806,9 @@ } }, "node_modules/vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz", + "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==", "dev": true, "dependencies": { "esbuild": "^0.18.10", From 844a2ddea1c4a785f5566ea3a00c7204274f67b2 Mon Sep 17 00:00:00 2001 From: SonataCI Date: Sun, 17 Dec 2023 20:11:56 +0000 Subject: [PATCH 7/7] DevKit updates --- .php-cs-fixer.dist.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 1afe2e23..d197afd5 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -27,8 +27,9 @@ HEADER; $rules = [ - '@PHP74Migration' => true, - '@PHP74Migration:risky' => true, + '@PHP80Migration' => true, + '@PHP80Migration:risky' => true, + '@PHPUnit84Migration:risky' => true, '@PSR12' => true, '@PSR12:risky' => true, '@Symfony' => true, @@ -42,6 +43,7 @@ 'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'], 'no_useless_else' => true, 'no_useless_return' => true, + 'no_superfluous_elseif' => true, 'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true], 'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true], 'ordered_class_elements' => true, @@ -51,16 +53,14 @@ ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'], ['psalm-suppress', 'phpstan-ignore-next-line'], ['Assert\\*'], - ['ODM\\*'], - ['ORM\\*'], ]], - 'php_unit_strict' => true, - 'php_unit_test_case_static_method_calls' => true, 'php_unit_data_provider_name' => true, 'php_unit_data_provider_return_type' => true, + 'php_unit_strict' => true, + 'php_unit_test_case_static_method_calls' => true, 'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']], - 'single_line_throw' => false, 'static_lambda' => true, + 'single_line_throw' => false, 'strict_comparison' => true, 'strict_param' => true, 'void_return' => false,