Skip to content

Commit

Permalink
Update dev environment dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
guanguans committed May 31, 2019
1 parent 6fa675b commit 621020a
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -8,3 +8,5 @@ composer.lock
.php_cs.cache
.phplint.cache
.scannerwork
coverage.text
coverage.xml
2 changes: 2 additions & 0 deletions .travis.yml
@@ -1,6 +1,8 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
Expand Down
20 changes: 4 additions & 16 deletions composer.json
Expand Up @@ -19,19 +19,16 @@
}
],
"require": {
"php": ">=7.1",
"php": ">=5.6",
"guzzlehttp/guzzle": "^6.3",
"metowolf/meting": "^1.5",
"ext-json": "*",
"symfony/console": "^3.2|^4.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.1",
"mockery/mockery": "~1.1",
"overtrue/phplint": "~1.1",
"phpro/grumphp": "dev-master",
"phpstan/phpstan": "~0.9",
"phpunit/phpunit": "~5 | ~7"
"phpunit/phpunit": "~5 || ~7",
"mockery/mockery": "^1.1",
"phpro/grumphp": "~0.14"
},
"license": "MIT",
"minimum-stability": "dev",
Expand All @@ -57,24 +54,15 @@
],
"scripts": {
"unit": "./vendor/bin/phpunit --coverage-text --color=always",
"lint": "./vendor/bin/phplint --ansi",
"fix": "./vendor/bin/php-cs-fixer fix --ansi",
"stan": "./vendor/bin/phpstan analyse --ansi",
"commit": "./vendor/bin/grumphp git:pre-commit",
"grumphp": "./vendor/bin/grumphp run",
"test": [
"@unit",
"@lint",
"@fix",
"@stan",
"@grumphp"
]
},
"scripts-descriptions": {
"unit": "Run the phpunit tests.",
"lint": "Run the phplint tests.",
"fix": "Run the php-cs-fixer tests.",
"stan": "Run the phpstan tests.",
"commit": "Run the grumphp git:pre-commit tests.",
"grumphp": "Run the grumphp run tests.",
"test": "Run all tests."
Expand Down
50 changes: 25 additions & 25 deletions grumphp.yml
Expand Up @@ -17,20 +17,20 @@ parameters:
failed: grumphp-grumpy.txt
succeeded: grumphp-happy.txt
tasks:
ant: ~
atoum: ~
behat: ~
# ant: ~
# atoum: ~
# behat: ~
brunch: ~
# clover_coverage: ~
codeception: ~
# codeception: ~
composer: ~
# composer_normalize: ~
# composer_require_checker: ~
composer_script:
script: unit
triggered_by: [php, phtml]
working_directory: ~
deptrac: ~
# deptrac: ~
# doctrine_orm: ~
file_size: ~
gherkin: ~
Expand All @@ -39,35 +39,35 @@ parameters:
git_commit_message: ~
grunt: ~
gulp: ~
infection: ~
# infection: ~
jsonlint: ~
kahlan: ~
make: ~
# kahlan: ~
# make: ~
npm_script:
script: eslint --fix
triggered_by: [js, jsx, coffee, ts, less, sass, scss]
working_directory: "./"
is_run_task: false
paratest: ~
phan: ~
phing: ~
php7cc: ~
phpcpd: ~
phpcs: ~
phpcsfixer: ~
phpcsfixer2: ~
# paratest: ~
# phan: ~
# phing: ~
# php7cc: ~
# phpcpd: ~
# phpcs: ~
# phpcsfixer: ~
# phpcsfixer2: ~
# phplint: ~
phpmd: ~
phpmnd: ~
phpparser: ~
phpspec: ~
phpstan: ~
# phpmd: ~
# phpmnd: ~
# phpparser: ~
# phpspec: ~
# phpstan: ~
phpunit: ~
phpunitbridge: ~
# phpunitbridge: ~
phpversion: ~
progpilot: ~
psalm: ~
robo: ~
# progpilot: ~
# psalm: ~
# robo: ~
securitychecker: ~
shell: ~
twigcs: ~
Expand Down
4 changes: 0 additions & 4 deletions src/Helpers.php
Expand Up @@ -17,10 +17,6 @@ function config($key = '')
{
$config = require 'Config.php';

if (!is_string($key)) {
return;
}

if (empty($key)) {
return $config;
}
Expand Down

0 comments on commit 621020a

Please sign in to comment.