From 7a15d7153b2ffe4804be05249c51d0fb8099500c Mon Sep 17 00:00:00 2001 From: Carlos C Date: Sat, 29 Nov 2014 23:16:32 +0100 Subject: [PATCH 1/4] Adding php.tools as suggestion for tools to format source code --- _posts/02-01-01-Code-Style-Guide.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_posts/02-01-01-Code-Style-Guide.md b/_posts/02-01-01-Code-Style-Guide.md index a48d699..bc479c2 100644 --- a/_posts/02-01-01-Code-Style-Guide.md +++ b/_posts/02-01-01-Code-Style-Guide.md @@ -29,8 +29,8 @@ and applications that implement the components can have consistency even when wo You can use [PHP_CodeSniffer][phpcs] to check code against any one of these recommendations, and plugins for text editors like [Sublime Text 2][st-cs] to be given real time feedback. -Use Fabien Potencier's [PHP Coding Standards Fixer][phpcsfixer] to automatically modify your code syntax so that it -conforms to these standards, saving you from fixing each problem by hand. +Use Fabien Potencier's [PHP Coding Standards Fixer][phpcsfixer], or [php.tools][phptools], to automatically modify your +code syntax so that it conforms to these standards, saving you from fixing each problem by hand. English is preferred for all symbol names and code infrastructure. Comments may be written in any language easily readable by all current and future parties who may be working on the codebase. @@ -46,3 +46,4 @@ by all current and future parties who may be working on the codebase. [phpcs]: http://pear.php.net/package/PHP_CodeSniffer/ [st-cs]: https://github.com/benmatselby/sublime-phpcs [phpcsfixer]: http://cs.sensiolabs.org/ +[phptools]: http://www.cirello.org/php.tools/ From 4c8392c5bc9e24010f8aa137518fea8e17bdc7ef Mon Sep 17 00:00:00 2001 From: Carlos C Date: Mon, 1 Dec 2014 19:04:18 +0100 Subject: [PATCH 2/4] Rephrasing paragraph to accommodate both php.tools and PHP-CS-Fixer --- _posts/02-01-01-Code-Style-Guide.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/_posts/02-01-01-Code-Style-Guide.md b/_posts/02-01-01-Code-Style-Guide.md index bc479c2..6802fc1 100644 --- a/_posts/02-01-01-Code-Style-Guide.md +++ b/_posts/02-01-01-Code-Style-Guide.md @@ -29,8 +29,11 @@ and applications that implement the components can have consistency even when wo You can use [PHP_CodeSniffer][phpcs] to check code against any one of these recommendations, and plugins for text editors like [Sublime Text 2][st-cs] to be given real time feedback. -Use Fabien Potencier's [PHP Coding Standards Fixer][phpcsfixer], or [php.tools][phptools], to automatically modify your -code syntax so that it conforms to these standards, saving you from fixing each problem by hand. +You can fix the code layout automatically one of the two possible tools. One is Fabien Potencier's +[PHP Coding Standards Fixer][phpcsfixer] which has a very well tested codebase. It's bigger and slower, but very stable +and used by some huge projects like Zend and Symfony. Another option is [php.tools][phptools], which is made popular +by the [sublime-phpfmt][sublime-phpfmt] editor plugin. While being newer, it makes great improvements in performance, +meaning real-time editor fixing is a bit more fluid. English is preferred for all symbol names and code infrastructure. Comments may be written in any language easily readable by all current and future parties who may be working on the codebase. @@ -46,4 +49,5 @@ by all current and future parties who may be working on the codebase. [phpcs]: http://pear.php.net/package/PHP_CodeSniffer/ [st-cs]: https://github.com/benmatselby/sublime-phpcs [phpcsfixer]: http://cs.sensiolabs.org/ -[phptools]: http://www.cirello.org/php.tools/ +[phptools]: https://github.com/dericofilho/php.tools +[sublime-phpfmt]: https://github.com/dericofilho/sublime-phpfmt From d06d426256c92a14d21f18233046a7db1c76fd87 Mon Sep 17 00:00:00 2001 From: Carlos C Date: Mon, 1 Dec 2014 19:06:46 +0100 Subject: [PATCH 3/4] Replacing Zend with Magento --- _posts/02-01-01-Code-Style-Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/02-01-01-Code-Style-Guide.md b/_posts/02-01-01-Code-Style-Guide.md index 6802fc1..ada7436 100644 --- a/_posts/02-01-01-Code-Style-Guide.md +++ b/_posts/02-01-01-Code-Style-Guide.md @@ -31,7 +31,7 @@ like [Sublime Text 2][st-cs] to be given real time feedback. You can fix the code layout automatically one of the two possible tools. One is Fabien Potencier's [PHP Coding Standards Fixer][phpcsfixer] which has a very well tested codebase. It's bigger and slower, but very stable -and used by some huge projects like Zend and Symfony. Another option is [php.tools][phptools], which is made popular +and used by some huge projects like Magento and Symfony. Another option is [php.tools][phptools], which is made popular by the [sublime-phpfmt][sublime-phpfmt] editor plugin. While being newer, it makes great improvements in performance, meaning real-time editor fixing is a bit more fluid. From 1cc6db96053c33444b365e3bee7484e7f482a57d Mon Sep 17 00:00:00 2001 From: Carlos C Date: Mon, 1 Dec 2014 20:55:25 +0100 Subject: [PATCH 4/4] Fixing some grammatical mistakes --- _posts/02-01-01-Code-Style-Guide.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/02-01-01-Code-Style-Guide.md b/_posts/02-01-01-Code-Style-Guide.md index ada7436..0ab5fd4 100644 --- a/_posts/02-01-01-Code-Style-Guide.md +++ b/_posts/02-01-01-Code-Style-Guide.md @@ -29,11 +29,11 @@ and applications that implement the components can have consistency even when wo You can use [PHP_CodeSniffer][phpcs] to check code against any one of these recommendations, and plugins for text editors like [Sublime Text 2][st-cs] to be given real time feedback. -You can fix the code layout automatically one of the two possible tools. One is Fabien Potencier's -[PHP Coding Standards Fixer][phpcsfixer] which has a very well tested codebase. It's bigger and slower, but very stable +You can fix the code layout automatically by using one of the two possible tools. One is Fabien Potencier's +[PHP Coding Standards Fixer][phpcsfixer] which has a very well tested codebase. It is bigger and slower, but very stable and used by some huge projects like Magento and Symfony. Another option is [php.tools][phptools], which is made popular by the [sublime-phpfmt][sublime-phpfmt] editor plugin. While being newer, it makes great improvements in performance, -meaning real-time editor fixing is a bit more fluid. +meaning real-time editor fixing is more fluid. English is preferred for all symbol names and code infrastructure. Comments may be written in any language easily readable by all current and future parties who may be working on the codebase.