Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mostly implement psr2 code standards #11

Merged
merged 29 commits into from
Dec 23, 2014
Merged

Mostly implement psr2 code standards #11

merged 29 commits into from
Dec 23, 2014

Commits on Dec 17, 2014

  1. Commence the pain

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    096fbd9 View commit details
    Browse the repository at this point in the history

  2. Initial psr2 fixes 

    The result of running:

	php-cs-fixer fix --level=psr2
    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    35e0602 View commit details
    Browse the repository at this point in the history

  3. add an editor config file

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    d8aa345 View commit details
    Browse the repository at this point in the history

  4. Doc block indentation 

    The result of:

    php-cs-fixer fix --fixers=phpdoc_indent
    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    6bce1e7 View commit details
    Browse the repository at this point in the history

  5. Basic fixes to bake templates 

    Which the fixer can't process since they contain parse errors in their
raw format
    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    e859776 View commit details
    Browse the repository at this point in the history

  6. Fix end braces in tempalte files

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    e09bd77 View commit details
    Browse the repository at this point in the history

  7. The fixer renamed all the class tests to match the filename 

    So, undo that
    @AD7six
    AD7six committed Dec 17, 2014
    2 Configuration menu
    Copy the full SHA
    38d3778 View commit details
    Browse the repository at this point in the history

  8. Correct braces in expectation

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    cc823b2 View commit details
    Browse the repository at this point in the history

  9. Manually apply tab->spaces

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    ff7eb3e View commit details
    Browse the repository at this point in the history

  10. Indent with spaces, not tabs

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    a4a037b View commit details
    Browse the repository at this point in the history

  11. Some tabs that got away

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    d606c3c View commit details
    Browse the repository at this point in the history

  12. Replace tab characters in strings

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    04095bc View commit details
    Browse the repository at this point in the history

  13. Remove duplicate test file

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    1534a7d View commit details
    Browse the repository at this point in the history

  14. Missing one space of indentation

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    590fbee View commit details
    Browse the repository at this point in the history

  15. Some more tabs that got away

    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    c59b369 View commit details
    Browse the repository at this point in the history

  16. Run phpcs's fixer 

        phpcbf --standard=psr2 src/ tests/
    @AD7six
    AD7six committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    2bb0e6b View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2014

  1. Apply allow rules before doing anything 

    closes #8
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    324df97 View commit details
    Browse the repository at this point in the history

  2. Delete unwanted blank lines

    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    4510165 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into psr2 

    * 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
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    98d45cc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into psr2 

    * master:
  The tests folder is not in APP (src)
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    0acd690 View commit details
    Browse the repository at this point in the history

  5. Whitespace fix

    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    16156d4 View commit details
    Browse the repository at this point in the history

  6. Fix line length related psr fails

    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    15d57a7 View commit details
    Browse the repository at this point in the history

  7. Fix delete method test fails 

    Cuased by moving the allowMethod call to be first
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    e34fb99 View commit details
    Browse the repository at this point in the history

  8. Tests should not be baking into the APP folder 

    App is the src folder, the code was wrong, and this was baking into:

    ROOT/src/tests/whatever

instead of:

    ROOT/tsets/whatever
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    3ebd0fd View commit details
    Browse the repository at this point in the history

  9. That blank line is a phpcs fail 

    So remove it
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    8e8fdec View commit details
    Browse the repository at this point in the history

  10. Correct tests test case to account for TESTS 

    APP is the src dir, the path tests go in is no src/tests
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    250b31d View commit details
    Browse the repository at this point in the history

  11. Fix line-length phpcs errors in tests

    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    9256cdf View commit details
    Browse the repository at this point in the history

  12. Move test classes to their own files 

    Not changing namespaces as this time
    @AD7six
    AD7six committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    a701c96 View commit details
    Browse the repository at this point in the history

  13. Add phpcs build to allow failures list.

    @ADmad
    ADmad committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    f01bcf3 View commit details
    Browse the repository at this point in the history