Skip to content

Commit

Permalink
Fix cs errors and update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
othercorey committed Oct 27, 2020
1 parent 26f3bb7 commit fe6d8d2
Show file tree
Hide file tree
Showing 24 changed files with 1,538 additions and 684 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
language: php

sudo: false
dist: xenial

php:
- 7.3

before_script:
- sh -c "composer require 'cakephp/cakephp-codesniffer:^3.3'"
- sh -c "composer require 'squizlabs/php_codesniffer:^3.5'"
- phpenv rehash
- composer require cakephp/cakephp-codesniffer:^3.3
- composer install

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

notifications:
email: false
18 changes: 6 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"cakephp/cakephp": "3.8.*",
"cakephp/migrations": "^2.0.0",
"mobiledetect/mobiledetectlib": "2.*",
"cakephp/plugin-installer": "^1.1.0",
"cakephp/plugin-installer": "^1.3",
"markstory/asset_compress": "~3.0",
"cakedc/users": "^8.0",
"burzum/cakephp-imagine-plugin": "~2.0",
Expand All @@ -18,18 +18,14 @@
"josegonzalez/cakephp-upload": "^4.0.0",
"google/recaptcha": "~1.1",
"linkorb/jsmin-php": "^1.0",
"natxet/CssMin": "^3.0"
"natxet/cssmin": "^3.0"
},
"require-dev": {
"psy/psysh": "@stable",
"cakephp/debug_kit": "~3.2",
"cakephp/bake": "~1.1",
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "^5.7.14|^6.0"
},
"suggest": {
"phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
"cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
"phpunit/phpunit": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -57,11 +53,9 @@
"@cs-check",
"@test"
],
"cs-check": "phpcs -p ./src ./tests",
"cs-fix": "phpcbf ./src ./tests",
"cs-check": "phpcs --colors -p src/ tests/ config/",
"cs-fix": "phpcbf --colors -p src/ tests/ config/",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover=clover.xml"
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
Loading

0 comments on commit fe6d8d2

Please sign in to comment.