From 272a13f0f20b3bbe084b2bdc49b0380352a03aca Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Nov 2015 22:54:18 +0100 Subject: [PATCH 1/2] Update CONTRIBUTING.md: Use Pico's .phpcs.xml instead of PSR2 standard for PHP_CodeSniffer --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b849472..ca6f0d8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,11 +39,11 @@ Pico uses the [PSR-2 Coding Standard](http://www.php-fig.org/psr/psr-2/) as defi For historical reasons we don't use formal namespaces. Markdown files in the `content-sample` folder (the inline documentation) must follow a hard limit of 80 characters line length. -It is recommended to check your code using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) using the `PSR2` standard using the following command: +It is recommended to check your code using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) using Pico's `.phpcs.xml` standard. Use the following command: - $ ./bin/phpcs --standard=PSR2 [file(s)] + $ ./vendor/bin/phpcs --standard=.phpcs.xml [file]... -With this command you can specify a file or folder to limit which files it will check or omit that argument altogether, in which case the current directory is checked. +With this command you can specify a file or folder to limit which files it will check or omit that argument altogether, in which case the current working directory is checked. ### Keep documentation in sync From 4f9029629566fc29d4b86e15963f2c49faf5532e Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Nov 2015 22:55:05 +0100 Subject: [PATCH 2/2] Update .phpcs.xml: Check $PWD by default --- .phpcs.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.phpcs.xml b/.phpcs.xml index 72dd231..77a35e5 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -5,6 +5,11 @@ but without the MissingNamespace sniff. + + . +