Skip to content

Commit fe6d8d2

Browse files
committed
Fix cs errors and update packages
1 parent 26f3bb7 commit fe6d8d2

24 files changed

+1538
-684
lines changed

.travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
language: php
22

3-
sudo: false
3+
dist: xenial
44

55
php:
66
- 7.3
77

88
before_script:
9-
- sh -c "composer require 'cakephp/cakephp-codesniffer:^3.3'"
10-
- sh -c "composer require 'squizlabs/php_codesniffer:^3.5'"
11-
- phpenv rehash
9+
- composer require cakephp/cakephp-codesniffer:^3.3
10+
- composer install
1211

1312
script:
14-
- sh -c "vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests ./config"
13+
- vendor/bin/phpcs -p src/ tests/ config/
1514

1615
notifications:
1716
email: false

composer.json

+6-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"cakephp/cakephp": "3.8.*",
1010
"cakephp/migrations": "^2.0.0",
1111
"mobiledetect/mobiledetectlib": "2.*",
12-
"cakephp/plugin-installer": "^1.1.0",
12+
"cakephp/plugin-installer": "^1.3",
1313
"markstory/asset_compress": "~3.0",
1414
"cakedc/users": "^8.0",
1515
"burzum/cakephp-imagine-plugin": "~2.0",
@@ -18,18 +18,14 @@
1818
"josegonzalez/cakephp-upload": "^4.0.0",
1919
"google/recaptcha": "~1.1",
2020
"linkorb/jsmin-php": "^1.0",
21-
"natxet/CssMin": "^3.0"
21+
"natxet/cssmin": "^3.0"
2222
},
2323
"require-dev": {
2424
"psy/psysh": "@stable",
2525
"cakephp/debug_kit": "~3.2",
2626
"cakephp/bake": "~1.1",
2727
"cakephp/cakephp-codesniffer": "^3.0",
28-
"phpunit/phpunit": "^5.7.14|^6.0"
29-
},
30-
"suggest": {
31-
"phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
32-
"cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
28+
"phpunit/phpunit": "^6.0"
3329
},
3430
"autoload": {
3531
"psr-4": {
@@ -57,11 +53,9 @@
5753
"@cs-check",
5854
"@test"
5955
],
60-
"cs-check": "phpcs -p ./src ./tests",
61-
"cs-fix": "phpcbf ./src ./tests",
56+
"cs-check": "phpcs --colors -p src/ tests/ config/",
57+
"cs-fix": "phpcbf --colors -p src/ tests/ config/",
6258
"test": "phpunit",
6359
"test-coverage": "phpunit --coverage-clover=clover.xml"
64-
},
65-
"minimum-stability": "dev",
66-
"prefer-stable": true
60+
}
6761
}

0 commit comments

Comments
 (0)