Skip to content

Commit

Permalink
Merge pull request #65 from Ocramius/feature/#64-php-8-support-and-de…
Browse files Browse the repository at this point in the history
…pendency-bumps

Upgraded dependencies, dropped PHP < 7.3
  • Loading branch information
WyriHaximus authored Jan 20, 2021
2 parents 979f679 + ae82421 commit 0185ce9
Show file tree
Hide file tree
Showing 31 changed files with 2,317 additions and 1,718 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
php-version: ${{ matrix.php }}
extensions: mbstring, ctype, iconv, bcmath, filter, json
coverage: xdebug, pcov
tools: composer:v1
tools: composer:v2
- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
Expand All @@ -56,7 +56,9 @@ jobs:
run: |
./vendor/bin/phpunit --coverage-clover clover.xml
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover clover.xml
# Ocular is not super-stable: let's ignore failures here.
# What can happen is that Scrutinizer-CI waits for a long time for coverage to be uploaded, delaying builds
php ocular.phar code-coverage:upload --format=php-clover clover.xml || true
check-mark:
name: ✔️
needs:
Expand Down
27 changes: 15 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@
{"name": "Jonathan Wage", "email": "[email protected]"}
],
"require": {
"php": "^7.2",
"php": "^7.4.0 || ^8.0.0",
"ext-mbstring": "*",
"ocramius/package-versions": "^1.3",
"ocramius/package-versions": "^1.3.0 || ^2.0.0",
"php-http/curl-client": "^2.0",
"php-http/discovery": "^1.6",
"php-http/httplug": "^2.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"symfony/console": "^4.0",
"zendframework/zend-diactoros": "^2.1"
"symfony/console": "^4.0.0 || ^5.0.0",
"laminas/laminas-diactoros": "^2.1.0"
},
"require-dev": {
"doctrine/coding-standard": "^5.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.25",
"phpstan/phpstan-deprecation-rules": "^0.12.3",
"phpstan/phpstan-phpunit": "^0.12.8",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^7.0"
"doctrine/coding-standard": "^8.2.0",
"phpstan/extension-installer": "^1.1.0",
"phpstan/phpstan": "^0.12.65",
"phpstan/phpstan-deprecation-rules": "^0.12.6",
"phpstan/phpstan-phpunit": "^0.12.17",
"phpstan/phpstan-strict-rules": "^0.12.7",
"phpunit/phpunit": "^9.5.0"
},
"autoload": {
"psr-4": {
Expand All @@ -41,7 +41,10 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"platform": {
"php": "7.4.7"
}
},
"extra": {
"branch-alias": {
Expand Down
Loading

0 comments on commit 0185ce9

Please sign in to comment.