Merge pull request #42 from FriendsOfCake/travis-master

Travis master

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 env:
   global:
@@ -12,17 +13,17 @@ env:
     - REQUIRE=""
 
   matrix:
-    - DB=mysql CAKE_VERSION=master
-    - DB=mysql CAKE_VERSION=2.5
+    - DB=mysql CAKE_VERSION=2.6
+    - DB=mysql CAKE_VERSION=2.7
 
 matrix:
   include:
     - php: 5.4
       env:
-        - DB=mysql CAKE_VERSION=master COVERALLS=1
+        - DB=mysql CAKE_VERSION=2.6 COVERALLS=1
     - php: 5.4
       env:
-        - DB=mysql CAKE_VERSION=master PHPCS=1
+        - DB=mysql CAKE_VERSION=2.6 PHPCS=1
 
 before_script:
   - git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis

Controller/Component/Auth/CookieAuthenticate.php

@@ -79,7 +79,7 @@ public function getUser(CakeRequest $request) {
  *
  * @param CakeRequest $request Request object.
  * @param CakeResponse $response Response object.
- * @return array|boolean Array of user info on success, false on falure.
+ * @return array|bool Array of user info on success, false on failure.
  */
 	public function authenticate(CakeRequest $request, CakeResponse $response) {
 		return $this->getUser($request);

Controller/Component/Auth/TokenAuthenticate.php

@@ -81,7 +81,7 @@ public function __construct(ComponentCollection $collection, $settings) {
  *
  * @param CakeRequest $request The request object.
  * @param CakeResponse $response response object.
- * @return boolean Always false.
+ * @return bool Always false.
  */
 	public function authenticate(CakeRequest $request, CakeResponse $response) {
 		return false;
@@ -92,7 +92,7 @@ public function authenticate(CakeRequest $request, CakeResponse $response) {
  *
  * @param CakeRequest $request The request object.
  * @param CakeResponse $response The response object.
- * @return boolean False on failure, user on success.
+ * @return bool False on failure, user on success.
  * @throws HttpException or the one specified using $settings['unauthorized']
  */
 	public function unauthenticated(CakeRequest $request, CakeResponse $response) {