Skip to content

Commit

Permalink
Merge pull request #9 from Xety/update-app
Browse files Browse the repository at this point in the history
Update composer.json & PHPCS
  • Loading branch information
Xety committed Sep 13, 2015
2 parents 03643bf + 6b13e42 commit aa5af78
Show file tree
Hide file tree
Showing 6 changed files with 670 additions and 655 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ before_script:

- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"

- sh -c "if [ '$PHPCS' = '1' ]; then pear channel-discover pear.cakephp.org; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then pear install --alldeps cakephp/CakePHP_CodeSniffer; fi"

- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"

Expand All @@ -53,7 +50,7 @@ script:
- sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then phpcs -p --extensions=php --standard=CakePHP --ignore=vendor --ignore=docs . ; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"

notifications:
email: false
69 changes: 35 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
{
"name": "xety/cake3-upload",
"type": "cakephp-plugin",
"description": "Cake3 plugin to upload files.",
"keywords": ["cakephp", "cake3", "plugin", "upload", "file"],
"homepage": "https://github.com/Xety/Cake3-Upload",
"license": "MIT",
"support":{
"source":"https://github.com/Xety/Cake3-Upload",
"issues":"https://github.com/Xety/Cake3-Upload/issues"
},
"authors": [
{
"name": "Xety",
"email": "[email protected]",
"homepage": "https://github.com/Xety"
}
],
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"cakephp/cakephp": "3.0.*-dev",
"phpunit/phpunit": "4.1.*"
},
"autoload": {
"psr-4": {
"Xety\\Cake3Upload\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Xety\\Cake3Upload\\Test\\": "tests"
}
}
"name": "xety/cake3-upload",
"type": "cakephp-plugin",
"description": "Cake3 plugin to upload files.",
"keywords": ["cakephp", "cake3", "plugin", "upload", "file"],
"homepage": "https://github.com/Xety/Cake3-Upload",
"license": "MIT",
"support":{
"source":"https://github.com/Xety/Cake3-Upload",
"issues":"https://github.com/Xety/Cake3-Upload/issues"
},
"authors": [
{
"name": "Xety",
"email": "[email protected]",
"homepage": "https://github.com/Xety"
}
],
"require": {
"php": ">=5.4.16",
"cakephp/cakephp": "~3.0"
},
"require-dev": {
"phpunit/phpunit": "*",
"cakephp/cakephp-codesniffer": "dev-master"
},
"autoload": {
"psr-4": {
"Xety\\Cake3Upload\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Xety\\Cake3Upload\\Test\\": "tests"
}
}

}
Loading

0 comments on commit aa5af78

Please sign in to comment.