From 6a3a11f4de8f2f11b3b04635bff8011014bfc66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Wed, 8 Nov 2023 11:21:23 +0100 Subject: [PATCH] Improve build --- .github/workflows/build.yaml | 87 +++++++++++++++++++++-- composer.json | 14 +--- psalm.xml | 4 +- src/DependencyInjection/Configuration.php | 8 +-- 4 files changed, 88 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3b9dbeb2..93bff7c6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: "build" on: push: branches: - - "0.*" + - "0.*.x" paths-ignore: - "**/*.md" pull_request: @@ -71,6 +71,7 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" dependencies: - "lowest" @@ -78,6 +79,28 @@ jobs: symfony: - "^5.4" + - "~6.0.0" + - "~6.1.0" + - "~6.2.0" + - "~6.3.0" + + exclude: + - php-version: "7.4" + symfony: "~6.0.0" + - php-version: "7.4" + symfony: "~6.1.0" + - php-version: "7.4" + symfony: "~6.2.0" + - php-version: "7.4" + symfony: "~6.3.0" + - php-version: "8.0" + symfony: "~6.0.0" + - php-version: "8.0" + symfony: "~6.1.0" + - php-version: "8.0" + symfony: "~6.2.0" + - php-version: "8.0" + symfony: "~6.3.0" steps: - name: "Checkout" @@ -118,12 +141,36 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" dependencies: + - "lowest" - "highest" symfony: - "^5.4" + - "~6.0.0" + - "~6.1.0" + - "~6.2.0" + - "~6.3.0" + + exclude: + - php-version: "7.4" + symfony: "~6.0.0" + - php-version: "7.4" + symfony: "~6.1.0" + - php-version: "7.4" + symfony: "~6.2.0" + - php-version: "7.4" + symfony: "~6.3.0" + - php-version: "8.0" + symfony: "~6.0.0" + - php-version: "8.0" + symfony: "~6.1.0" + - php-version: "8.0" + symfony: "~6.2.0" + - php-version: "8.0" + symfony: "~6.3.0" steps: - name: "Checkout" @@ -137,6 +184,9 @@ jobs: php-version: "${{ matrix.php-version }}" tools: "flex" + - name: "Remove sylius/sylius from composer.json" + run: "composer remove --dev --no-update --no-plugins --no-scripts sylius/sylius" + - name: "Install composer dependencies" uses: "ramsey/composer-install@v2" env: @@ -144,9 +194,6 @@ jobs: with: dependency-versions: "${{ matrix.dependencies }}" - - name: "Cache warmup" - run: "(cd tests/Application && bin/console cache:warmup)" - - name: "Static analysis" run: "composer analyse" @@ -161,12 +208,36 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" dependencies: + - "lowest" - "highest" symfony: - "^5.4" + - "~6.0.0" + - "~6.1.0" + - "~6.2.0" + - "~6.3.0" + + exclude: + - php-version: "7.4" + symfony: "~6.0.0" + - php-version: "7.4" + symfony: "~6.1.0" + - php-version: "7.4" + symfony: "~6.2.0" + - php-version: "7.4" + symfony: "~6.3.0" + - php-version: "8.0" + symfony: "~6.0.0" + - php-version: "8.0" + symfony: "~6.1.0" + - php-version: "8.0" + symfony: "~6.2.0" + - php-version: "8.0" + symfony: "~6.3.0" steps: - name: "Checkout" @@ -180,6 +251,9 @@ jobs: php-version: "${{ matrix.php-version }}" tools: "flex" + - name: "Remove sylius/sylius from composer.json" + run: "composer remove --dev --no-update --no-plugins --no-scripts sylius/sylius" + - name: "Install composer dependencies" uses: "ramsey/composer-install@v2" env: @@ -201,6 +275,7 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" dependencies: - "highest" @@ -226,7 +301,7 @@ jobs: - name: "Setup node" uses: "actions/setup-node@v3" with: - node-version: "14" + node-version: "16" - name: "Install composer dependencies" uses: "ramsey/composer-install@v2" @@ -315,7 +390,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" dependencies: - "highest" diff --git a/composer.json b/composer.json index b9976ad8..f288c0f3 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,6 @@ "webmozart/assert": "^1.11" }, "require-dev": { - "friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev", "lexik/jwt-authentication-bundle": "^2.16", "matthiasnoback/symfony-config-test": "^4.3", "matthiasnoback/symfony-dependency-injection-test": "^4.3", @@ -69,7 +68,7 @@ "psalm/plugin-symfony": "^5.0", "setono/code-quality-pack": "^2.4", "setono/sylius-behat-pack": "^0.2.2", - "setono/sylius-catalog-promotion-plugin": "^0.4", + "setono/sylius-catalog-promotion-plugin": "^0.4.8 || ^0.5", "sylius/sylius": "~1.10.14", "symfony/debug-bundle": "^5.4 || ^6.0", "symfony/dotenv": "^5.4 || ^6.0", @@ -104,20 +103,12 @@ }, "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "scripts": { "all": [ "@checks", "@tests" ], - "analyse": [ - "@ensure-test-container-exists", - "psalm" - ], + "analyse": "psalm", "assets": [ "@ensure-assets-installed", "@ensure-assets-compiled" @@ -140,7 +131,6 @@ "ensure-env-dev-copied": "(cd tests/Application && ([[ -f .env.local ]] || cp .env .env.local))", "ensure-env-test-copied": "(cd tests/Application && ([[ -f .env.test.local ]] || cp .env.test .env.test.local))", "ensure-schema-updated": "composer ensure-env-copied && (cd tests/Application && bin/console doctrine:schema:update --force -e ${SYMFONY_ENV:-'dev'})", - "ensure-test-container-exists": "[[ -f tests/Application/var/cache/test/Tests_Setono_SyliusGiftCardPlugin_Application_KernelTestDebugContainer.xml ]] || tests/Application/bin/console cache:warmup --env=test", "ensure-vendors-installed": "[[ -f vendor/autoload.php ]] || php -d memory_limit=-1 /usr/local/bin/composer install", "fix-style": "ecs check --fix", "fixtures": [ diff --git a/psalm.xml b/psalm.xml index 31e21377..15353315 100644 --- a/psalm.xml +++ b/psalm.xml @@ -20,11 +20,9 @@ - - tests/Application/var/cache/test/Tests_Setono_SyliusGiftCardPlugin_Application_KernelTestDebugContainer.xml - + diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index a8b235bf..132e08c4 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -91,7 +91,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void private function addGiftCardSection(NodeBuilder $nodeBuilder): void { - /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod */ + /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod,PossiblyUndefinedMethod */ $nodeBuilder ->arrayNode('gift_card') ->addDefaultsIfNotSet() @@ -110,7 +110,7 @@ private function addGiftCardSection(NodeBuilder $nodeBuilder): void private function addGiftCardConfigurationSection(NodeBuilder $nodeBuilder): void { - /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod */ + /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod,PossiblyUndefinedMethod */ $nodeBuilder ->arrayNode('gift_card_configuration') ->addDefaultsIfNotSet() @@ -129,7 +129,7 @@ private function addGiftCardConfigurationSection(NodeBuilder $nodeBuilder): void private function addGiftCardConfigurationImageSection(NodeBuilder $nodeBuilder): void { - /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod */ + /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod,PossiblyUndefinedMethod */ $nodeBuilder ->arrayNode('gift_card_configuration_image') ->addDefaultsIfNotSet() @@ -148,7 +148,7 @@ private function addGiftCardConfigurationImageSection(NodeBuilder $nodeBuilder): private function addChannelConfigurationSection(NodeBuilder $nodeBuilder): void { - /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod */ + /** @psalm-suppress MixedMethodCall,PossiblyNullReference,UndefinedInterfaceMethod,PossiblyUndefinedMethod */ $nodeBuilder ->arrayNode('gift_card_channel_configuration') ->addDefaultsIfNotSet()