Skip to content
This repository has been archived by the owner on Dec 11, 2020. It is now read-only.

Enhancement: Add support for PHP 8.0 #2063

Closed
wants to merge 3 commits into from
Closed
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
8 changes: 6 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ jobs:
- name: "Install dependencies with composer"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Install phpunit/phpunit with symfony/phpunit-bridge"
run: "vendor/bin/simple-phpunit --version"

- name: "Run vimeo/psalm"
run: ".phive/psalm --config=psalm.xml --shepherd --show-info=false --stats"

Expand All @@ -112,6 +115,7 @@ jobs:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -139,7 +143,7 @@ jobs:
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Run tests with phpunit/phpunit"
run: "vendor/bin/phpunit"
run: "vendor/bin/simple-phpunit"

code-coverage:
name: "Code Coverage"
Expand Down Expand Up @@ -180,7 +184,7 @@ jobs:
run: "mkdir -p .build/logs"

- name: "Collect code coverage with pcov and phpunit/phpunit"
run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml"
run: "vendor/bin/simple-phpunit --coverage-clover=.build/logs/clover.xml"
localheinz marked this conversation as resolved.
Show resolved Hide resolved

- name: "Send code coverage report to Codecov.io"
env:
Expand Down
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ sniff: vendor/autoload.php ## Detects code style issues with phpcs
vendor/bin/phpcs --cache=.build/php-codesniffer/cache.json

static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm
.phive/bin/psalm --config=psalm.xml --show-info=false --stats
vendor/bin/simple-phpunit --version
.phive/psalm --config=psalm.xml --show-info=false --stats

static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with vimeo/psalm
.phive/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
vendor/bin/simple-phpunit --version
.phive/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml

test: vendor/autoload.php ## Runs tests with phpunit
vendor/bin/phpunit --verbose
vendor/bin/simple-phpunit --verbose

vendor/autoload.php:
composer install --no-interaction
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
}
],
"require": {
"php": "^7.2"
"php": "^7.2 || ^8.0"
},
"require-dev": {
"ext-intl": "*",
"dealerdirect/phpcodesniffer-composer-installer": "~0.7.0",
"phpunit/phpunit": "^8.5.8",
"slevomat/coding-standard": "^6.4.1",
"squizlabs/php_codesniffer": "^3.5.8"
"squizlabs/php_codesniffer": "^3.5.8",
"symfony/phpunit-bridge": "^5.1.7"
},
"autoload": {
"psr-4": {
Expand Down
Loading