From 40c34284ec84d3a818e84fa3d7f28e274d5ef4ad Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 3 Dec 2023 19:54:47 +0100 Subject: [PATCH 1/3] Drop PHP 8.1 and update to Symfony 7 --- .github/workflows/coding-standard.yml | 2 +- .github/workflows/infection.yml | 2 +- .github/workflows/phar-creation.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit.yml | 1 - .github/workflows/psalm.yml | 2 +- .github/workflows/require-checker.yml | 2 +- composer.json | 6 +- composer.lock | 160 ++++++++------------------ 9 files changed, 55 insertions(+), 124 deletions(-) diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index fde875f1..340cfcbb 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -19,7 +19,7 @@ jobs: dependencies: - "locked" php-version: - - "8.1" + - "8.2" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index cd196275..cbe6bd25 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -19,8 +19,8 @@ jobs: dependencies: - "locked" php-version: - - "8.1" - "8.2" + - "8.3" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/phar-creation.yml b/.github/workflows/phar-creation.yml index ea433370..e4247b09 100644 --- a/.github/workflows/phar-creation.yml +++ b/.github/workflows/phar-creation.yml @@ -20,7 +20,7 @@ jobs: uses: "shivammathur/setup-php@2.28.0" with: coverage: "none" - php-version: "8.1" + php-version: "8.2" ini-values: memory_limit=-1, phar.readonly=0 - name: "Import GPG Key" diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 8a196382..96d952eb 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -19,7 +19,7 @@ jobs: dependencies: - "locked" php-version: - - "8.1" + - "8.2" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0b629bf2..0edcffcd 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -21,7 +21,6 @@ jobs: - "highest" - "locked" php-version: - - "8.1" - "8.2" - "8.3" operating-system: diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index e12f443b..268831c1 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -21,7 +21,7 @@ jobs: dependencies: - "locked" php-version: - - "8.1" + - "8.2" operating-system: - "ubuntu-latest" diff --git a/.github/workflows/require-checker.yml b/.github/workflows/require-checker.yml index 398c363c..62467643 100644 --- a/.github/workflows/require-checker.yml +++ b/.github/workflows/require-checker.yml @@ -19,7 +19,7 @@ jobs: dependencies: - "locked" php-version: - - "8.1" + - "8.2" operating-system: - "ubuntu-latest" diff --git a/composer.json b/composer.json index 1aa6fadc..4a8c6f7c 100644 --- a/composer.json +++ b/composer.json @@ -26,11 +26,11 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.2.0 || ~8.3.0", "ext-phar": "*", "composer-runtime-api": "^2.0.0", "nikic/php-parser": "^4.17.1", - "symfony/console": "^6.4.1", + "symfony/console": "^7.0.1", "webmozart/assert": "^1.11.0", "webmozart/glob": "^4.6.0" }, @@ -48,7 +48,7 @@ "optimize-autoloader": true, "sort-packages": true, "platform": { - "php": "8.1.99" + "php": "8.2.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, diff --git a/composer.lock b/composer.lock index fb9e7a3b..bb3d242d 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": "c86ac424eabdb00d99cbb9c7cedc16c4", + "content-hash": "ab4eab68d29586749f80830cc40dc34d", "packages": [ { "name": "nikic/php-parser", @@ -117,47 +117,46 @@ }, { "name": "symfony/console", - "version": "v6.4.1", + "version": "v7.0.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd" + "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd", + "url": "https://api.github.com/repos/symfony/console/zipball/cdce5c684b2f920bb1343deecdfba356ffad83d5", + "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0|^7.0" + "symfony/string": "^6.4|^7.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/dotenv": "<6.4", + "symfony/event-dispatcher": "<6.4", + "symfony/lock": "<6.4", + "symfony/process": "<6.4" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/stopwatch": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/lock": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -191,7 +190,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.1" + "source": "https://github.com/symfony/console/tree/v7.0.1" }, "funding": [ { @@ -207,74 +206,7 @@ "type": "tidelift" } ], - "time": "2023-11-30T10:54:28+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-12-01T15:10:06+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4610,20 +4542,20 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" + "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7", + "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, @@ -4653,7 +4585,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.0" + "source": "https://github.com/symfony/filesystem/tree/v7.0.0" }, "funding": [ { @@ -4669,27 +4601,27 @@ "type": "tidelift" } ], - "time": "2023-07-26T17:27:13+00:00" + "time": "2023-07-27T06:33:22+00:00" }, { "name": "symfony/finder", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" + "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", - "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", + "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "symfony/filesystem": "^6.0|^7.0" + "symfony/filesystem": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -4717,7 +4649,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.0" + "source": "https://github.com/symfony/finder/tree/v7.0.0" }, "funding": [ { @@ -4733,24 +4665,24 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:30:12+00:00" + "time": "2023-10-31T17:59:56+00:00" }, { "name": "symfony/process", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa" + "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/191703b1566d97a5425dc969e4350d32b8ef17aa", - "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa", + "url": "https://api.github.com/repos/symfony/process/zipball/13bdb1670c7f510494e04fcb2bfa29af63db9c0d", + "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -4778,7 +4710,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.0" + "source": "https://github.com/symfony/process/tree/v7.0.0" }, "funding": [ { @@ -4794,7 +4726,7 @@ "type": "tidelift" } ], - "time": "2023-11-17T21:06:49+00:00" + "time": "2023-11-20T16:43:42+00:00" }, { "name": "thecodingmachine/safe", @@ -5102,7 +5034,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.2.0 || ~8.3.0", "ext-phar": "*", "composer-runtime-api": "^2.0.0" }, @@ -5110,7 +5042,7 @@ "ext-zend-opcache": "*" }, "platform-overrides": { - "php": "8.1.99" + "php": "8.2.99" }, "plugin-api-version": "2.6.0" } From 8d8f1e6ccfc7e3b2384aefdd3a3c226f34b591dd Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 3 Dec 2023 21:32:40 +0100 Subject: [PATCH 2/3] Allow SF 6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a8c6f7c..aab99d38 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "ext-phar": "*", "composer-runtime-api": "^2.0.0", "nikic/php-parser": "^4.17.1", - "symfony/console": "^7.0.1", + "symfony/console": "^6.4.1 || ^7.0.1", "webmozart/assert": "^1.11.0", "webmozart/glob": "^4.6.0" }, From e5f89df18ae60e117d9dc7065f06901d157cee88 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 3 Dec 2023 22:49:21 +0100 Subject: [PATCH 3/3] Update hash --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index bb3d242d..345d62e7 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": "ab4eab68d29586749f80830cc40dc34d", + "content-hash": "9ead596fab7729961f4eff98deae0dc2", "packages": [ { "name": "nikic/php-parser",