Merge remote-tracking branch 'origin/3.0' into 3.0-multi-primary-key

Conflicts: tests/TestCase/ORM/Association/BelongsToManyTest.php tests/TestCase/ORM/Association/BelongsToTest.php tests/TestCase/ORM/Association/HasManyTest.php
cakephp · Jan 15, 2014 · 5f0ff0e · 5f0ff0e
2 parents 646e1bb + 6321ee2
commit 5f0ff0e
Show file tree

Hide file tree

Showing 996 changed files with 3,171 additions and 5,053 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ before_script:
   - set +H
 
 script:
-  - sh -c "if [ '$PHPCS' != '1' ]; then phpunit --stderr; else phpcs -p --extensions=php --standard=CakePHP ./Cake; fi"
+  - sh -c "if [ '$PHPCS' != '1' ]; then phpunit --stderr; else phpcs -p --extensions=php --standard=CakePHP ./src; fi"
 
 notifications:
   email: false
diff --git a/Cake/Core/ClassLoader.php b/Cake/Core/ClassLoader.php
diff --git a/Cake/View/StringTemplate.php b/Cake/View/StringTemplate.php
diff --git a/Test/Fixture/AccountFixture.php b/Test/Fixture/AccountFixture.php
diff --git a/Test/Fixture/AcoActionFixture.php b/Test/Fixture/AcoActionFixture.php