From eaf5cf4e93b15bf5158dc4b47f5d9413d92c505f Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Fri, 7 Feb 2025 10:13:05 +0100 Subject: [PATCH 1/2] Allow PHPUnit 12 --- .github/workflows/integrate.yaml | 2 +- composer.json | 2 +- composer.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 5b16a08..6b5149b 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -92,7 +92,7 @@ jobs: phpunit-version: "11.0" dependencies: "highest" - php-version: "8.4" - phpunit-version: "11.0" + phpunit-version: "12.0" dependencies: "highest" steps: diff --git a/composer.json b/composer.json index 86d4271..3ac352b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "conflict": { "phpspec/prophecy": "<1.17.0 || >=2.0.0", "phpspec/prophecy-phpunit": "<2.3.0 || >=3.0.0", - "phpunit/phpunit": "<9.1.0 || >=12.0.0" + "phpunit/phpunit": "<9.1.0 || >=13.0.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index a8a0184..5ea7ba4 100644 --- a/composer.lock +++ b/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": "a68ee1b6460bb7f31c3074a6a78ec565", + "content-hash": "482e38207603cceea2c423315a5f9f97", "packages": [ { "name": "phpstan/phpstan", @@ -5718,12 +5718,12 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "^7.4 || ^8.0" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } From 5f940fa33510baa928af6518a152e5ab951ccfb2 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 19 May 2025 13:04:35 +0200 Subject: [PATCH 2/2] Workaround to include phpspec/prophecy-phpunit#67 --- .github/workflows/integrate.yaml | 2 +- composer.json | 2 +- composer.lock | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 6b5149b..d2ff286 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -44,7 +44,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Validate composer.json and composer.lock" - run: "composer validate --ansi --strict" + run: "composer validate --ansi" - uses: "ramsey/composer-install@v3" with: diff --git a/composer.json b/composer.json index 3ac352b..dc75d72 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "ergebnis/license": "^2.6.0", "ergebnis/php-cs-fixer-config": "^6.46.0", "phpspec/prophecy": "^1.7.0", - "phpspec/prophecy-phpunit": "^2.3", + "phpspec/prophecy-phpunit": "^2.3 || dev-master#d3c2804 as 2.4.0", "phpunit/phpunit": "^9.1.0" }, "conflict": { diff --git a/composer.lock b/composer.lock index 5ea7ba4..d9c58f8 100644 --- a/composer.lock +++ b/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": "482e38207603cceea2c423315a5f9f97", + "content-hash": "5d76725bc578513d8bfbc12bac09d1df", "packages": [ { "name": "phpstan/phpstan", @@ -5718,7 +5718,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "phpspec/prophecy-phpunit": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {