From 0147fc9a96228156adf0ffea7772ce7c47a20c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 4 Jan 2022 14:34:31 -0300 Subject: [PATCH] Bump PHP minimum version to 7.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- .github/workflows/lint-and-analyse-php.yml | 7 ++++--- .github/workflows/lint-docs.yml | 1 + .github/workflows/mutation-tests.yml | 8 ++++++-- .github/workflows/tests.yml | 6 ++---- .scrutinizer.yml | 2 +- composer.json | 13 ++++++------- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index c40fb562d..548fc62d5 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -7,16 +7,17 @@ on: branches: - master - QA + - 6.0.x jobs: lint-php: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Use php 7.1 + - name: Use php 7.2 uses: shivammathur/setup-php@v2 with: - php-version: 7.1 + php-version: 7.2 tools: composer:v2 - name: Validate composer.json and composer.lock run: composer validate @@ -34,7 +35,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-version: ["7.1"] + php-version: ["7.2"] steps: - uses: actions/checkout@v2 - name: Use PHP ${{ matrix.php-version }} diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml index a850021bf..148249a69 100644 --- a/.github/workflows/lint-docs.yml +++ b/.github/workflows/lint-docs.yml @@ -7,6 +7,7 @@ on: branches: - master - QA + - 6.0.x jobs: lint-docs: diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml index db165a5b2..e311095d1 100644 --- a/.github/workflows/mutation-tests.yml +++ b/.github/workflows/mutation-tests.yml @@ -2,9 +2,13 @@ name: Mutation tests on: push: - branches: [master] + branches: + - master + - 6.0.x pull_request: - branches: [master] + branches: + - master + - 6.0.x jobs: tests: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cdf751a78..608b95987 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,6 +7,7 @@ on: branches: - master - QA + - 6.0.x jobs: test-php: @@ -15,7 +16,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - php-version: ["7.1", "7.2", "7.3", "7.4", "8.0"] + php-version: ["7.2", "7.3", "7.4", "8.0"] os: [ubuntu-latest] experimental: [false] composer-options: [''] @@ -48,9 +49,6 @@ jobs: ${{ runner.os }}-composer- - name: Install dependencies run: composer install --no-interaction ${{ matrix.composer-options }} - - name: Install motranslator - if: ${{ matrix.php-version == '7.1' }} - run: composer require phpmyadmin/motranslator:^3.0 - name: Run php tests run: ./vendor/bin/phpunit - name: Send coverage diff --git a/.scrutinizer.yml b/.scrutinizer.yml index ee8f714d3..9c1cf8527 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -17,7 +17,7 @@ build: nodes: analysis: environment: - php: 7.1 + php: 7.2 dependencies: before: - composer install diff --git a/composer.json b/composer.json index 4c8fdcdb5..acf37985c 100644 --- a/composer.json +++ b/composer.json @@ -16,24 +16,23 @@ "source": "https://github.com/phpmyadmin/sql-parser" }, "require": { - "php": "^7.1 || ^8.0", + "php": "^7.2.5 || ^8.0", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-php80": "^1.16" }, "require-dev": { "phpmyadmin/coding-standard": "^3.0", - "phpmyadmin/motranslator": "^4.0 || ^5.0", + "phpmyadmin/motranslator": "^5.2", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.2", + "phpstan/phpstan": "^1.3", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/php-code-coverage": "*", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^8.5 || ^9.5", "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.11", + "vimeo/psalm": "^4.17", "zumba/json-serializer": "^3.0" }, "conflict": { - "phpmyadmin/motranslator": "<3.0" + "phpmyadmin/motranslator": "<5.2" }, "suggest": { "ext-mbstring": "For best performance",