From 1b20b75ae0fb27f7f7e89d3e62dc7d6d58578143 Mon Sep 17 00:00:00 2001 From: Jordi Date: Tue, 1 Sep 2020 08:55:53 +0200 Subject: [PATCH] Fix workflows and update some dependencies --- .github/workflows/ci.yaml | 22 +++++++---- .github/workflows/monorepo.yaml | 2 +- .github/workflows/qa.yaml | 2 +- .github/workflows/split_ci.yaml | 4 +- composer.json | 4 +- monorepo-builder.yaml | 3 +- packages/basic-page-bundle/composer.json | 2 +- packages/basic-page-bundle/phpunit.xml.dist | 35 +++++++++-------- .../basic-page-bundle/tests/App/Kernel.php | 16 ++++---- .../composer.json | 2 +- .../phpunit.xml.dist | 35 +++++++++-------- .../tests/App/Kernel.php | 12 +++--- packages/cookies-bundle/composer.json | 2 +- packages/cookies-bundle/phpunit.xml.dist | 35 +++++++++-------- packages/cookies-bundle/tests/App/Kernel.php | 16 ++++---- packages/form-handler-bundle/composer.json | 2 +- packages/form-handler-bundle/phpunit.xml.dist | 33 +++++++++------- packages/redirection-bundle/composer.json | 2 +- packages/redirection-bundle/phpunit.xml.dist | 35 +++++++++-------- .../redirection-bundle/tests/App/Kernel.php | 12 +++--- packages/render-event-bundle/composer.json | 2 +- packages/render-event-bundle/phpunit.xml.dist | 33 +++++++++------- packages/seo-bundle/composer.json | 2 +- packages/seo-bundle/phpunit.xml.dist | 35 +++++++++-------- packages/seo-bundle/tests/App/Kernel.php | 18 ++++----- .../tests/Unit/AlternateLinksBuilderTest.php | 2 +- .../sortable-behavior-bundle/composer.json | 2 +- .../sortable-behavior-bundle/phpunit.xml.dist | 35 +++++++++-------- .../tests/App/Kernel.php | 10 ++--- packages/testing/composer.json | 2 +- packages/testing/phpunit.xml.dist | 39 ++++++++++--------- packages/testing/tests/App/Kernel.php | 6 +-- packages/translation-bundle/composer.json | 2 +- packages/translation-bundle/phpunit.xml.dist | 35 +++++++++-------- .../translation-bundle/tests/App/Kernel.php | 14 +++---- phpunit.xml.dist | 37 ++++++++++-------- tests/App/Kernel.php | 22 +++++------ 37 files changed, 306 insertions(+), 266 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 41449230..756942c3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,15 +8,19 @@ on: jobs: build: runs-on: ubuntu-latest + continue-on-error: ${{ matrix.allowed_to_fail }} strategy: matrix: - php: ['7.4'] - dependencies: [highest, lowest] - composer: [v2] + php: ['7.3', '7.4'] + dependencies: [highest] + allowed_to_fail: [false] include: - php: '7.3' + dependencies: lowest + allowed_to_fail: false + - php: '8.0' dependencies: highest - composer: v1 + allowed_to_fail: true steps: - uses: actions/checkout@v2 - uses: shivammathur/setup-php@v2 @@ -24,18 +28,20 @@ jobs: php-version: ${{ matrix.php }} ini-values: pcov.directory=packages coverage: pcov - tools: composer:${{ matrix.composer }} + tools: composer:v2 - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - uses: actions/cache@v2 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.composer }}-${{ matrix.dependencies }} + key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }} restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer- + - if: matrix.php == '8.0' + run: composer config platform.php 7.4.99 - if: matrix.dependencies == 'lowest' - run: composer update --no-interaction --no-progress --prefer-lowest + run: composer update --no-interaction --no-progress --prefer-stable --prefer-lowest - if: matrix.dependencies == 'highest' - run: composer update --no-interaction --no-progress + run: composer update --no-interaction --no-progress --prefer-stable - run: vendor/bin/phpunit --coverage-clover=clover.xml - uses: codecov/codecov-action@v1 diff --git a/.github/workflows/monorepo.yaml b/.github/workflows/monorepo.yaml index 5806f1c7..ad29cf75 100644 --- a/.github/workflows/monorepo.yaml +++ b/.github/workflows/monorepo.yaml @@ -24,7 +24,7 @@ jobs: with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-${{ matrix.php }}-composer - - run: composer update --prefer-dist --no-progress --no-interaction + - run: composer update --no-interaction --no-progress --prefer-stable - run: vendor/bin/monorepo-builder split --max-processes 7 env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 683af260..5876a7f3 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -24,7 +24,7 @@ jobs: with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-${{ matrix.php }}-composer - - run: composer update --prefer-dist --no-progress --no-interaction --no-scripts + - run: composer update --no-interaction --no-progress --prefer-stable --no-scripts - run: composer php-cs-fixer -- --dry-run --format=checkstyle | cs2pr - run: vendor/bin/phpunit - run: composer phpstan diff --git a/.github/workflows/split_ci.yaml b/.github/workflows/split_ci.yaml index c6fa6e6e..7dd81dce 100644 --- a/.github/workflows/split_ci.yaml +++ b/.github/workflows/split_ci.yaml @@ -38,7 +38,7 @@ jobs: key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.packages }} restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer- - run: cd packages/${{ matrix.packages }} && composer validate --strict - - run: composer update --no-interaction --no-progress + - run: composer update --no-interaction --no-progress --prefer-stable - run: vendor/bin/monorepo-builder localize-composer-paths - - run: cd packages/${{ matrix.packages }} && composer update --no-interaction --no-progress + - run: cd packages/${{ matrix.packages }} && composer update --no-interaction --no-progress --prefer-stable - run: cd packages/${{ matrix.packages }} && vendor/bin/phpunit diff --git a/composer.json b/composer.json index 8c751ee8..eedf0f8a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "friendsofsymfony/ckeditor-bundle": "^1.2 || ^2.2", "gedmo/doctrine-extensions": "^2.4", "knplabs/doctrine-behaviors": "^2.0.6", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "sonata-project/admin-bundle": "^3.68", "sonata-project/doctrine-extensions": "^1.9", "sonata-project/doctrine-orm-admin-bundle": "^3.20", @@ -70,7 +70,7 @@ "phpstan/phpstan-phpunit": "^0.12", "phpstan/phpstan-strict-rules": "^0.12", "phpstan/phpstan-symfony": "^0.12", - "psalm/plugin-phpunit": "^0.10", + "psalm/plugin-phpunit": "^0.12", "psalm/plugin-symfony": "^1.2", "psr/event-dispatcher": "^1.0", "symfony/phpunit-bridge": "^5.1", diff --git a/monorepo-builder.yaml b/monorepo-builder.yaml index 457246cd..206c475e 100644 --- a/monorepo-builder.yaml +++ b/monorepo-builder.yaml @@ -9,7 +9,8 @@ parameters: phpstan/phpstan-phpunit: ^0.12 phpstan/phpstan-symfony: ^0.12 phpstan/phpstan-strict-rules: ^0.12 - psalm/plugin-phpunit: ^0.10 + phpunit/phpunit: ^9.3 + psalm/plugin-phpunit: ^0.12 psalm/plugin-symfony: ^1.2 symplify/changelog-linker: ^8.0 symplify/monorepo-builder: ^8.0 diff --git a/packages/basic-page-bundle/composer.json b/packages/basic-page-bundle/composer.json index a3adc005..31c20119 100644 --- a/packages/basic-page-bundle/composer.json +++ b/packages/basic-page-bundle/composer.json @@ -45,7 +45,7 @@ "nelmio/alice": "^3.7", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/framework-bundle": "^4.4 || ^5.1", "symfony/phpunit-bridge": "^5.1", diff --git a/packages/basic-page-bundle/phpunit.xml.dist b/packages/basic-page-bundle/phpunit.xml.dist index 8f23d0c0..96be4e1b 100644 --- a/packages/basic-page-bundle/phpunit.xml.dist +++ b/packages/basic-page-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/basic-page-bundle/tests/App/Kernel.php b/packages/basic-page-bundle/tests/App/Kernel.php index a8fea787..da03a882 100644 --- a/packages/basic-page-bundle/tests/App/Kernel.php +++ b/packages/basic-page-bundle/tests/App/Kernel.php @@ -78,35 +78,35 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->setParameter('kernel.default_locale', 'en'); + $c->setParameter('kernel.default_locale', 'en'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => ['auto_mapping' => true], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('a2lix_translation_form', [ + $c->loadFromExtension('a2lix_translation_form', [ 'locales' => ['es', 'en', 'ca'], ]); - $container->loadFromExtension('runroom_seo', [ + $c->loadFromExtension('runroom_seo', [ 'locales' => ['es', 'en', 'ca'], 'xdefault_locale' => 'es', 'class' => ['media' => Media::class], diff --git a/packages/ckeditor-sonata-media-bundle/composer.json b/packages/ckeditor-sonata-media-bundle/composer.json index 1f6ab1f0..5e0ad4ab 100644 --- a/packages/ckeditor-sonata-media-bundle/composer.json +++ b/packages/ckeditor-sonata-media-bundle/composer.json @@ -34,7 +34,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/phpunit-bridge": "^5.1" }, diff --git a/packages/ckeditor-sonata-media-bundle/phpunit.xml.dist b/packages/ckeditor-sonata-media-bundle/phpunit.xml.dist index a00a0cfa..0ed6e7d9 100644 --- a/packages/ckeditor-sonata-media-bundle/phpunit.xml.dist +++ b/packages/ckeditor-sonata-media-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php b/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php index 9c8dec5c..d017ce37 100644 --- a/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php +++ b/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php @@ -68,29 +68,29 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => ['auto_mapping' => true], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('sonata_media', [ + $c->loadFromExtension('sonata_media', [ 'default_context' => 'default', 'contexts' => ['default' => []], 'cdn' => null, diff --git a/packages/cookies-bundle/composer.json b/packages/cookies-bundle/composer.json index 1e49c6e3..65f5a45c 100644 --- a/packages/cookies-bundle/composer.json +++ b/packages/cookies-bundle/composer.json @@ -43,7 +43,7 @@ "nelmio/alice": "^3.7", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/phpunit-bridge": "^5.1", "theofidry/alice-data-fixtures": "^1.2" diff --git a/packages/cookies-bundle/phpunit.xml.dist b/packages/cookies-bundle/phpunit.xml.dist index 7cb5a4b5..f3653435 100644 --- a/packages/cookies-bundle/phpunit.xml.dist +++ b/packages/cookies-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/cookies-bundle/tests/App/Kernel.php b/packages/cookies-bundle/tests/App/Kernel.php index 3b03e81f..a1432a4b 100644 --- a/packages/cookies-bundle/tests/App/Kernel.php +++ b/packages/cookies-bundle/tests/App/Kernel.php @@ -77,36 +77,36 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->setParameter('kernel.default_locale', 'en'); + $c->setParameter('kernel.default_locale', 'en'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', 'session' => ['storage_id' => 'session.storage.mock_file'], ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => ['auto_mapping' => true], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('a2lix_translation_form', [ + $c->loadFromExtension('a2lix_translation_form', [ 'locales' => ['es', 'en', 'ca'], ]); - $container->loadFromExtension('runroom_cookies', [ + $c->loadFromExtension('runroom_cookies', [ 'cookies' => [ 'mandatory_cookies' => [[ 'name' => 'test', diff --git a/packages/form-handler-bundle/composer.json b/packages/form-handler-bundle/composer.json index abd6875c..7cc581a6 100644 --- a/packages/form-handler-bundle/composer.json +++ b/packages/form-handler-bundle/composer.json @@ -30,7 +30,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "symfony/phpunit-bridge": "^5.1" }, "config": { diff --git a/packages/form-handler-bundle/phpunit.xml.dist b/packages/form-handler-bundle/phpunit.xml.dist index 269c7e5b..8b91af5e 100644 --- a/packages/form-handler-bundle/phpunit.xml.dist +++ b/packages/form-handler-bundle/phpunit.xml.dist @@ -1,31 +1,34 @@ - tests - + - - + + src - - + + - + diff --git a/packages/redirection-bundle/composer.json b/packages/redirection-bundle/composer.json index 8f986c5f..c9a7f40a 100644 --- a/packages/redirection-bundle/composer.json +++ b/packages/redirection-bundle/composer.json @@ -44,7 +44,7 @@ "nelmio/alice": "^3.7", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/framework-bundle": "^4.4 || ^5.1", "symfony/phpunit-bridge": "^5.1", diff --git a/packages/redirection-bundle/phpunit.xml.dist b/packages/redirection-bundle/phpunit.xml.dist index cece4d11..5ba5c6bb 100644 --- a/packages/redirection-bundle/phpunit.xml.dist +++ b/packages/redirection-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/redirection-bundle/tests/App/Kernel.php b/packages/redirection-bundle/tests/App/Kernel.php index 4c242eeb..ef40278b 100644 --- a/packages/redirection-bundle/tests/App/Kernel.php +++ b/packages/redirection-bundle/tests/App/Kernel.php @@ -65,19 +65,19 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => [ 'auto_mapping' => true, @@ -92,12 +92,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa ], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('runroom_redirection', [ + $c->loadFromExtension('runroom_redirection', [ 'enable_automatic_redirections' => true, 'automatic_redirections' => [ Entity\Entity::class => [ diff --git a/packages/render-event-bundle/composer.json b/packages/render-event-bundle/composer.json index 6787279f..9725547e 100644 --- a/packages/render-event-bundle/composer.json +++ b/packages/render-event-bundle/composer.json @@ -36,7 +36,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "psr/event-dispatcher": "^1.0", "symfony/phpunit-bridge": "^5.1" }, diff --git a/packages/render-event-bundle/phpunit.xml.dist b/packages/render-event-bundle/phpunit.xml.dist index 703ec5b0..4a11938a 100644 --- a/packages/render-event-bundle/phpunit.xml.dist +++ b/packages/render-event-bundle/phpunit.xml.dist @@ -1,31 +1,34 @@ - tests - + - - + + src - - + + - + diff --git a/packages/seo-bundle/composer.json b/packages/seo-bundle/composer.json index ab9e2162..3e4b4687 100644 --- a/packages/seo-bundle/composer.json +++ b/packages/seo-bundle/composer.json @@ -49,7 +49,7 @@ "nelmio/alice": "^3.7", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/phpunit-bridge": "^5.1", "theofidry/alice-data-fixtures": "^1.2" diff --git a/packages/seo-bundle/phpunit.xml.dist b/packages/seo-bundle/phpunit.xml.dist index 31a44fd9..6d81cea1 100644 --- a/packages/seo-bundle/phpunit.xml.dist +++ b/packages/seo-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/seo-bundle/tests/App/Kernel.php b/packages/seo-bundle/tests/App/Kernel.php index 6e233a97..2bb8a61e 100644 --- a/packages/seo-bundle/tests/App/Kernel.php +++ b/packages/seo-bundle/tests/App/Kernel.php @@ -80,22 +80,22 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->setParameter('kernel.default_locale', 'en'); + $c->setParameter('kernel.default_locale', 'en'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', 'session' => ['storage_id' => 'session.storage.mock_file'], ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => [ 'auto_mapping' => true, @@ -110,16 +110,16 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa ], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('a2lix_translation_form', [ + $c->loadFromExtension('a2lix_translation_form', [ 'locales' => ['es', 'en', 'ca'], ]); - $container->loadFromExtension('sonata_media', [ + $c->loadFromExtension('sonata_media', [ 'default_context' => 'default', 'contexts' => ['default' => []], 'cdn' => null, @@ -132,7 +132,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa 'filesystem' => ['local' => null], ]); - $container->loadFromExtension('runroom_seo', [ + $c->loadFromExtension('runroom_seo', [ 'locales' => ['es', 'en', 'ca'], 'xdefault_locale' => 'es', 'class' => ['media' => Media::class], diff --git a/packages/seo-bundle/tests/Unit/AlternateLinksBuilderTest.php b/packages/seo-bundle/tests/Unit/AlternateLinksBuilderTest.php index 58d216e4..18b45578 100644 --- a/packages/seo-bundle/tests/Unit/AlternateLinksBuilderTest.php +++ b/packages/seo-bundle/tests/Unit/AlternateLinksBuilderTest.php @@ -87,7 +87,7 @@ public function itReturnsEmptyAlternateLinksIfRouteDoesNotExist(): void class DummyAlternateLinksProvider extends AbstractAlternateLinksProvider { /** @return array|null */ - public function getParameters($model, string $route): ?array + public function getParameters($model, string $locale): ?array { return [ 'dummy_param' => 'dummy_value', diff --git a/packages/sortable-behavior-bundle/composer.json b/packages/sortable-behavior-bundle/composer.json index 9754d24c..75be0fb0 100644 --- a/packages/sortable-behavior-bundle/composer.json +++ b/packages/sortable-behavior-bundle/composer.json @@ -35,7 +35,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "sonata-project/admin-bundle": "^3.68", "sonata-project/doctrine-orm-admin-bundle": "^3.20", diff --git a/packages/sortable-behavior-bundle/phpunit.xml.dist b/packages/sortable-behavior-bundle/phpunit.xml.dist index 73f802ba..7a7fc7fe 100644 --- a/packages/sortable-behavior-bundle/phpunit.xml.dist +++ b/packages/sortable-behavior-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/sortable-behavior-bundle/tests/App/Kernel.php b/packages/sortable-behavior-bundle/tests/App/Kernel.php index 4129a050..1f0d2c4b 100644 --- a/packages/sortable-behavior-bundle/tests/App/Kernel.php +++ b/packages/sortable-behavior-bundle/tests/App/Kernel.php @@ -61,21 +61,21 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { $loader->load($this->getProjectDir() . '/services.yaml'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => [ 'auto_mapping' => true, @@ -90,7 +90,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa ], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); diff --git a/packages/testing/composer.json b/packages/testing/composer.json index d96e9c4f..b679802e 100644 --- a/packages/testing/composer.json +++ b/packages/testing/composer.json @@ -24,7 +24,7 @@ "doctrine/dbal": "^2.10", "doctrine/doctrine-bundle": "^2.1", "doctrine/orm": "^2.7", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "symfony/dependency-injection": "^4.4 || ^5.1", "symfony/framework-bundle": "^4.4 || ^5.1", "symfony/http-foundation": "^4.4.7 || ^5.1", diff --git a/packages/testing/phpunit.xml.dist b/packages/testing/phpunit.xml.dist index 5ebcb494..bbff0c64 100644 --- a/packages/testing/phpunit.xml.dist +++ b/packages/testing/phpunit.xml.dist @@ -1,32 +1,35 @@ - + + + src + + + tests - + - - - src - - - - - + + diff --git a/packages/testing/tests/App/Kernel.php b/packages/testing/tests/App/Kernel.php index 0499b8af..54180fe4 100644 --- a/packages/testing/tests/App/Kernel.php +++ b/packages/testing/tests/App/Kernel.php @@ -52,15 +52,15 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => ['auto_mapping' => true], ]); diff --git a/packages/translation-bundle/composer.json b/packages/translation-bundle/composer.json index 38b85f2b..5709d270 100644 --- a/packages/translation-bundle/composer.json +++ b/packages/translation-bundle/composer.json @@ -44,7 +44,7 @@ "nelmio/alice": "^3.7", "phpspec/prophecy": "^1.11.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1.3", + "phpunit/phpunit": "^9.3", "runroom-packages/testing": "^0.9", "symfony/phpunit-bridge": "^5.1", "theofidry/alice-data-fixtures": "^1.2" diff --git a/packages/translation-bundle/phpunit.xml.dist b/packages/translation-bundle/phpunit.xml.dist index c03d99fb..afc060c5 100644 --- a/packages/translation-bundle/phpunit.xml.dist +++ b/packages/translation-bundle/phpunit.xml.dist @@ -1,32 +1,35 @@ - tests - + - - + + src - - + + - - + + diff --git a/packages/translation-bundle/tests/App/Kernel.php b/packages/translation-bundle/tests/App/Kernel.php index 5ab0368e..0e89c2cb 100644 --- a/packages/translation-bundle/tests/App/Kernel.php +++ b/packages/translation-bundle/tests/App/Kernel.php @@ -73,32 +73,32 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { - $container->setParameter('kernel.default_locale', 'en'); + $c->setParameter('kernel.default_locale', 'en'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', 'session' => ['storage_id' => 'session.storage.mock_file'], ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => ['auto_mapping' => true], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('a2lix_translation_form', [ + $c->loadFromExtension('a2lix_translation_form', [ 'locales' => ['es', 'en', 'ca'], ]); } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c809ac0d..63709a40 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,32 +1,35 @@ - packages/*/tests - + - - - packages/*/src - - + + + src + + - - + + diff --git a/tests/App/Kernel.php b/tests/App/Kernel.php index aa342859..d160ea8d 100644 --- a/tests/App/Kernel.php +++ b/tests/App/Kernel.php @@ -88,24 +88,24 @@ public function getProjectDir(): string return __DIR__; } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void + protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void { $loader->load($this->getProjectDir() . '/services.yaml'); - $container->setParameter('kernel.default_locale', 'en'); + $c->setParameter('kernel.default_locale', 'en'); - $container->loadFromExtension('framework', [ + $c->loadFromExtension('framework', [ 'test' => true, 'router' => ['utf8' => true], 'secret' => 'secret', 'session' => ['storage_id' => 'session.storage.mock_file'], ]); - $container->loadFromExtension('security', [ + $c->loadFromExtension('security', [ 'firewalls' => ['main' => ['anonymous' => true]], ]); - $container->loadFromExtension('doctrine', [ + $c->loadFromExtension('doctrine', [ 'dbal' => ['url' => 'sqlite://:memory:', 'logging' => false], 'orm' => [ 'auto_mapping' => true, @@ -132,16 +132,16 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa ], ]); - $container->loadFromExtension('twig', [ + $c->loadFromExtension('twig', [ 'exception_controller' => null, 'strict_variables' => '%kernel.debug%', ]); - $container->loadFromExtension('a2lix_translation_form', [ + $c->loadFromExtension('a2lix_translation_form', [ 'locales' => ['es', 'en', 'ca'], ]); - $container->loadFromExtension('sonata_media', [ + $c->loadFromExtension('sonata_media', [ 'default_context' => 'default', 'contexts' => ['default' => []], 'cdn' => null, @@ -154,7 +154,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa 'filesystem' => ['local' => null], ]); - $container->loadFromExtension('runroom_cookies', [ + $c->loadFromExtension('runroom_cookies', [ 'cookies' => [ 'mandatory_cookies' => [[ 'name' => 'test', @@ -171,13 +171,13 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa ], ]); - $container->loadFromExtension('runroom_seo', [ + $c->loadFromExtension('runroom_seo', [ 'locales' => ['es'], 'xdefault_locale' => 'es', 'class' => ['media' => Media::class], ]); - $container->loadFromExtension('runroom_redirection', [ + $c->loadFromExtension('runroom_redirection', [ 'enable_automatic_redirections' => true, 'automatic_redirections' => [ Entity::class => [