Skip to content

Commit

Permalink
Merge pull request #18 from Dropelikeit/feature/v4
Browse files Browse the repository at this point in the history
Feature/v4
  • Loading branch information
Dropelikeit authored Feb 25, 2020
2 parents 562acc2 + 626aaa8 commit 6914eac
Show file tree
Hide file tree
Showing 43 changed files with 1,225 additions and 1,349 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/php.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ matrix:
# Fast finish allows to set the build as "finished" even if the "allow_failures" matrix elements are not finished yet.
fast_finish: true
include:
- php: 7.3
- php: 7.4.2
allow_failures:
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: hhvm

# Define an environment variable
Expand All @@ -45,9 +49,9 @@ install:

# Run script
script:
- phpunit
- phpunit --coverage-clover build/logs/clover.xml
- composer cs-check
- composer analyze

after_success:
- travis_retry php php-coveralls.phar -v
Expand Down
18 changes: 10 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
}
],
"require": {
"php": ">=7.3",
"php": ">=7.4",
"ext-bcmath": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
"phpstan/phpstan": "^0.11.19",
"phpstan/phpstan-phpunit": "^0.11.2",
"phpunit/phpunit": "8.0.6"
"friendsofphp/php-cs-fixer": "^2.16",
"phpstan/phpstan": "^0.12.9",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-webmozart-assert": "^0.12.2",
"phpunit/phpunit": "^9.0"
},
"autoload": {
"psr-4": {
Expand All @@ -29,16 +30,17 @@
},
"config": {
"platform": {
"php": "7.3"
"php": "7.4"
},
"sort-packages": true
},
"prefer-stable": true,
"scripts": {
"cs-check": "php-cs-fixer -v --dry-run --using-cache=no fix",
"cs-fix": "php-cs-fixer --using-cache=no fix",
"test": "phpunit --configuration ~/PriceCalculator/phpunit.xml",
"analyze": "vendor/bin/phpstan analyse -c phpstan.neon.dist src tests",
"test": "vendor/bin/phpunit --configuration phpunit.xml",
"analyze": "vendor/bin/phpstan analyse --configuration phpstan.neon.dist",
"analyze-add": "vendor/bin/phpstan analyse --configuration phpstan.neon.dist --error-format baselineNeon src/ tests/ > phpstan-baseline.neon",
"check": [
"@cs-check",
"@analyze",
Expand Down
Loading

0 comments on commit 6914eac

Please sign in to comment.