diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66db2af..403bbb1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,43 +19,42 @@ jobs: composer-flags: '--prefer-stable --prefer-lowest' description: 'with SF 5.4.* lowest' - php-version: '8.1' - symfony-version: '6.0.*' + symfony-version: '6.4.*' composer-flags: '--prefer-stable --prefer-lowest' - description: 'with SF 6.0.* lowest' - - php-version: '8.1' - symfony-version: '6.1.*' - composer-flags: '--prefer-stable --prefer-lowest' - description: 'with SF 6.1.* lowest' - - php-version: '8.1' - symfony-version: '6.2.*' - composer-flags: '--prefer-stable --prefer-lowest' - description: 'with SF 6.2.* lowest' - - php-version: '8.1' - symfony-version: '6.3.*' + description: 'with SF 6.4.* lowest' + - php-version: '8.2' + symfony-version: '7.0.*' composer-flags: '--prefer-stable --prefer-lowest' - description: 'with SF 6.3.* lowest' + description: 'with SF 7.0.* lowest' #Symfony versions - - php-version: '8.2' + - php-version: '8.3' symfony-version: '5.4.*' description: 'with SF 5.4.*' - - php-version: '8.2' - symfony-version: '6.0.*' - description: 'with SF 6.0.*' - - php-version: '8.2' - symfony-version: '6.1.*' - description: 'with SF 6.1.*' - - php-version: '8.2' - symfony-version: '6.2.*' - description: 'with SF 6.2.*' - - php-version: '8.2' - symfony-version: '6.3.*' - description: 'with SF 6.3.*' + - php-version: '8.3' + symfony-version: '5.4.*@dev' + description: 'with SF 5.4.* dev' + - php-version: '8.3' + symfony-version: '6.4.*' + description: 'with SF 6.4.*' + - php-version: '8.3' + symfony-version: '6.4.*@dev' + description: 'with SF 6.4.* dev' + - php-version: '8.3' + symfony-version: '7.0.*' + description: 'with SF 7.0.*' + - php-version: '8.3' + symfony-version: '7.0.*@dev' + description: 'with SF 7.0.* dev' + - php-version: '8.3' + symfony-version: '7.1.*@dev' + description: 'with SF 7.1.* dev' #PHP versions - php-version: '8.1' - php-version: '8.2' + - php-version: '8.3' #CS - php-version: '8.2' @@ -114,6 +113,18 @@ jobs: key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}-${{ hashFiles('**/yarn.lock') }} restore-keys: composer-${{ runner.os }}-${{ matrix.php-version }}- + - name: Configure minimum stability + if: matrix.symfony-version && contains(matrix.symfony-version, '@dev') + run: composer config minimum-stability dev + + - name: Remove friendsofphp/php-cs-fixer + if: matrix.coding-standards != true + run: composer remove friendsofphp/php-cs-fixer --dev --no-update + + - name: Remove vimeo/psalm + if: matrix.static-analysis != true + run: composer remove vimeo/psalm --dev --no-update + - name: Configure Symfony Flex if: matrix.symfony-version run: composer config extra.symfony.require ${{ matrix.symfony-version }} diff --git a/composer.json b/composer.json index 208c158..af919ae 100644 --- a/composer.json +++ b/composer.json @@ -22,29 +22,29 @@ "ecommit/paginator": "^1.0", "ecommit/scalar-values": "^1.0", "psr/container": "^1.1|^2.0", - "symfony/asset": "^5.4|^6.0", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/doctrine-bridge": "^5.4.3|^6.0.3", - "symfony/form": "^5.4|^6.0", - "symfony/framework-bundle": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/doctrine-bridge": "^5.4.3|^6.0.3|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", "symfony/http-client-contracts": "^2.4|^3.0", - "symfony/http-foundation": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", - "symfony/options-resolver": "^5.4|^6.0", - "symfony/property-access": "^5.4|^6.0", - "symfony/routing": "^5.4|^6.0", - "symfony/security-bundle": "^5.4|^6.0", - "symfony/security-core": "^5.4|^6.0", - "symfony/security-csrf": "^5.4|^6.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/options-resolver": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-bundle": "^5.4|^6.0|^7.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^1.1.6|^2|^3", - "symfony/translation": "^5.4|^6.0", + "symfony/translation": "^5.4|^6.0|^7.0", "symfony/translation-contracts": "^2.3|^3.0", - "symfony/twig-bridge": "^5.4|^6.0", - "symfony/twig-bundle": "^5.4|^6.0", - "symfony/validator": "^5.4|^6.0", + "symfony/twig-bridge": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/validator": "^5.4|^6.0|^7.0", "twig/twig": "^2.12.0|^3.0" }, "require-dev": { @@ -53,10 +53,10 @@ "doctrine/doctrine-fixtures-bundle": "^3.3", "friendsofphp/php-cs-fixer": "^3.0", "phpunit/phpunit": "^9.0", - "symfony/dom-crawler": "^5.4|^6.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", "symfony/panther": "^2.0.1", "symfony/webpack-encore-bundle": "^1.7.3", - "symfony/yaml": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0|^7.0", "vimeo/psalm": "^4.22" }, "autoload": {