diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml index 6206602229..1c379619ea 100644 --- a/.github/workflows/check-dependencies.yml +++ b/.github/workflows/check-dependencies.yml @@ -26,7 +26,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: xdebug diff --git a/.github/workflows/continuous-integration-optional.yml b/.github/workflows/continuous-integration-optional.yml index f3d50855da..62ec1a4a7a 100644 --- a/.github/workflows/continuous-integration-optional.yml +++ b/.github/workflows/continuous-integration-optional.yml @@ -21,7 +21,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: xdebug @@ -36,7 +36,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: xdebug @@ -66,7 +66,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: xdebug @@ -114,7 +114,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: xdebug diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 57668a5685..75f697f854 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -40,7 +40,7 @@ jobs: ".github/workflows/continuous-integration.yml" ] do_not_skip: '["workflow_dispatch", "schedule"]' - + frontend-check-needed: runs-on: ubuntu-latest outputs: @@ -56,7 +56,7 @@ jobs: ".github/workflows/continuous-integration.yml" ] do_not_skip: '["workflow_dispatch", "schedule"]' - + e2e-check-needed: runs-on: ubuntu-latest outputs: @@ -79,7 +79,7 @@ jobs: ".env.ci" ] do_not_skip: '["workflow_dispatch", "schedule"]' - + api-cs-check: name: 'Lint: API (php-cs-fixer)' runs-on: ubuntu-latest @@ -91,7 +91,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' tools: composer:2.8.0 coverage: none @@ -110,7 +110,7 @@ jobs: - run: composer install --no-interaction --no-plugins --no-scripts --prefer-dist working-directory: api - - run: php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff + - run: PHP_CS_FIXER_IGNORE_ENV=1 php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff working-directory: api frontend-eslint: @@ -264,7 +264,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.3.13' + php-version: '8.4.6' extensions: intl-73.1 tools: composer:2.8.0 coverage: pcov @@ -490,7 +490,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true - carryforward: "api,frontend,print,pdf" + carryforward: 'api,frontend,print,pdf' fail-on-error: false workflow-success: diff --git a/api/Dockerfile b/api/Dockerfile index d8b5a469f1..300c6c02be 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,7 +3,7 @@ # Adapted from https://github.com/api-platform/api-platform/blob/fa1c5808305d7cadbf7b8392e0fddb6e80fb2092/api/Dockerfile # Versions -FROM dunglas/frankenphp:1.2-php8.3.13 AS frankenphp_upstream +FROM dunglas/frankenphp:1.5-php8.4.6 AS frankenphp_upstream # the different stages of this Dockerfile are meant to be built into separate images # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage diff --git a/api/composer.json b/api/composer.json index d39ec84a17..17cfbcb085 100644 --- a/api/composer.json +++ b/api/composer.json @@ -2,7 +2,7 @@ "type": "project", "license": "MIT", "require": { - "php": ">=8.1.0", + "php": ">=8.4.0", "ext-ctype": "*", "ext-iconv": "*", "api-platform/core": "4.1.7", @@ -109,8 +109,8 @@ "symfony/polyfill-php71": "*" }, "scripts": { - "cs-check": "php-cs-fixer fix --dry-run", - "cs-fix": "php-cs-fixer fix", + "cs-check": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run", + "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix", "test": [ "Composer\\Config::disableProcessTimeout", "vendor/bin/phpunit -d memory_limit=-1 -c phpunit.xml.dist" diff --git a/api/composer.lock b/api/composer.lock index f0f8c167bc..5e607a8e32 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d68e976500fd24b16582eb0847c427c7", + "content-hash": "2c90a252dcc369d481585f01a9892b43", "packages": [ { "name": "api-platform/core", @@ -14460,7 +14460,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.1.0", + "php": ">=8.4.0", "ext-ctype": "*", "ext-iconv": "*" }, diff --git a/api/tests/Api/MaterialItems/UpdateMaterialItemTest.php b/api/tests/Api/MaterialItems/UpdateMaterialItemTest.php index aaab79376f..7d072793bb 100644 --- a/api/tests/Api/MaterialItems/UpdateMaterialItemTest.php +++ b/api/tests/Api/MaterialItems/UpdateMaterialItemTest.php @@ -390,7 +390,7 @@ public function testPatchMaterialItemAcceptsLargeNumberForQuantity() { ]); } - public function testPatchMaterialItemDoesNotCrashForLargeNumberForQuantity() { + public function testPatchMaterialItemFailsForLargeNumberForQuantity() { $materialItem = static::getFixture('materialItem1'); static::createClientWithCredentials()->request( 'PATCH', @@ -407,10 +407,7 @@ public function testPatchMaterialItemDoesNotCrashForLargeNumberForQuantity() { ] ); - $this->assertResponseStatusCodeSame(200); - $this->assertJsonContains([ - 'quantity' => 0, - ]); + $this->assertResponseStatusCodeSame(400); } public function testPatchMaterialItemAllowsMissingUnit() { diff --git a/renovate.json b/renovate.json index 6d6f7b1931..4d64f63c47 100644 --- a/renovate.json +++ b/renovate.json @@ -6,7 +6,7 @@ ], "constraints": { "node": "22.14.0", - "php": "8.3.13" + "php": "8.4.6" }, "automergeType": "branch", "rebaseWhen": "conflicted",