From 530bc7192475fbc3d52e0ee1da028064598b653d Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Fri, 12 Jan 2024 23:57:43 +0100 Subject: [PATCH] Drop PHP 7.4 and 8.0 --- .github/CONTRIBUTING.md | 2 +- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 3 -- .github/workflows/translations.yml | 2 +- .github/workflows/upload-release-package.yml | 2 +- RELEASE_PROCESS.md | 4 +-- composer.json | 6 ++-- composer.lock | 37 +++++++++----------- 8 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ba7a88646..ecaf623ce 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,7 +24,7 @@ If you want to test using an other database than SQLite, uncomment the `postgres ### Using your own PHP server -- Ensure you are running PHP >= 7.4. +- Ensure you are running PHP >= 8.2. - Clone the repository - Launch `composer install` - If you got some errors, fix them (they might be related to some missing PHP extension from your machine) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index cf6a0f5dd..2c4b0d5df 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -23,7 +23,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - php-version: "7.4" + php-version: "8.2" tools: cs2pr, pecl extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy ini-values: "date.timezone=Europe/Paris" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 67c50c8cf..72f48471d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -31,9 +31,6 @@ jobs: fail-fast: false matrix: php: - - "7.4" - - "8.0" - - "8.1" - "8.2" - "8.3" - "8.4" diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index a9d9201df..4ebd0516c 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: php: - - "7.4" + - "8.2" steps: - name: "Checkout" diff --git a/.github/workflows/upload-release-package.yml b/.github/workflows/upload-release-package.yml index 0fc41360e..b26c7ed8f 100644 --- a/.github/workflows/upload-release-package.yml +++ b/.github/workflows/upload-release-package.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: php: - - "7.4" + - "8.2" steps: - name: "Checkout" diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index c84d753a3..d060294bb 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -25,13 +25,13 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li ### Target PHP version `composer.lock` is _always_ built for a particular version, by default the one it is generated (with `composer update`). -If the PHP version used to generate the .lock isn't a widely available one (like PHP 8), a more common one should +If the PHP version used to generate the .lock isn't a widely available one (like latest PHP versions), a more common one should be locally specified in `composer.lock`: ```json "config": { "platform": { - "php": "7.4.29", + "php": "8.2.27", "ext-something": "4.0" } } diff --git a/composer.json b/composer.json index 3a4839a6f..445afbc30 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=7.4", + "php": ">=8.2", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -83,7 +83,7 @@ "javibravo/simpleue": "^2.1", "jms/serializer": "^3.29.1", "jms/serializer-bundle": "^5.4", - "laminas/laminas-code": "^4.7.1", + "laminas/laminas-code": "^4.16", "lcobucci/jwt": "^4.3", "league/html-to-markdown": "^5.1", "mgargano/simplehtmldom": "^1.5", @@ -217,7 +217,7 @@ }, "bin-dir": "bin", "platform": { - "php": "7.4.29" + "php": "8.2.27" }, "sort-packages": true }, diff --git a/composer.lock b/composer.lock index 662c1a962..4407b0671 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": "a85056bec7fa90b9be4aa16c34464c0e", + "content-hash": "43714ebbc439115fe5d67daf0b90e758", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -4929,29 +4929,29 @@ }, { "name": "laminas/laminas-code", - "version": "4.7.1", + "version": "4.16.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "91aabc066d5620428120800c0eafc0411e441a62" + "reference": "1793e78dad4108b594084d05d1fb818b85b110af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62", - "reference": "91aabc066d5620428120800c0eafc0411e441a62", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1793e78dad4108b594084d05d1fb818b85b110af", + "reference": "1793e78dad4108b594084d05d1fb818b85b110af", "shasum": "" }, "require": { - "php": ">=7.4, <8.2" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" }, "require-dev": { - "doctrine/annotations": "^1.13.2", + "doctrine/annotations": "^2.0.1", "ext-phar": "*", - "laminas/laminas-coding-standard": "^2.3.0", - "laminas/laminas-stdlib": "^3.6.1", - "phpunit/phpunit": "^9.5.10", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.13.1" + "laminas/laminas-coding-standard": "^3.0.0", + "laminas/laminas-stdlib": "^3.18.0", + "phpunit/phpunit": "^10.5.37", + "psalm/plugin-phpunit": "^0.19.0", + "vimeo/psalm": "^5.15.0" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", @@ -4959,9 +4959,6 @@ }, "type": "library", "autoload": { - "files": [ - "polyfill/ReflectionEnumPolyfill.php" - ], "psr-4": { "Laminas\\Code\\": "src/" } @@ -4991,7 +4988,7 @@ "type": "community_bridge" } ], - "time": "2022-11-21T01:32:31+00:00" + "time": "2024-11-20T13:15:13+00:00" }, { "name": "lcobucci/clock", @@ -19880,7 +19877,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.4", + "php": ">=8.2", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -19900,9 +19897,9 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { - "php": "7.4.29" + "php": "8.2.27" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }