From 8becac640625ab7f3c9a484da23f0570e02bbaa8 Mon Sep 17 00:00:00 2001 From: Brian Porter Date: Sun, 9 Aug 2015 18:00:52 -0500 Subject: [PATCH 1/5] Use new composer-plugins installer. --- composer.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 1f5d325..a456103 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "loadsys/loadsys_codesniffer", "description": "Loadsys CodeSniffer Standards, uses the CakePHP core team's as a base.", - "type": "library", + "type": "phpcs-coding-standard", "keywords": ["framework", "codesniffer"], "homepage": "https://github.com/loadsys/loadsys_codesniffer", "support": { @@ -9,11 +9,12 @@ "source": "https://github.com/loadsys/loadsys_codesniffer" }, "require": { - "squizlabs/php_codesniffer": "2.*", - "cakephp/cakephp-codesniffer": "^2.0.4" + "squizlabs/php_codesniffer": "~2.3", + "cakephp/cakephp-codesniffer": "^2.0.4", + "loadsys/composer-plugins": "dev-f/phpcs-coding-standard-installer" }, "require-dev": { - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "~4.1" }, "license": "MIT", "authors": [ From debef6170f4df4870fa9f9e34b4d82db2a50015f Mon Sep 17 00:00:00 2001 From: Brian Porter Date: Sun, 9 Aug 2015 18:05:12 -0500 Subject: [PATCH 2/5] Temporarily include path for loadsys/composer-plugins. Since it's not published to Packagist yet. --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a456103..bf1f4e6 100644 --- a/composer.json +++ b/composer.json @@ -30,5 +30,11 @@ "name": "CakePHP Community", "homepage": "https://github.com/cakephp/cakephp-codesniffer/graphs/contributors" } - ] + ], + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/loadsys/composer-plugins.git" + } + ] } From 23239d2d0a7a8cdd8e070c95155a36f32175089c Mon Sep 17 00:00:00 2001 From: Brian Porter Date: Wed, 12 Aug 2015 11:20:03 -0500 Subject: [PATCH 3/5] Add in hook scripts for non-typed standards packages. The hope is to get the CakePHP standards folder copied into place automatically. --- composer.json | 17 +++++++++++------ snifftests/TestHelper.php | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index bf1f4e6..97017f6 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,15 @@ "homepage": "https://github.com/cakephp/cakephp-codesniffer/graphs/contributors" } ], - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/loadsys/composer-plugins.git" - } - ] + "scripts": { + "post-install-cmd": [ + "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::postInstall" + ], + "post-update-cmd": [ + "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::postInstall" + ], + "pre-package-uninstall": [ + "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::prePackageUninstall" + ] + } } diff --git a/snifftests/TestHelper.php b/snifftests/TestHelper.php index 871ee49..049e9a8 100644 --- a/snifftests/TestHelper.php +++ b/snifftests/TestHelper.php @@ -99,6 +99,7 @@ public function runPhpCs($file) { return $result; } + //@TODO: Add a doc block. Sheesh. public function sniffList() { if (!class_exists('PHP_CodeSniffer')) { $composerInstall = dirname(dirname(dirname(__FILE__))) . '/vendor/squizlabs/php_codesniffer/CodeSniffer.php'; From bd83aed3d39eaebc02ab1399e95486bffb7adf22 Mon Sep 17 00:00:00 2001 From: Brian Porter Date: Thu, 13 Aug 2015 09:29:29 -0500 Subject: [PATCH 4/5] Remove unhelpful scripts:{} block, add doc block. --- composer.json | 13 +------------ snifftests/TestHelper.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 97017f6..a456103 100644 --- a/composer.json +++ b/composer.json @@ -30,16 +30,5 @@ "name": "CakePHP Community", "homepage": "https://github.com/cakephp/cakephp-codesniffer/graphs/contributors" } - ], - "scripts": { - "post-install-cmd": [ - "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::postInstall" - ], - "post-update-cmd": [ - "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::postInstall" - ], - "pre-package-uninstall": [ - "Loadsys\\Composer\\PhpCodesniffer\\CodingStandardHook::prePackageUninstall" - ] - } + ] } diff --git a/snifftests/TestHelper.php b/snifftests/TestHelper.php index 049e9a8..fd42210 100644 --- a/snifftests/TestHelper.php +++ b/snifftests/TestHelper.php @@ -99,7 +99,16 @@ public function runPhpCs($file) { return $result; } - //@TODO: Add a doc block. Sheesh. + /** + * Asks the phpcs runtime for a list of code sniffs it knows about. + * + * Returns an array of `Vendor.Sniff.Rule` elements that match those + * returned by `phpcs -s`. Used as a "meta" test in LoadsysStandardTest + * to check which sniffs are covered by the sample files and which + * aren't. + * + * @return array Comprehensive list of code sniffs the phpcs runtime knows about. + */ public function sniffList() { if (!class_exists('PHP_CodeSniffer')) { $composerInstall = dirname(dirname(dirname(__FILE__))) . '/vendor/squizlabs/php_codesniffer/CodeSniffer.php'; From 6cac2819d8a23bad960f97089c4d40bd879e0b5b Mon Sep 17 00:00:00 2001 From: Brian Porter Date: Thu, 13 Aug 2015 09:33:36 -0500 Subject: [PATCH 5/5] Anticipate correct version of loadsys/composer-plugins. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a456103..ea58b40 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "squizlabs/php_codesniffer": "~2.3", "cakephp/cakephp-codesniffer": "^2.0.4", - "loadsys/composer-plugins": "dev-f/phpcs-coding-standard-installer" + "loadsys/composer-plugins": "~1.0" }, "require-dev": { "phpunit/phpunit": "~4.1"