diff --git a/.travis.yml b/.travis.yml
index 9e258ad6..6c1f97ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
+  - 7.1
+  - 7.2
 
 before_script:
   - mv ../cakephp-codesniffer ../cakephp_codesniffer && cd ../cakephp_codesniffer
diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php
index a34004d6..ded39e6d 100644
--- a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php
@@ -10,7 +10,7 @@
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
+ * @link      https://pear.php.net/package/PHP_CodeSniffer
  */
 
 if (class_exists('PHP_CodeSniffer_CommentParser_FunctionCommentParser', true) === false) {
@@ -41,7 +41,7 @@
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
+ * @link      https://pear.php.net/package/PHP_CodeSniffer
  */
 class CakePHP_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_Sniff
 {
@@ -469,5 +469,3 @@ protected function processParams($commentStart)
 
 
 }//end class
-
-?>
diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
index 6d97754f..8280fcdd 100644
--- a/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
+++ b/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.10
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
 	$error = 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found';
@@ -21,7 +21,6 @@
 
 /**
  * Ensures the throws in the code are declared in the PHPDoc
- *
  */
 class CakePHP_Sniffs_Commenting_FunctionCommentThrowTagSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff {
 
diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentTypeSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentTypeSniff.php
index 5af4b899..3f3de087 100644
--- a/CakePHP/Sniffs/Commenting/FunctionCommentTypeSniff.php
+++ b/CakePHP/Sniffs/Commenting/FunctionCommentTypeSniff.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/ControlStructures/ControlStructuresSniff.php b/CakePHP/Sniffs/ControlStructures/ControlStructuresSniff.php
index 2305fa83..bb87dbae 100644
--- a/CakePHP/Sniffs/ControlStructures/ControlStructuresSniff.php
+++ b/CakePHP/Sniffs/ControlStructures/ControlStructuresSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.14
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/CakePHP/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
index de46a2e2..c733c664 100644
--- a/CakePHP/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/CakePHP/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.14
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/ControlStructures/WhileStructuresSniff.php b/CakePHP/Sniffs/ControlStructures/WhileStructuresSniff.php
index f9850792..26cf7b27 100644
--- a/CakePHP/Sniffs/ControlStructures/WhileStructuresSniff.php
+++ b/CakePHP/Sniffs/ControlStructures/WhileStructuresSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.14
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/Formatting/OneClassPerUseSniff.php b/CakePHP/Sniffs/Formatting/OneClassPerUseSniff.php
index ce91e151..8076b428 100644
--- a/CakePHP/Sniffs/Formatting/OneClassPerUseSniff.php
+++ b/CakePHP/Sniffs/Formatting/OneClassPerUseSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.10
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php b/CakePHP/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
index e1bddb68..ac7dd1b1 100644
--- a/CakePHP/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
+++ b/CakePHP/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
@@ -2,16 +2,16 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  * @since         CakePHP CodeSniffer 0.1.10
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php b/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php
index a28343ef..72228c1e 100644
--- a/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php
+++ b/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.28
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/CakePHP/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
index 37000d8d..23afe81e 100644
--- a/CakePHP/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
+++ b/CakePHP/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.18
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 if (class_exists('Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff', true) === false) {
 	$error = 'Class Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff not found';
diff --git a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
index daa7efd7..7cee2e73 100644
--- a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
+++ b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
@@ -10,7 +10,7 @@
  * @author	  Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ * @link	  https://pear.php.net/package/PHP_CodeSniffer
  */
 
 /**
@@ -25,7 +25,7 @@
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @version   Release: 1.5.0RC3
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ * @link	  https://pear.php.net/package/PHP_CodeSniffer
  */
 class CakePHP_Sniffs_NamingConventions_UpperCaseConstantNameSniff implements PHP_CodeSniffer_Sniff
 {
@@ -151,6 +151,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
 				return;
 			}
 
+			// Is this a return type declarations?
+			if ($tokens[$nextPtr]['code'] === T_OPEN_CURLY_BRACKET) {
+				$prevPtrReturnType = $phpcsFile->findPrevious(array(T_WHITESPACE, T_INLINE_THEN), ($stackPtr - 1), null, true);
+				if (in_array($tokens[$prevPtrReturnType]['code'], array(T_COLON, T_INLINE_ELSE), true)) {
+					return;
+				}
+			}
+
 			// Is this a variable name, in the form ${varname} ?
 			if ($tokens[$prevPtr]['code'] === T_OPEN_CURLY_BRACKET) {
 				$nextPtr = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
diff --git a/CakePHP/Sniffs/NamingConventions/ValidClassBracketsSniff.php b/CakePHP/Sniffs/NamingConventions/ValidClassBracketsSniff.php
index 8cedacbd..e88931cd 100644
--- a/CakePHP/Sniffs/NamingConventions/ValidClassBracketsSniff.php
+++ b/CakePHP/Sniffs/NamingConventions/ValidClassBracketsSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.12
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/CakePHP/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 1130bdb1..c873e9cc 100644
--- a/CakePHP/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/CakePHP/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/NamingConventions/ValidTraitNameSniff.php b/CakePHP/Sniffs/NamingConventions/ValidTraitNameSniff.php
index 5876eb88..20bc76a6 100644
--- a/CakePHP/Sniffs/NamingConventions/ValidTraitNameSniff.php
+++ b/CakePHP/Sniffs/NamingConventions/ValidTraitNameSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.10
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 2e022922..dc4f3581 100644
--- a/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 if (class_exists('PHP_CodeSniffer_Standards_AbstractVariableSniff', true) === false) {
@@ -115,7 +115,7 @@ protected function processMemberVar(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 			}
 		} elseif ($private === true) {
 			if (substr($varName, 0, 2) !== '__') {
-				$error = 'Private member variable "%s" must contain a leading underscore';
+				$error = 'Private member variable "%s" must contain two leading underscores';
 				$data = array($varName);
 				$phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $data);
 				return;
@@ -204,7 +204,7 @@ protected function processVariableInString(PHP_CodeSniffer_File $phpcsFile, $sta
  * Variables in CakePHP can either be $fooBar, $FooBar, $_fooBar, or $_FooBar.
  *
  * @param string $string The variable to check.
- * @param boolea $public Whether or not the variable is public.
+ * @param boolean $public Whether or not the variable is public.
  * @return boolean
  */
 	protected function _isValidVar($string, $public = true) {
diff --git a/CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php b/CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php
index c4abb1d5..67c0a2c1 100644
--- a/CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php
+++ b/CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.14
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/PHP/TypeCastingSniff.php b/CakePHP/Sniffs/PHP/TypeCastingSniff.php
index 812dfeb7..638f7e31 100644
--- a/CakePHP/Sniffs/PHP/TypeCastingSniff.php
+++ b/CakePHP/Sniffs/PHP/TypeCastingSniff.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/Strings/ConcatenationSpacingSniff.php b/CakePHP/Sniffs/Strings/ConcatenationSpacingSniff.php
index 29a4cbbd..8a5feb00 100644
--- a/CakePHP/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ b/CakePHP/Sniffs/Strings/ConcatenationSpacingSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/WhiteSpace/CommaSpacingSniff.php b/CakePHP/Sniffs/WhiteSpace/CommaSpacingSniff.php
index 10fbc73c..9fde2f9e 100644
--- a/CakePHP/Sniffs/WhiteSpace/CommaSpacingSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/CommaSpacingSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.14
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php b/CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
index 95723b1e..355b8e6b 100644
--- a/CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.12
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/CakePHP/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
index 63e97a60..c72ac246 100644
--- a/CakePHP/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/CakePHP/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
index fcbe8892..281c9701 100644
--- a/CakePHP/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/CakePHP/Sniffs/WhiteSpace/FunctionSpacingSniff.php
index 13ca5259..6f201bd0 100644
--- a/CakePHP/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/FunctionSpacingSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/CakePHP/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index 9c45ab8a..d4ac114c 100755
--- a/CakePHP/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/CakePHP/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index b359d460..6cfb1c4c 100755
--- a/CakePHP/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.6
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/CakePHP/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index bbe38671..b36c9d37 100644
--- a/CakePHP/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.12
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/ScopeIndentSniff.php b/CakePHP/Sniffs/WhiteSpace/ScopeIndentSniff.php
index 4aad7d82..f71bb245 100644
--- a/CakePHP/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -2,14 +2,14 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * This file is originally written by Greg Sherwood and Marc McIntyre, but
  * modified for CakePHP.
  *
  * @copyright     2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.1
  * @license       https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
diff --git a/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php b/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
index 2f0cfe61..bf455cf9 100755
--- a/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
+++ b/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
@@ -2,17 +2,17 @@
 /**
  * PHP Version 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://pear.php.net/package/PHP_CodeSniffer_CakePHP
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://pear.php.net/package/PHP_CodeSniffer_CakePHP
  * @since         CakePHP CodeSniffer 0.1.11
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/CakePHP/ruleset.xml b/CakePHP/ruleset.xml
index 48fb2cff..6d83519b 100755
--- a/CakePHP/ruleset.xml
+++ b/CakePHP/ruleset.xml
@@ -38,7 +38,7 @@
  <rule ref="PSR2.Namespaces.UseDeclaration"/>
 
  <!--
- Disabled and replaced with local copy. See http://pear.php.net/bugs/bug.php?id=19957
+ Disabled and replaced with local copy. See https://pear.php.net/bugs/bug.php?id=19957
  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
  -->
  <rule ref="PEAR.NamingConventions.ValidClassName"/>
diff --git a/CakePHP/tests/files/return_type_declaration_pass.php b/CakePHP/tests/files/return_type_declaration_pass.php
new file mode 100644
index 00000000..505d3479
--- /dev/null
+++ b/CakePHP/tests/files/return_type_declaration_pass.php
@@ -0,0 +1,31 @@
+<?php
+
+class ReturnTypeDeclaration {
+
+/**
+ * A function
+ *
+ * @return void
+ */
+	public function returnTypeVoid() : void {
+	}
+
+/**
+ * A nullable function
+ *
+ * @return string|null
+ */
+	public function returnTypeNull() : ?string {
+	}
+
+/**
+ * A function with param
+ *
+ * @param int $firstParam a first param
+ * @param string $secondParam a second param
+ * @return int
+ */
+	public function withParam(int $firstParam, string $secondParam) : int {
+	}
+
+}
diff --git a/LICENSE.txt b/LICENSE.txt
index 414ab1e7..643c3035 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
+CakePHP(tm) : The Rapid Development PHP Framework (https://cakephp.org)
 Copyright (c) 2005-2013, Cake Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/README.md b/README.md
index 95ad3cbf..cee741b6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# CakePHP Code Sniffer [![Build Status](https://travis-ci.org/cakephp/cakephp-codesniffer.png?branch=master)](http://travis-ci.org/cakephp/cakephp-codesniffer)
+# CakePHP Code Sniffer [![Build Status](https://travis-ci.org/cakephp/cakephp-codesniffer.png?branch=master)](https://travis-ci.org/cakephp/cakephp-codesniffer)
 
-This code works with [phpcs](http://pear.php.net/manual/en/package.php.php-codesniffer.php)
+This code works with [phpcs](https://pear.php.net/manual/en/package.php.php-codesniffer.php)
 and checks code against the coding standards used in CakePHP.
 
 ## Installation
@@ -41,6 +41,10 @@ If you'd like to contribute to the Code Sniffer, you can fork the project add fe
 
 Make sure to clone the repository to something like **cakephp_codesniffer** (instead of the default **cakephp-codesniffer**) because otherwise `phpunit` will fail to run the tests.
 
+Keep in mind that the code in this repository does not adhere to the CakePHP standard but to the PEAR standard
+as requested by [PHP_CodeSniffer
+](https://github.com/squizlabs/PHP_CodeSniffer/blob/1.5/CONTRIBUTING.md).
+
 ## Releasing CakePHP Code Sniffer
 
 * Update version number in build.xml
diff --git a/build.xml b/build.xml
index 449f2de8..ef7fdbd7 100755
--- a/build.xml
+++ b/build.xml
@@ -73,7 +73,7 @@
 			<license>MIT License</license>
 			<version release="${version}" api="${version}" />
 			<stability release="stable" api="stable" />
-			<notes>http://github.com/cakephp/cakephp-codesniffer/blob/master/README</notes>
+			<notes>https://github.com/cakephp/cakephp-codesniffer/blob/master/README</notes>
 			<dependencies>
 				<php minimum_version="5.2.8" />
 				<pear minimum_version="1.9.0" recommended_version="1.9.4" />
diff --git a/composer.json b/composer.json
index 4a1df3ad..42571b2b 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "CakePHP CodeSniffer Standards",
     "type": "library",
     "keywords": ["framework", "codesniffer"],
-    "homepage": "http://cakephp.org",
+    "homepage": "https://cakephp.org",
     "license": "MIT",
     "authors": [
         {
@@ -13,14 +13,14 @@
     ],
     "support": {
         "issues": "https://github.com/cakephp/cakephp-codesniffer/issues",
-        "forum": "http://stackoverflow.com/tags/cakephp",
+        "forum": "https://stackoverflow.com/tags/cakephp",
         "irc": "irc://irc.freenode.org/cakephp",
         "source": "https://github.com/cakephp/cakephp-codesniffer"
     },
     "require": {
-        "squizlabs/php_codesniffer": "~1.4"
+        "squizlabs/php_codesniffer": "^1.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.1.*"
+        "phpunit/phpunit": "^4.1.0"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index c3a3ec87..fe2c423d 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -5,7 +5,6 @@
 	 convertNoticesToExceptions="true"
 	 convertWarningsToExceptions="true"
 	 mapTestClassNameToCoveredClassName="false"
-	 strict="false"
 	 verbose="false"
 	 bootstrap="./CakePHP/tests/bootstrap.php">
 	<testsuites>