diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc107cf..8e7a5bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: matrix: include: # Lowest Deps - - php: 7.4 + - php: 8.2 symfony: 5.4.* composer-flags: '--prefer-stable --prefer-lowest' can-fail: false @@ -22,35 +22,51 @@ jobs: symfony: 5.4.* composer-flags: '--prefer-stable' can-fail: false - # Stable Symfony branches - - php: 8.2 - symfony: 6.0.* + - php: 8.3 + symfony: 5.4.* composer-flags: '--prefer-stable' can-fail: false + # Stable Symfony 6 branches - php: 8.2 - symfony: 6.1.* + symfony: 6.4.* composer-flags: '--prefer-stable' can-fail: false + - php: 8.3 + symfony: 6.4.* + composer-flags: '--prefer-stable' + can-fail: false + # Symfony 7 branches - php: 8.2 - symfony: 6.2.* + symfony: 7.0.* + composer-flags: '--prefer-stable' + can-fail: false + - php: 8.3 + symfony: 7.0.* composer-flags: '--prefer-stable' can-fail: false - # Development Symfony branches - php: 8.2 - symfony: 6.3.*@dev - composer-flags: '' + symfony: 7.1.* + composer-flags: '--prefer-stable' + can-fail: false + - php: 8.3 + symfony: 7.1.* + composer-flags: '--prefer-stable' + can-fail: false + - php: 8.3 + symfony: 7.2.* + composer-flags: '--prefer-stable' can-fail: false name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}" steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 - name: "Cache Composer packages" - uses: "actions/cache@v3" + uses: "actions/cache@v4" with: path: "~/.composer/cache" key: "php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('composer.json') }}-flags-${{ matrix.composer-flags }}" @@ -66,10 +82,6 @@ jobs: if: "matrix.symfony == '6.3.*@dev'" run: "composer config minimum-stability dev" - - name: "Remove symfony/security-guard" - if: "matrix.symfony == '6.0.*' || matrix.symfony == '6.1.*' || matrix.symfony == '6.2.*' || matrix.symfony == '6.3.*@dev'" - run: "composer remove --dev --no-update symfony/security-guard" - - name: "Install dependencies" run: "composer update ${{ matrix.composer-flags }} --prefer-dist" env: diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 29b516b..fdb25aa 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -8,12 +8,12 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.1'] + php-versions: ['8.2'] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} diff --git a/composer.json b/composer.json index 811d2c4..9b93821 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,13 @@ } ], "require": { - "php": ">=7.2", - "symfony/serializer": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0", - "symfony/framework-bundle": "^5.4|^6.0" + "php": ">=8.2", + "symfony/serializer": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^5.4|^6.0|^7.0" }, "require-dev": { - "symfony/phpunit-bridge": "^5.4|^6.0" + "symfony/phpunit-bridge": "^5.4|^6.0|^7.0" }, "config": { "allow-plugins": { diff --git a/tests/DependencyInjection/AutowiringTest.php b/tests/DependencyInjection/AutowiringTest.php index 7cffae4..89fc036 100644 --- a/tests/DependencyInjection/AutowiringTest.php +++ b/tests/DependencyInjection/AutowiringTest.php @@ -67,6 +67,10 @@ private static function createContainerBuilder(array $configs = []) 'kernel.charset' => 'utf8', 'kernel.runtime_environment' => 'test', 'env(base64:default::SYMFONY_DECRYPTION_SECRET)' => 'dummy', + 'env(bool:default::SYMFONY_TRUST_X_SENDFILE_TYPE_HEADER)' => false, + 'env(default::SYMFONY_TRUSTED_HOSTS)' => '', + 'env(default::SYMFONY_TRUSTED_PROXIES)' => '', + 'env(default::SYMFONY_TRUSTED_HEADERS)' => '', 'kernel.build_dir' => __DIR__, 'debug.file_link_format' => null, ]),