diff --git a/Docs/Files/IncludingFileStandard.xml b/DrupalCodingStandard/Docs/Files/IncludingFileStandard.xml
similarity index 100%
rename from Docs/Files/IncludingFileStandard.xml
rename to DrupalCodingStandard/Docs/Files/IncludingFileStandard.xml
diff --git a/Docs/Files/LineLengthStandard.xml b/DrupalCodingStandard/Docs/Files/LineLengthStandard.xml
similarity index 100%
rename from Docs/Files/LineLengthStandard.xml
rename to DrupalCodingStandard/Docs/Files/LineLengthStandard.xml
diff --git a/Docs/Functions/FunctionCallArgumentSpacingStandard.xml b/DrupalCodingStandard/Docs/Functions/FunctionCallArgumentSpacingStandard.xml
similarity index 100%
rename from Docs/Functions/FunctionCallArgumentSpacingStandard.xml
rename to DrupalCodingStandard/Docs/Functions/FunctionCallArgumentSpacingStandard.xml
diff --git a/Docs/Functions/FunctionCallSignatureStandard.xml b/DrupalCodingStandard/Docs/Functions/FunctionCallSignatureStandard.xml
similarity index 100%
rename from Docs/Functions/FunctionCallSignatureStandard.xml
rename to DrupalCodingStandard/Docs/Functions/FunctionCallSignatureStandard.xml
diff --git a/Docs/Functions/ValidDefaultValueStandard.xml b/DrupalCodingStandard/Docs/Functions/ValidDefaultValueStandard.xml
similarity index 100%
rename from Docs/Functions/ValidDefaultValueStandard.xml
rename to DrupalCodingStandard/Docs/Functions/ValidDefaultValueStandard.xml
diff --git a/Docs/NamingConventions/ValidClassNameStandard.xml b/DrupalCodingStandard/Docs/NamingConventions/ValidClassNameStandard.xml
similarity index 100%
rename from Docs/NamingConventions/ValidClassNameStandard.xml
rename to DrupalCodingStandard/Docs/NamingConventions/ValidClassNameStandard.xml
diff --git a/Docs/NamingConventions/ValidFunctionNameStandard.xml b/DrupalCodingStandard/Docs/NamingConventions/ValidFunctionNameStandard.xml
similarity index 100%
rename from Docs/NamingConventions/ValidFunctionNameStandard.xml
rename to DrupalCodingStandard/Docs/NamingConventions/ValidFunctionNameStandard.xml
diff --git a/DrupalCodingStandard.php b/DrupalCodingStandard/DrupalCodingStandard.php
similarity index 100%
rename from DrupalCodingStandard.php
rename to DrupalCodingStandard/DrupalCodingStandard.php
diff --git a/Sniffs/Array/ArraySniff.php b/DrupalCodingStandard/Sniffs/Array/ArraySniff.php
similarity index 93%
rename from Sniffs/Array/ArraySniff.php
rename to DrupalCodingStandard/Sniffs/Array/ArraySniff.php
index bc63e321bd132db3e91c0d987e6ef311a63dde01..eab959103ec3969d4c30ded8d523d912a3b51464 100644
--- a/Sniffs/Array/ArraySniff.php
+++ b/DrupalCodingStandard/Sniffs/Array/ArraySniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Array_ArraySniff.
+ * DrupalCodingStandard_Sniffs_Array_ArraySniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Array_ArraySniff.
+ * DrupalCodingStandard_Sniffs_Array_ArraySniff.
*
* Checks if the array's are styled in the Drupal way.
* - Comma after the last array element
@@ -21,7 +21,7 @@
* @author Peter Philipp <peter.philipp@cando-image.com>
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Array_ArraySniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Array_ArraySniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Classes/ClassCreateInstanceSniff.php b/DrupalCodingStandard/Sniffs/Classes/ClassCreateInstanceSniff.php
similarity index 95%
rename from Sniffs/Classes/ClassCreateInstanceSniff.php
rename to DrupalCodingStandard/Sniffs/Classes/ClassCreateInstanceSniff.php
index 35f0de24f300cb2b3107da4de7bd3393df7efecb..78897626634fa62fc3902a646cc35f5bc6d968bb 100644
--- a/Sniffs/Classes/ClassCreateInstanceSniff.php
+++ b/DrupalCodingStandard/Sniffs/Classes/ClassCreateInstanceSniff.php
@@ -20,7 +20,7 @@
* @author Peter Philipp <peter.philipp@cando-image.com>
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Classes_ClassCreateInstanceSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Classes_ClassCreateInstanceSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Classes/ClassDeclarationSniff.php b/DrupalCodingStandard/Sniffs/Classes/ClassDeclarationSniff.php
similarity index 97%
rename from Sniffs/Classes/ClassDeclarationSniff.php
rename to DrupalCodingStandard/Sniffs/Classes/ClassDeclarationSniff.php
index 334cd542036acaf55b5dc3962659aee135c0559f..e3d6381e1b698ba34e44eaf296c9daac3b17d169 100644
--- a/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/DrupalCodingStandard/Sniffs/Classes/ClassDeclarationSniff.php
@@ -28,7 +28,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Classes_ClassDeclarationSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Classes_ClassDeclarationSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Commenting/ClassCommentSniff.php b/DrupalCodingStandard/Sniffs/Commenting/ClassCommentSniff.php
similarity index 98%
rename from Sniffs/Commenting/ClassCommentSniff.php
rename to DrupalCodingStandard/Sniffs/Commenting/ClassCommentSniff.php
index 5a02964ee8a53176cd6591e55c3b510d8d35e967..84cfe1edecd7abe4377776ac0ff9d9fb957e7e2e 100644
--- a/Sniffs/Commenting/ClassCommentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Commenting/ClassCommentSniff.php
@@ -49,7 +49,7 @@ include_once('FileCommentSniff.php');
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Commenting_ClassCommentSniff extends Drupal_Sniffs_Commenting_FileCommentSniff
+class DrupalCodingStandard_Sniffs_Commenting_ClassCommentSniff extends DrupalCodingStandard_Sniffs_Commenting_FileCommentSniff
{
diff --git a/Sniffs/Commenting/FileCommentSniff.php b/DrupalCodingStandard/Sniffs/Commenting/FileCommentSniff.php
similarity index 99%
rename from Sniffs/Commenting/FileCommentSniff.php
rename to DrupalCodingStandard/Sniffs/Commenting/FileCommentSniff.php
index 9c2c6be1087caa300abecf8153df865194286778..bef1d544fe39b72518ded9edc89ad5f6716fdaaf 100644
--- a/Sniffs/Commenting/FileCommentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Commenting/FileCommentSniff.php
@@ -43,7 +43,7 @@ if (class_exists('PHP_CodeSniffer_CommentParser_ClassCommentParser', true) === f
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
{
/**
diff --git a/Sniffs/Commenting/FunctionCommentSniff.php b/DrupalCodingStandard/Sniffs/Commenting/FunctionCommentSniff.php
similarity index 99%
rename from Sniffs/Commenting/FunctionCommentSniff.php
rename to DrupalCodingStandard/Sniffs/Commenting/FunctionCommentSniff.php
index e3bb7bd615fc1cbdca06ccdcf12ff00d9dee121a..442b1e6721be2ca10c29e0d933d4d4f5b9ef95aa 100644
--- a/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Commenting/FunctionCommentSniff.php
@@ -45,7 +45,7 @@ if (class_exists('PHP_CodeSniffer_CommentParser_FunctionCommentParser', true) ==
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_Sniff
{
/**
diff --git a/Sniffs/Commenting/InlineCommentSniff.php b/DrupalCodingStandard/Sniffs/Commenting/InlineCommentSniff.php
similarity index 95%
rename from Sniffs/Commenting/InlineCommentSniff.php
rename to DrupalCodingStandard/Sniffs/Commenting/InlineCommentSniff.php
index be13888ecbee73a1f66e46daf70af2223f1a7048..e90d68d09cdbcb8cd6ca12bdaac74d74b3564fe0 100644
--- a/Sniffs/Commenting/InlineCommentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Commenting/InlineCommentSniff.php
@@ -28,7 +28,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Commenting_InlineCommentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Commenting_InlineCommentSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/ControlStructures/ControlSignatureSniff.php b/DrupalCodingStandard/Sniffs/ControlStructures/ControlSignatureSniff.php
similarity index 93%
rename from Sniffs/ControlStructures/ControlSignatureSniff.php
rename to DrupalCodingStandard/Sniffs/ControlStructures/ControlSignatureSniff.php
index e7861382ab3e34018a5ca017b5da19a72f9623bf..709c75f8f709798041ccc4746ea1baafb53cfb7e 100644
--- a/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/DrupalCodingStandard/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -30,7 +30,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractPatternSniff', true) === fal
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
+class DrupalCodingStandard_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
{
diff --git a/Sniffs/ControlStructures/ElseIfSniff.php b/DrupalCodingStandard/Sniffs/ControlStructures/ElseIfSniff.php
similarity index 95%
rename from Sniffs/ControlStructures/ElseIfSniff.php
rename to DrupalCodingStandard/Sniffs/ControlStructures/ElseIfSniff.php
index b1797a65e3a93930232302ba56e181a74d190709..62b0a960fd5528328ccbb69e8b02feb8dde6f9e6 100644
--- a/Sniffs/ControlStructures/ElseIfSniff.php
+++ b/DrupalCodingStandard/Sniffs/ControlStructures/ElseIfSniff.php
@@ -30,7 +30,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractPatternSniff', true) === fal
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_ControlStructures_ElseIfSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_ControlStructures_ElseIfSniff implements PHP_CodeSniffer_Sniff
{
/**
diff --git a/Sniffs/ControlStructures/InlineControlStructureSniff.php b/DrupalCodingStandard/Sniffs/ControlStructures/InlineControlStructureSniff.php
similarity index 90%
rename from Sniffs/ControlStructures/InlineControlStructureSniff.php
rename to DrupalCodingStandard/Sniffs/ControlStructures/InlineControlStructureSniff.php
index ec39716041b233ce05f0b39b9f92da8bb0fc7d16..1e2641c86256d812b3ccb7e15b96e550dc639d99 100644
--- a/Sniffs/ControlStructures/InlineControlStructureSniff.php
+++ b/DrupalCodingStandard/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -33,7 +33,7 @@ if (class_exists('Generic_Sniffs_ControlStructures_InlineControlStructureSniff',
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_ControlStructures_InlineControlStructureSniff extends Generic_Sniffs_ControlStructures_InlineControlStructureSniff
+class DrupalCodingStandard_Sniffs_ControlStructures_InlineControlStructureSniff extends Generic_Sniffs_ControlStructures_InlineControlStructureSniff
{
/**
diff --git a/Sniffs/ControlStructures/MultiLineConditionSniff.php b/DrupalCodingStandard/Sniffs/ControlStructures/MultiLineConditionSniff.php
similarity index 98%
rename from Sniffs/ControlStructures/MultiLineConditionSniff.php
rename to DrupalCodingStandard/Sniffs/ControlStructures/MultiLineConditionSniff.php
index f8bc40c3476ff879a1cb1c5b8157c5e60b155ac4..e20e3b9c5eca5c26ecf1be5d286913894b1aa29f 100644
--- a/Sniffs/ControlStructures/MultiLineConditionSniff.php
+++ b/DrupalCodingStandard/Sniffs/ControlStructures/MultiLineConditionSniff.php
@@ -26,7 +26,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_ControlStructures_MultiLineConditionSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_ControlStructures_MultiLineConditionSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Files/IncludingFileSniff.php b/DrupalCodingStandard/Sniffs/Files/IncludingFileSniff.php
similarity index 98%
rename from Sniffs/Files/IncludingFileSniff.php
rename to DrupalCodingStandard/Sniffs/Files/IncludingFileSniff.php
index dde287fa80d0303d02c98e26767223ba35821098..f56ba5918145e528ead1ae98a020f4ed400894af 100644
--- a/Sniffs/Files/IncludingFileSniff.php
+++ b/DrupalCodingStandard/Sniffs/Files/IncludingFileSniff.php
@@ -30,7 +30,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Files_IncludingFileSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Files_IncludingFileSniff implements PHP_CodeSniffer_Sniff
{
/**
diff --git a/Sniffs/Files/LineEndingsSniff.php b/DrupalCodingStandard/Sniffs/Files/LineEndingsSniff.php
similarity index 84%
rename from Sniffs/Files/LineEndingsSniff.php
rename to DrupalCodingStandard/Sniffs/Files/LineEndingsSniff.php
index 8226844b364244ed6c383fb2ac2e27c04d323898..460be6b5f9fb2b82670db0e8199f487dc6981d42 100644
--- a/Sniffs/Files/LineEndingsSniff.php
+++ b/DrupalCodingStandard/Sniffs/Files/LineEndingsSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Files_LineEndingsSniff.
+ * DrupalCodingStandard_Sniffs_Files_LineEndingsSniff.
*
* PHP version 5
*
@@ -19,7 +19,7 @@ if (class_exists('Generic_Sniffs_Files_LineEndingsSniff', true) === false) {
}
/**
- * Drupal_Sniffs_Files_LineEndingsSniff.
+ * DrupalCodingStandard_Sniffs_Files_LineEndingsSniff.
*
* Checks that end of line characters are "\n".
*
@@ -32,7 +32,7 @@ if (class_exists('Generic_Sniffs_Files_LineEndingsSniff', true) === false) {
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Files_LineEndingsSniff extends Generic_Sniffs_Files_LineEndingsSniff
+class DrupalCodingStandard_Sniffs_Files_LineEndingsSniff extends Generic_Sniffs_Files_LineEndingsSniff
{
/**
diff --git a/Sniffs/Files/LineLengthSniff.php b/DrupalCodingStandard/Sniffs/Files/LineLengthSniff.php
similarity index 91%
rename from Sniffs/Files/LineLengthSniff.php
rename to DrupalCodingStandard/Sniffs/Files/LineLengthSniff.php
index 496ca04a92411a18e4058097c5e5a6fb6a86fbc7..cae2b2c4fc7d7431d077b149c59f880f4c2ad86b 100644
--- a/Sniffs/Files/LineLengthSniff.php
+++ b/DrupalCodingStandard/Sniffs/Files/LineLengthSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Files_LineLengthSniff.
+ * DrupalCodingStandard_Sniffs_Files_LineLengthSniff.
*
* PHP version 5
*
@@ -19,7 +19,7 @@ if (class_exists('Generic_Sniffs_Files_LineLengthSniff', true) === false) {
}
/**
- * Drupal_Sniffs_Files_LineLengthSniff.
+ * DrupalCodingStandard_Sniffs_Files_LineLengthSniff.
*
* Checks all lines in the file, and throws warnings if they are over 80
* characters in length.
@@ -33,7 +33,7 @@ if (class_exists('Generic_Sniffs_Files_LineLengthSniff', true) === false) {
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Files_LineLengthSniff extends Generic_Sniffs_Files_LineLengthSniff
+class DrupalCodingStandard_Sniffs_Files_LineLengthSniff extends Generic_Sniffs_Files_LineLengthSniff
{
/**
diff --git a/Sniffs/Formatting/ItemAssignmentSniff.php b/DrupalCodingStandard/Sniffs/Formatting/ItemAssignmentSniff.php
similarity index 93%
rename from Sniffs/Formatting/ItemAssignmentSniff.php
rename to DrupalCodingStandard/Sniffs/Formatting/ItemAssignmentSniff.php
index 1a6a8a2c573391d87ca39c11baf374057ca3840e..81ec44be2b4da0fdf5591aac14034d06e4685284 100644
--- a/Sniffs/Formatting/ItemAssignmentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Formatting/ItemAssignmentSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Formatting_ItemAssignmentSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_ItemAssignmentSniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Formatting_ItemAssignmentSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_ItemAssignmentSniff.
*
* Checks if the item assignemnt operator (=>) has
* - a space before and after
@@ -21,7 +21,7 @@
* @author Peter Philipp <peter.philipp@cando-image.com>
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Formatting_ItemAssignmentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Formatting_ItemAssignmentSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Formatting/MultiLineAssignmentSniff.php b/DrupalCodingStandard/Sniffs/Formatting/MultiLineAssignmentSniff.php
similarity index 95%
rename from Sniffs/Formatting/MultiLineAssignmentSniff.php
rename to DrupalCodingStandard/Sniffs/Formatting/MultiLineAssignmentSniff.php
index 7a5e19d85997281b651e8628eef4b9ec86a33e68..acb6c608ba72ffdd3d8092b4c78c4d9f04bbd14d 100644
--- a/Sniffs/Formatting/MultiLineAssignmentSniff.php
+++ b/DrupalCodingStandard/Sniffs/Formatting/MultiLineAssignmentSniff.php
@@ -14,7 +14,7 @@
*/
/**
- * Drupal_Sniffs_Formatting_MultiLineAssignmentSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_MultiLineAssignmentSniff.
*
* If an assignment goes over two lines, ensure the equal sign is indented.
*
@@ -26,7 +26,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Formatting_MultiLineAssignmentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Formatting_MultiLineAssignmentSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Formatting/SpaceAfterCastSniff.php b/DrupalCodingStandard/Sniffs/Formatting/SpaceAfterCastSniff.php
similarity index 87%
rename from Sniffs/Formatting/SpaceAfterCastSniff.php
rename to DrupalCodingStandard/Sniffs/Formatting/SpaceAfterCastSniff.php
index e25a523e274d70ea24098f60c130c3db6cd0bf5e..3eb957add3f3b7aed82bdc0946f45f5cf7362d88 100644
--- a/Sniffs/Formatting/SpaceAfterCastSniff.php
+++ b/DrupalCodingStandard/Sniffs/Formatting/SpaceAfterCastSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Formatting_SpaceAfterCastSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceAfterCastSniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Formatting_SpaceAfterCastSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceAfterCastSniff.
*
* Ensures there is a single space after cast tokens.
*
@@ -21,7 +21,7 @@
* @version Release: 1.2.2
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Formatting_SpaceAfterCastSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Formatting_SpaceAfterCastSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Formatting/SpaceOperatorSniff.php b/DrupalCodingStandard/Sniffs/Formatting/SpaceOperatorSniff.php
similarity index 89%
rename from Sniffs/Formatting/SpaceOperatorSniff.php
rename to DrupalCodingStandard/Sniffs/Formatting/SpaceOperatorSniff.php
index 1ec7e5b4ce2853711dc2a69a3ae4cdf13f1078d1..7fc742f19672b60996a33c2893e6b32b99acb0b1 100644
--- a/Sniffs/Formatting/SpaceOperatorSniff.php
+++ b/DrupalCodingStandard/Sniffs/Formatting/SpaceOperatorSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Formatting_SpaceOperatorSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceOperatorSniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Formatting_SpaceOperatorSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceOperatorSniff.
*
* Ensures there is a single space after a operator
*
@@ -21,7 +21,7 @@
* @version Release: 1.2.2
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Formatting_SpaceOperatorSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Formatting_SpaceOperatorSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Formatting/SpaceUnaryOperatorSniff.php b/DrupalCodingStandard/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
similarity index 88%
rename from Sniffs/Formatting/SpaceUnaryOperatorSniff.php
rename to DrupalCodingStandard/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
index 482a2b85e988793d0085691aa2eb7e9f0fabc417..2ad4b59b3643aa699ea67ac595df719828528089 100644
--- a/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
+++ b/DrupalCodingStandard/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Formatting_SpaceUnaryOperatorSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceUnaryOperatorSniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Formatting_SpaceUnaryOperatorSniff.
+ * DrupalCodingStandard_Sniffs_Formatting_SpaceUnaryOperatorSniff.
*
* Ensures there are no spaces on increment / decrement statements.
*
@@ -21,7 +21,7 @@
* @version Release: 1.2.2
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Formatting_SpaceUnaryOperatorSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Formatting_SpaceUnaryOperatorSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/DrupalCodingStandard/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
similarity index 96%
rename from Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
rename to DrupalCodingStandard/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
index a109203b94700f616c9e9e8edc84d19c0a3799b8..c833f8425c4cd150bfea287351a5a0bd8b583193 100644
--- a/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
+++ b/DrupalCodingStandard/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Functions_FunctionCallArgumentSpacingSniff.
+ * DrupalCodingStandard_Sniffs_Functions_FunctionCallArgumentSpacingSniff.
*
* PHP version 5
*
@@ -28,7 +28,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Functions_FunctionCallArgumentSpacingSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Functions_FunctionCallArgumentSpacingSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Functions/FunctionCallSignatureSniff.php b/DrupalCodingStandard/Sniffs/Functions/FunctionCallSignatureSniff.php
similarity index 98%
rename from Sniffs/Functions/FunctionCallSignatureSniff.php
rename to DrupalCodingStandard/Sniffs/Functions/FunctionCallSignatureSniff.php
index 5c9d62569634b242e1eb83b969659b8f1556b245..d24a44092284eaeabc8678aceb8d821f8ed96ce2 100644
--- a/Sniffs/Functions/FunctionCallSignatureSniff.php
+++ b/DrupalCodingStandard/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Functions_FunctionCallSignatureSniff.
+ * DrupalCodingStandard_Sniffs_Functions_FunctionCallSignatureSniff.
*
* PHP version 5
*
@@ -26,7 +26,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Functions_FunctionCallSignatureSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Functions_FunctionCallSignatureSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Functions/FunctionDeclarationSniff.php b/DrupalCodingStandard/Sniffs/Functions/FunctionDeclarationSniff.php
similarity index 97%
rename from Sniffs/Functions/FunctionDeclarationSniff.php
rename to DrupalCodingStandard/Sniffs/Functions/FunctionDeclarationSniff.php
index c81d97a05ea7a83334ad5052e52aa8bd1a63f929..194469c94cbb9aa89e30522df69108c39e126d40 100644
--- a/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/DrupalCodingStandard/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Functions_FunctionDeclarationSniff.
+ * DrupalCodingStandard_Sniffs_Functions_FunctionDeclarationSniff.
*
* PHP version 5
*
@@ -26,7 +26,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Functions_FunctionDeclarationSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Functions_FunctionDeclarationSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/Functions/ValidDefaultValueSniff.php b/DrupalCodingStandard/Sniffs/Functions/ValidDefaultValueSniff.php
similarity index 95%
rename from Sniffs/Functions/ValidDefaultValueSniff.php
rename to DrupalCodingStandard/Sniffs/Functions/ValidDefaultValueSniff.php
index 528362ed5897cdc1b29100e425d6107221216da8..89f686d96daf1d79fe0361cc73df2a19c90a7b0f 100644
--- a/Sniffs/Functions/ValidDefaultValueSniff.php
+++ b/DrupalCodingStandard/Sniffs/Functions/ValidDefaultValueSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Functions_ValidDefaultValueSniff.
+ * DrupalCodingStandard_Sniffs_Functions_ValidDefaultValueSniff.
*
* PHP version 5
*
@@ -29,7 +29,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Functions_ValidDefaultValueSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Functions_ValidDefaultValueSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/NamingConventions/ValidClassNameSniff.php b/DrupalCodingStandard/Sniffs/NamingConventions/ValidClassNameSniff.php
similarity index 93%
rename from Sniffs/NamingConventions/ValidClassNameSniff.php
rename to DrupalCodingStandard/Sniffs/NamingConventions/ValidClassNameSniff.php
index ce952e92b6a3d13bb66f4b29ff459b20414920df..4ee5dfa386ef1cf6f709eb9e3b608483c375756b 100644
--- a/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/DrupalCodingStandard/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_NamingConventions_ValidClassNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidClassNameSniff.
*
* PHP version 5
*
@@ -15,7 +15,7 @@
*/
/**
- * Drupal_Sniffs_NamingConventions_ValidClassNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidClassNameSniff.
*
* Ensures class and interface names start with a capital letter
* and use _ separators.
@@ -29,7 +29,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_NamingConventions_ValidClassNameSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_NamingConventions_ValidClassNameSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/DrupalCodingStandard/Sniffs/NamingConventions/ValidFunctionNameSniff.php
similarity index 97%
rename from Sniffs/NamingConventions/ValidFunctionNameSniff.php
rename to DrupalCodingStandard/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 2a21dfb479ae05e8ea9c607bdf181970e959d916..de4e1b704216a92618387c8ecdb026540d2dbdfa 100644
--- a/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/DrupalCodingStandard/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_NamingConventions_ValidFunctionNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidFunctionNameSniff.
*
* PHP version 5
*
@@ -20,7 +20,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false
}
/**
- * Drupal_Sniffs_NamingConventions_ValidFunctionNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidFunctionNameSniff.
*
* Ensures method names are correct depending on whether they are public
* or private, and that functions are named correctly.
@@ -35,7 +35,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_NamingConventions_ValidFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
+class DrupalCodingStandard_Sniffs_NamingConventions_ValidFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
{
/**
diff --git a/Sniffs/NamingConventions/ValidVariableNameSniff.php b/DrupalCodingStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php
similarity index 96%
rename from Sniffs/NamingConventions/ValidVariableNameSniff.php
rename to DrupalCodingStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php
index a0ffba51ca46cdbb17dcbd181283bc6536052b81..10639a511bed0d9d23c28853e67463a920a12d57 100644
--- a/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/DrupalCodingStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_NamingConventions_ValidVariableNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidVariableNameSniff.
*
* PHP version 5
*
@@ -20,7 +20,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractVariableSniff', true) === fa
}
/**
- * Drupal_Sniffs_NamingConventions_ValidVariableNameSniff.
+ * DrupalCodingStandard_Sniffs_NamingConventions_ValidVariableNameSniff.
*
* Checks the naming of member variables.
*
@@ -33,7 +33,7 @@ if (class_exists('PHP_CodeSniffer_Standards_AbstractVariableSniff', true) === fa
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_NamingConventions_ValidVariableNameSniff
+class DrupalCodingStandard_Sniffs_NamingConventions_ValidVariableNameSniff
extends PHP_CodeSniffer_Standards_AbstractVariableSniff
{
diff --git a/Sniffs/Strings/ConcatenationSpacingSniff.php b/DrupalCodingStandard/Sniffs/Strings/ConcatenationSpacingSniff.php
similarity index 92%
rename from Sniffs/Strings/ConcatenationSpacingSniff.php
rename to DrupalCodingStandard/Sniffs/Strings/ConcatenationSpacingSniff.php
index 319067ec93ddbd64b99c0c1df181bc9b65f73873..949f103883b68fccf6ff247e257f91ddc7b683a2 100644
--- a/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ b/DrupalCodingStandard/Sniffs/Strings/ConcatenationSpacingSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Strings_ConcatenationSpacingSniff.
+ * DrupalCodingStandard_Sniffs_Strings_ConcatenationSpacingSniff.
*
* PHP version 5
*
@@ -11,7 +11,7 @@
*/
/**
- * Drupal_Sniffs_Strings_ConcatenationSpacingSniff.
+ * DrupalCodingStandard_Sniffs_Strings_ConcatenationSpacingSniff.
*
* Makes sure there are the needed spaces between the concatenation operator (.) and
* the strings being concatenated.
@@ -21,7 +21,7 @@
* @author Peter Philipp <peter.philipp@cando-image.com>
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_Strings_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_Strings_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php b/DrupalCodingStandard/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
similarity index 95%
rename from Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
rename to DrupalCodingStandard/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
index 2401335099ea78271a94bbcb06eb8bc316aae8f3..68378bbfadfd988dcb69d9afcff39efe3214d82e 100644
--- a/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
+++ b/DrupalCodingStandard/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_WhiteSpace_ObjectOperatorIndentSniff.
+ * DrupalCodingStandard_Sniffs_WhiteSpace_ObjectOperatorIndentSniff.
*
* PHP version 5
*
@@ -14,7 +14,7 @@
*/
/**
- * Drupal_Sniffs_WhiteSpace_ObjectOperatorIndentSniff.
+ * DrupalCodingStandard_Sniffs_WhiteSpace_ObjectOperatorIndentSniff.
*
* Checks that object operators are indented 2 spaces if they are the first
* thing on a line.
@@ -27,7 +27,7 @@
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_WhiteSpace_ObjectOperatorIndentSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_WhiteSpace_ObjectOperatorIndentSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/DrupalCodingStandard/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
similarity index 95%
rename from Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
rename to DrupalCodingStandard/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index a4a0190478111c18134e541603b8c020288a920a..72bccae4d083dc1f79178d9560792cc2386c4860 100644
--- a/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/DrupalCodingStandard/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Whitespace_ScopeClosingBraceSniff.
+ * DrupalCodingStandard_Sniffs_Whitespace_ScopeClosingBraceSniff.
*
* PHP version 5
*
@@ -15,7 +15,7 @@
*/
/**
- * Drupal_Sniffs_Whitespace_ScopeClosingBraceSniff.
+ * DrupalCodingStandard_Sniffs_Whitespace_ScopeClosingBraceSniff.
*
* Checks that the closing braces of scopes are aligned correctly.
*
@@ -28,7 +28,7 @@
* @version Release: 1.2.2
* @link http://Drupal.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_WhiteSpace_ScopeClosingBraceSniff implements PHP_CodeSniffer_Sniff
+class DrupalCodingStandard_Sniffs_WhiteSpace_ScopeClosingBraceSniff implements PHP_CodeSniffer_Sniff
{
diff --git a/Sniffs/WhiteSpace/ScopeIndentSniff.php b/DrupalCodingStandard/Sniffs/WhiteSpace/ScopeIndentSniff.php
similarity index 87%
rename from Sniffs/WhiteSpace/ScopeIndentSniff.php
rename to DrupalCodingStandard/Sniffs/WhiteSpace/ScopeIndentSniff.php
index efb007c684e4bc9c988fcf549b1ca95981c45094..2bc59464c5c7f969f7b7eb4b23e9fdc84ecbd3df 100644
--- a/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/DrupalCodingStandard/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -1,6 +1,6 @@
<?php
/**
- * Drupal_Sniffs_Whitespace_ScopeIndentSniff.
+ * DrupalCodingStandard_Sniffs_Whitespace_ScopeIndentSniff.
*
* PHP version 5
*
@@ -20,7 +20,7 @@ if (class_exists('Generic_Sniffs_WhiteSpace_ScopeIndentSniff', true) === false)
}
/**
- * Drupal_Sniffs_Whitespace_ScopeIndentSniff.
+ * DrupalCodingStandard_Sniffs_Whitespace_ScopeIndentSniff.
*
* Checks that control structures are structured correctly, and their content
* is indented correctly.
@@ -34,7 +34,7 @@ if (class_exists('Generic_Sniffs_WhiteSpace_ScopeIndentSniff', true) === false)
* @version Release: 1.2.0RC3
* @link http://pear.php.net/package/PHP_CodeSniffer
*/
-class Drupal_Sniffs_WhiteSpace_ScopeIndentSniff extends Generic_Sniffs_WhiteSpace_ScopeIndentSniff
+class DrupalCodingStandard_Sniffs_WhiteSpace_ScopeIndentSniff extends Generic_Sniffs_WhiteSpace_ScopeIndentSniff
{
/**
diff --git a/DrupalCodingStandard/ruleset.xml b/DrupalCodingStandard/ruleset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c4672f9645b45b809a6dfe3357a53d59c069237
--- /dev/null
+++ b/DrupalCodingStandard/ruleset.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- See http://pear.php.net/manual/en/package.php.php-codesniffer.annotated-ruleset.php -->
+<ruleset name="DrupalCodingStandard">
+
+ <description>Drupal coding standard</description>
+
+ <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
+ <rule ref="Generic.PHP.UpperCaseConstant" />
+ <rule ref="Generic.PHP.DisallowShortOpenTag" />
+ <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
+ <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie" />
+ <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
+ <rule ref="Generic.Formatting.SpaceAfterCast" />
+ <rule ref="Generic.PHP.NoSilencedErrors" />
+ <rule ref="MySource.Debug.DebugCode" />
+</ruleset>
\ No newline at end of file
diff --git a/README.txt b/README.txt
index 7feb33e4bd92938c2d90fe37f26d211eb03422fc..6004fe872db3b4cd5d734050e35a53a73bbac3bd 100644
--- a/README.txt
+++ b/README.txt
@@ -11,11 +11,11 @@ Installation:
- Install PTI Plugin
- Configure PTI:
- Open Eclipse preferences -> PHP Tools -> PHP Codesniffer:
- - Add a new "CodeSniffer Standard" - choose this library
+ - Add a new "CodeSniffer Standard" - choose the folder DrupalCodingStandard in this module.
- Activate the library by checking the checkbox next to its name.
- Make sure the Standard Tab Widht configuration is set to 0. Otherwise you won't get notified about evil tabs in the code.
-
-Now you'll have a PHP Tools entry in the right click menu in the navigator.
+
+Now you'll have a PHP Tools entry in the right click menu in the navigator.
Or you can just hit "Validate" within the right click menu of a file.
Recommendation:
diff --git a/drupal_coding_standards_validator_for_eclipse.info b/drupal_coding_standards_validator_for_eclipse.info
new file mode 100644
index 0000000000000000000000000000000000000000..719df28db87cc6254c6f37b8fb278930f7014006
--- /dev/null
+++ b/drupal_coding_standards_validator_for_eclipse.info
@@ -0,0 +1 @@
+name = Drupal coding standards validator for Eclipse
\ No newline at end of file
diff --git a/ruleset.xml b/ruleset.xml
deleted file mode 100644
index 0e6d701d89352721f2891354eeef7233244b63c4..0000000000000000000000000000000000000000
--- a/ruleset.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Drupal">
- <description>Drupal coding standard</description>
- <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
- <rule ref="Generic.PHP.UpperCaseConstant" />
- <rule ref="Generic.PHP.DisallowShortOpenTag" />
- <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
- <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie" />
- <rule ref="Generic.WhiteSpace.DisallowTabIndent" />
- <rule ref="Generic.Formatting.SpaceAfterCast" />
- <rule ref="Generic.PHP.NoSilencedErrors" />
- <rule ref="MySource.Debug.DebugCode" />
-</ruleset>
\ No newline at end of file