Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/lint-and-analyse-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches:
- master
- QA
- 6.0.x

jobs:
lint-docs:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/mutation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches:
- master
- QA
- 6.0.x

jobs:
test-php:
Expand All @@ -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: ['']
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
nodes:
analysis:
environment:
php: 7.1
php: 7.2
dependencies:
before:
- composer install
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down