From df7ff410e637cefd60e8a7eefb27ccb6bc150f6c Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 3 Nov 2017 10:02:11 +0100 Subject: [PATCH 1/5] Initial 3.x version --- {CakePHPOefenweb => CakePHP3Oefenweb}/ruleset.xml | 4 ++-- README.md | 6 +++--- composer.json | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) rename {CakePHPOefenweb => CakePHP3Oefenweb}/ruleset.xml (59%) diff --git a/CakePHPOefenweb/ruleset.xml b/CakePHP3Oefenweb/ruleset.xml similarity index 59% rename from CakePHPOefenweb/ruleset.xml rename to CakePHP3Oefenweb/ruleset.xml index 512a96d..b4f83fa 100644 --- a/CakePHPOefenweb/ruleset.xml +++ b/CakePHP3Oefenweb/ruleset.xml @@ -1,6 +1,6 @@ - - Oefenweb Code Sniffer for CakePHP + + Oefenweb Code Sniffer for CakePHP 3 diff --git a/README.md b/README.md index 804c378..ed52b55 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Oefenweb Code Sniffer for CakePHP +# Oefenweb Code Sniffer for CakePHP 3 This code works with [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) and checks code against the coding standards used at Oefenweb. @@ -7,7 +7,7 @@ This code works with [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) and c It's generally recommended to install these code sniffs with `composer`: ```sh -mkdir CakePHPOefenweb && cd $_ && composer require oefenweb/cakephp-codesniffer=dev-master; +mkdir CakePHP3Oefenweb && cd $_ && composer require oefenweb/cakephp-codesniffer=^3.0.0; ``` ```sh @@ -21,5 +21,5 @@ This lets `phpcs` know where to find your new sniffs. Ensure that you do not ove ## Usage ```sh -vendor/bin/phpcs --standard=CakePHPOefenweb ~/foo/bar/index.php; +vendor/bin/phpcs --standard=CakePHP3Oefenweb ~/foo/bar/index.php; ``` diff --git a/composer.json b/composer.json index e575785..3712c9f 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "oefenweb/cakephp-codesniffer", - "description": "Oefenweb Code Sniffer for CakePHP", + "description": "Oefenweb Code Sniffer for CakePHP 3", "type": "library", "keywords": [ "framework", "codesniffer" @@ -14,8 +14,9 @@ } ], "require": { - "php": ">=5.3.10", - "cakephp/cakephp-codesniffer": "1.*" + "php": ">=5.4", + "cakephp/cakephp-codesniffer": "^3.0.0", + "squizlabs/php_codesniffer": "3.0.0" }, "support": { "issues": "https://github.com/Oefenweb/cakephp-codesniffer/issues", From da74696fbe3aba7398b0f70d2db7571a6b400ef4 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 3 Nov 2017 12:06:00 +0100 Subject: [PATCH 2/5] Upgrade squizlabs/php_codesniffer --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3712c9f..b97b380 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,7 @@ ], "require": { "php": ">=5.4", - "cakephp/cakephp-codesniffer": "^3.0.0", - "squizlabs/php_codesniffer": "3.0.0" + "cakephp/cakephp-codesniffer": "^3.0.0" }, "support": { "issues": "https://github.com/Oefenweb/cakephp-codesniffer/issues", From 4d18ae6fce0d052664cc841909aa33957f796883 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Thu, 11 Jul 2024 12:35:36 +0200 Subject: [PATCH 3/5] Add Generic.Files.LineLength --- CakePHPOefenweb/ruleset.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CakePHPOefenweb/ruleset.xml b/CakePHPOefenweb/ruleset.xml index 696eaa2..e41c54f 100644 --- a/CakePHPOefenweb/ruleset.xml +++ b/CakePHPOefenweb/ruleset.xml @@ -4,4 +4,9 @@ + + + + + From 963af85b05f512bc29e7a68c270185366efa1db0 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Thu, 11 Jul 2024 13:22:06 +0200 Subject: [PATCH 4/5] Warning === Error --- CakePHPOefenweb/ruleset.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/CakePHPOefenweb/ruleset.xml b/CakePHPOefenweb/ruleset.xml index e41c54f..70b5ce4 100644 --- a/CakePHPOefenweb/ruleset.xml +++ b/CakePHPOefenweb/ruleset.xml @@ -6,6 +6,7 @@ + From d9fb810d90db66c361aa7ef428ae5ee285d0e57b Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Wed, 17 Jul 2024 10:00:24 +0200 Subject: [PATCH 5/5] Error limit to 160 --- CakePHPOefenweb/ruleset.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CakePHPOefenweb/ruleset.xml b/CakePHPOefenweb/ruleset.xml index 70b5ce4..5cbfe2e 100644 --- a/CakePHPOefenweb/ruleset.xml +++ b/CakePHPOefenweb/ruleset.xml @@ -7,7 +7,7 @@ - +