From 1bd86e156e4d5a18b6d03ace578a107f9b7e0f39 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Fri, 13 May 2022 00:54:21 +0200 Subject: [PATCH] Drop PHP prior to 7.4 --- .github/CONTRIBUTING.md | 2 +- .github/workflows/continuous-integration.yml | 18 +++--------------- RELEASE_PROCESS.md | 2 +- composer.json | 4 ++-- composer.lock | 6 +++--- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 91546911f..33c7113cd 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.1. +- Ensure you are running PHP >= 7.4. - 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/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e888de3c3..d2de81748 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -29,8 +29,6 @@ jobs: fail-fast: false matrix: php: - - "7.2" - - "7.3" - "7.4" - "8.0" - "8.1" @@ -54,21 +52,11 @@ jobs: extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy ini-values: "date.timezone=Europe/Paris" - - name: "Install MySQL (for PHP < 7.4)" - # there is an issue with PHP < 7.4 and MySQL 8 with `caching_sha2_password` - if: "${{ matrix.database == 'mysql' && (matrix.php == '7.2' || matrix.php == '7.3') }}" - uses: shogo82148/actions-setup-mysql@v1 - with: - root-password: root - mysql-version: '5.7' - - - name: "Install MySQL (for PHP >= 7.4)" - if: "${{ matrix.database == 'mysql' && matrix.php != '7.2' && matrix.php != '7.3' }}" - run: sudo systemctl start mysql.service - - name: "Setup MySQL" if: "${{ matrix.database == 'mysql' }}" - run: sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test" + run: | + sudo systemctl start mysql.service + sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test" - name: "Setup PostgreSQL" if: "${{ matrix.database == 'pgsql' }}" diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index e8ca3d82e..22042d9df 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -38,7 +38,7 @@ be locally specified in `composer.lock`: ```json "config": { "platform": { - "php": "7.1.3", + "php": "7.4.29", "ext-something": "4.0" } } diff --git a/composer.json b/composer.json index 0c22c58d0..aceda9e71 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=7.2.5", + "php": ">=7.4", "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", @@ -164,7 +164,7 @@ "config": { "bin-dir": "bin", "platform": { - "php": "7.2.5" + "php": "7.4.29" }, "sort-packages": true, "allow-plugins": { diff --git a/composer.lock b/composer.lock index 7db592e2e..45da5bb1a 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": "3db24875e7ef009b7598c36bafac8a3a", + "content-hash": "0d0c51bee0ced9698321d0fd2ad33aca", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -12926,7 +12926,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.2.5", + "php": ">=7.4", "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", @@ -12947,7 +12947,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.2.5" + "php": "7.4.29" }, "plugin-api-version": "2.2.0" }