Mostly implement psr2 code standards #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The result of running: php-cs-fixer fix --level=psr2
The result of:
php-cs-fixer fix --fixers=phpdoc_indent
Which the fixer can't process since they contain parse errors in their raw format
phpcbf --standard=psr2 src/ tests/
* master: Fix path in TestTask Move the TESTS constant to the bootstrap.php Fix CS Fix path in FixtureTask Fix fixture path in test Conflicts: src/Shell/Task/FixtureTask.php src/Shell/Task/TestTask.php tests/TestCase/Shell/Task/FixtureTaskTest.php
* master: The tests folder is not in APP (src)
Cuased by moving the allowMethod call to be first
App is the src folder, the code was wrong, and this was baking into:
ROOT/src/tests/whatever
instead of:
ROOT/tsets/whatever
So remove it
APP is the src dir, the path tests go in is no src/tests
Not changing namespaces as this time
|
Merging to permit further/incremental changes. |
AD7six
added a commit
that referenced
this pull request
Dec 23, 2014
Mostly implement psr2 code standards
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are still warnings related to the use of underscore prefixes - but this should account for everything else (whitespace, brace style multiple classes in the same file etc.).
Related to #2.