From c830e0a4a6adeea772c4a22056726587753d76e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Fri, 25 Sep 2015 19:46:58 +0200 Subject: [PATCH 01/12] Use the caret to define version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a1df3ad..5bebd8b0 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "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.*" From 51ecac219b1183689be35d5e6342f015cb20d3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Fri, 25 Sep 2015 19:49:47 +0200 Subject: [PATCH 02/12] Allow to use newest PHPUnit 4.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5bebd8b0..c93bba48 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,6 @@ "squizlabs/php_codesniffer": "^1.4.0" }, "require-dev": { - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "^4.1.0" } } From 2d577fce6cb57f76370ecc52b7f7b7de7137c57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Fri, 25 Sep 2015 19:50:14 +0200 Subject: [PATCH 03/12] Remove deprecated strict config > Warning: Deprecated configuration setting "strict" used --- phpunit.xml | 1 - 1 file changed, 1 deletion(-) 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"> From 57ce84683ffefc363f1fc84e32b3a3b09abec311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Fri, 25 Sep 2015 20:03:46 +0200 Subject: [PATCH 04/12] CS --- CakePHP/Sniffs/Commenting/FunctionCommentSniff.php | 2 -- CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php | 1 - CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php index a34004d6..f0779381 100644 --- a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php +++ b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php @@ -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..77a007c2 100644 --- a/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php +++ b/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php @@ -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/NamingConventions/ValidVariableNameSniff.php b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php index 2e022922..3fefc7d0 100644 --- a/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -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) { From c302967de77db815625eeb3af404251578722790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Fri, 25 Sep 2015 20:06:35 +0200 Subject: [PATCH 05/12] Add note about CS of CS code --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 95ad3cbf..93a63200 100644 --- a/README.md +++ b/README.md @@ -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 From 1a9e7545d5570619859640e52e07e05516ef442c Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 23 Oct 2016 10:48:01 -0700 Subject: [PATCH 06/12] Make error message for privat variable more clear --- CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php index 3fefc7d0..01ea018c 100644 --- a/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/CakePHP/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -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; From 05bd28eefa2e5bfdc40b978560bbf9c6006afb16 Mon Sep 17 00:00:00 2001 From: nojimage Date: Fri, 8 Jun 2018 17:49:48 +0900 Subject: [PATCH 07/12] ConstantNotUpperCase avoid return type declarations #204 --- .../UpperCaseConstantNameSniff.php | 8 +++++++ .../files/return_type_declaration_pass.php | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 CakePHP/tests/files/return_type_declaration_pass.php diff --git a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php index daa7efd7..ada08066 100644 --- a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php +++ b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php @@ -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 ($tokens[$prevPtrReturnType]['code'] === T_COLON) { + 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/tests/files/return_type_declaration_pass.php b/CakePHP/tests/files/return_type_declaration_pass.php new file mode 100644 index 00000000..f6cfaa09 --- /dev/null +++ b/CakePHP/tests/files/return_type_declaration_pass.php @@ -0,0 +1,21 @@ + Date: Fri, 8 Jun 2018 13:42:15 -0400 Subject: [PATCH 08/12] Stop using unmaintained php versions. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From c04e0ae38046cbc810991b5d3150b05ed8e58f55 Mon Sep 17 00:00:00 2001 From: nojimage Date: Wed, 4 Jul 2018 13:06:23 +0900 Subject: [PATCH 09/12] fixes typo. --- CakePHP/tests/files/return_type_declaration_pass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CakePHP/tests/files/return_type_declaration_pass.php b/CakePHP/tests/files/return_type_declaration_pass.php index f6cfaa09..413305d7 100644 --- a/CakePHP/tests/files/return_type_declaration_pass.php +++ b/CakePHP/tests/files/return_type_declaration_pass.php @@ -15,7 +15,7 @@ public function returnTypeVoid() : void { * * @return string|null */ - public unction returnTypeNull() : ?string { + public function returnTypeNull() : ?string { } } From 25e7c77daa664cae9da7cc2d5fab33189192a7dd Mon Sep 17 00:00:00 2001 From: nojimage Date: Wed, 4 Jul 2018 13:29:23 +0900 Subject: [PATCH 10/12] fix parse return type declarations. #211 --- .../NamingConventions/UpperCaseConstantNameSniff.php | 2 +- CakePHP/tests/files/return_type_declaration_pass.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php index ada08066..d9d58f77 100644 --- a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php +++ b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php @@ -154,7 +154,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { // 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 ($tokens[$prevPtrReturnType]['code'] === T_COLON) { + if (in_array($tokens[$prevPtrReturnType]['code'], array(T_COLON, T_INLINE_ELSE), true)) { return; } } diff --git a/CakePHP/tests/files/return_type_declaration_pass.php b/CakePHP/tests/files/return_type_declaration_pass.php index 413305d7..505d3479 100644 --- a/CakePHP/tests/files/return_type_declaration_pass.php +++ b/CakePHP/tests/files/return_type_declaration_pass.php @@ -18,4 +18,14 @@ public function returnTypeVoid() : void { 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 { + } + } From fd7395ba4992d3e77bfe6dc370ec34a13171823c Mon Sep 17 00:00:00 2001 From: Arhell Date: Tue, 21 Mar 2023 00:56:00 +0200 Subject: [PATCH 11/12] update cake folder link (v1) --- CakePHP/Sniffs/Commenting/FunctionCommentSniff.php | 4 ++-- .../Sniffs/Commenting/FunctionCommentThrowTagSniff.php | 10 +++++----- CakePHP/Sniffs/Commenting/FunctionCommentTypeSniff.php | 10 +++++----- .../ControlStructures/ControlStructuresSniff.php | 10 +++++----- .../ControlStructures/ElseIfDeclarationSniff.php | 10 +++++----- .../Sniffs/ControlStructures/WhileStructuresSniff.php | 10 +++++----- CakePHP/Sniffs/Formatting/OneClassPerUseSniff.php | 10 +++++----- .../Sniffs/Formatting/UseInAlphabeticalOrderSniff.php | 8 ++++---- CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php | 10 +++++----- .../FunctionDeclarationArgumentSpacingSniff.php | 10 +++++----- .../NamingConventions/UpperCaseConstantNameSniff.php | 4 ++-- .../NamingConventions/ValidClassBracketsSniff.php | 10 +++++----- .../NamingConventions/ValidFunctionNameSniff.php | 10 +++++----- .../Sniffs/NamingConventions/ValidTraitNameSniff.php | 10 +++++----- .../NamingConventions/ValidVariableNameSniff.php | 10 +++++----- CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php | 10 +++++----- CakePHP/Sniffs/PHP/TypeCastingSniff.php | 10 +++++----- CakePHP/Sniffs/Strings/ConcatenationSpacingSniff.php | 10 +++++----- CakePHP/Sniffs/WhiteSpace/CommaSpacingSniff.php | 10 +++++----- CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php | 10 +++++----- .../WhiteSpace/FunctionClosingBraceSpaceSniff.php | 6 +++--- .../WhiteSpace/FunctionOpeningBraceSpaceSniff.php | 6 +++--- CakePHP/Sniffs/WhiteSpace/FunctionSpacingSniff.php | 6 +++--- .../Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php | 6 +++--- CakePHP/Sniffs/WhiteSpace/OperatorSpacingSniff.php | 6 +++--- CakePHP/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php | 6 +++--- CakePHP/Sniffs/WhiteSpace/ScopeIndentSniff.php | 6 +++--- CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php | 10 +++++----- CakePHP/ruleset.xml | 2 +- 29 files changed, 120 insertions(+), 120 deletions(-) diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php index f0779381..ded39e6d 100644 --- a/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php +++ b/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php @@ -10,7 +10,7 @@ * @author Marc McIntyre * @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 { diff --git a/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/CakePHP/Sniffs/Commenting/FunctionCommentThrowTagSniff.php index 77a007c2..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'; 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 @@ * @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 { 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 01ea018c..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) { 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 @@ From 02aea6f8c84bc40a1cc67e1626fade856d9459be Mon Sep 17 00:00:00 2001 From: Arhell Date: Wed, 22 Mar 2023 01:05:05 +0200 Subject: [PATCH 12/12] update root folder link (v1) --- LICENSE.txt | 2 +- README.md | 4 ++-- build.xml | 2 +- composer.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 93a63200..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 diff --git a/build.xml b/build.xml index 449f2de8..ef7fdbd7 100755 --- a/build.xml +++ b/build.xml @@ -73,7 +73,7 @@ MIT License - http://github.com/cakephp/cakephp-codesniffer/blob/master/README + https://github.com/cakephp/cakephp-codesniffer/blob/master/README diff --git a/composer.json b/composer.json index c93bba48..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,7 +13,7 @@ ], "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" },