From 6b82ce93260876bd86e61047fbcee93db684b9dd Mon Sep 17 00:00:00 2001
From: Peter Philipp <peter.philipp@cando-image.com>
Date: Mon, 29 Aug 2011 22:43:29 +0200
Subject: [PATCH] Moved files into a new subdirectory. That way the sniffs
don't depend on the name where the module is actually extracted. README.txt
Install instructions changed to describe how to use the new subdirectory.
---
.../Docs}/Files/IncludingFileStandard.xml | 0
.../Docs}/Files/LineLengthStandard.xml | 0
.../FunctionCallArgumentSpacingStandard.xml | 0
.../Functions/FunctionCallSignatureStandard.xml | 0
.../Functions/ValidDefaultValueStandard.xml | 0
.../NamingConventions/ValidClassNameStandard.xml | 0
.../ValidFunctionNameStandard.xml | 0
.../DrupalCodingStandard.php | 0
.../Sniffs}/Array/ArraySniff.php | 6 +++---
.../Sniffs}/Classes/ClassCreateInstanceSniff.php | 2 +-
.../Sniffs}/Classes/ClassDeclarationSniff.php | 2 +-
.../Sniffs}/Commenting/ClassCommentSniff.php | 2 +-
.../Sniffs}/Commenting/FileCommentSniff.php | 2 +-
.../Sniffs}/Commenting/FunctionCommentSniff.php | 2 +-
.../Sniffs}/Commenting/InlineCommentSniff.php | 2 +-
.../ControlStructures/ControlSignatureSniff.php | 2 +-
.../Sniffs}/ControlStructures/ElseIfSniff.php | 2 +-
.../InlineControlStructureSniff.php | 2 +-
.../MultiLineConditionSniff.php | 2 +-
.../Sniffs}/Files/IncludingFileSniff.php | 2 +-
.../Sniffs}/Files/LineEndingsSniff.php | 6 +++---
.../Sniffs}/Files/LineLengthSniff.php | 6 +++---
.../Sniffs}/Formatting/ItemAssignmentSniff.php | 6 +++---
.../Formatting/MultiLineAssignmentSniff.php | 4 ++--
.../Sniffs}/Formatting/SpaceAfterCastSniff.php | 6 +++---
.../Sniffs}/Formatting/SpaceOperatorSniff.php | 6 +++---
.../Formatting/SpaceUnaryOperatorSniff.php | 6 +++---
.../FunctionCallArgumentSpacingSniff.php | 4 ++--
.../Functions/FunctionCallSignatureSniff.php | 4 ++--
.../Functions/FunctionDeclarationSniff.php | 4 ++--
.../Sniffs}/Functions/ValidDefaultValueSniff.php | 4 ++--
.../NamingConventions/ValidClassNameSniff.php | 6 +++---
.../NamingConventions/ValidFunctionNameSniff.php | 6 +++---
.../NamingConventions/ValidVariableNameSniff.php | 6 +++---
.../Strings/ConcatenationSpacingSniff.php | 6 +++---
.../WhiteSpace/ObjectOperatorIndentSniff.php | 6 +++---
.../WhiteSpace/ScopeClosingBraceSniff.php | 6 +++---
.../Sniffs}/WhiteSpace/ScopeIndentSniff.php | 6 +++---
DrupalCodingStandard/ruleset.xml | 16 ++++++++++++++++
README.txt | 6 +++---
...l_coding_standards_validator_for_eclipse.info | 1 +
ruleset.xml | 13 -------------
42 files changed, 83 insertions(+), 79 deletions(-)
rename {Docs => DrupalCodingStandard/Docs}/Files/IncludingFileStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/Files/LineLengthStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/Functions/FunctionCallArgumentSpacingStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/Functions/FunctionCallSignatureStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/Functions/ValidDefaultValueStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/NamingConventions/ValidClassNameStandard.xml (100%)
rename {Docs => DrupalCodingStandard/Docs}/NamingConventions/ValidFunctionNameStandard.xml (100%)
rename DrupalCodingStandard.php => DrupalCodingStandard/DrupalCodingStandard.php (100%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Array/ArraySniff.php (93%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Classes/ClassCreateInstanceSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Classes/ClassDeclarationSniff.php (97%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Commenting/ClassCommentSniff.php (98%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Commenting/FileCommentSniff.php (99%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Commenting/FunctionCommentSniff.php (99%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Commenting/InlineCommentSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/ControlStructures/ControlSignatureSniff.php (93%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/ControlStructures/ElseIfSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/ControlStructures/InlineControlStructureSniff.php (90%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/ControlStructures/MultiLineConditionSniff.php (98%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Files/IncludingFileSniff.php (98%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Files/LineEndingsSniff.php (84%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Files/LineLengthSniff.php (91%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Formatting/ItemAssignmentSniff.php (93%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Formatting/MultiLineAssignmentSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Formatting/SpaceAfterCastSniff.php (87%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Formatting/SpaceOperatorSniff.php (89%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Formatting/SpaceUnaryOperatorSniff.php (88%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Functions/FunctionCallArgumentSpacingSniff.php (96%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Functions/FunctionCallSignatureSniff.php (98%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Functions/FunctionDeclarationSniff.php (97%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Functions/ValidDefaultValueSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/NamingConventions/ValidClassNameSniff.php (93%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/NamingConventions/ValidFunctionNameSniff.php (97%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/NamingConventions/ValidVariableNameSniff.php (96%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/Strings/ConcatenationSpacingSniff.php (92%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/WhiteSpace/ObjectOperatorIndentSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/WhiteSpace/ScopeClosingBraceSniff.php (95%)
rename {Sniffs => DrupalCodingStandard/Sniffs}/WhiteSpace/ScopeIndentSniff.php (87%)
create mode 100644 DrupalCodingStandard/ruleset.xml
create mode 100644 drupal_coding_standards_validator_for_eclipse.info
delete mode 100644 ruleset.xml
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 bc63e321..eab95910 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 35f0de24..78897626 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 334cd542..e3d6381e 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 5a02964e..84cfe1ed 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 9c2c6be1..bef1d544 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 e3bb7bd6..442b1e67 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 be13888e..e90d68d0 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 e7861382..709c75f8 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 b1797a65..62b0a960 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 ec397160..1e2641c8 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 f8bc40c3..e20e3b9c 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 dde287fa..f56ba591 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 8226844b..460be6b5 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 496ca04a..cae2b2c4 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 1a6a8a2c..81ec44be 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 7a5e19d8..acb6c608 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 e25a523e..3eb957ad 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 1ec7e5b4..7fc742f1 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 482a2b85..2ad4b59b 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 a109203b..c833f842 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 5c9d6256..d24a4409 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 c81d97a0..194469c9 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 528362ed..89f686d9 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 ce952e92..4ee5dfa3 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 2a21dfb4..de4e1b70 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 a0ffba51..10639a51 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 319067ec..949f1038 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 24013350..68378bbf 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 a4a01904..72bccae4 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 efb007c6..2bc59464 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 00000000..9c4672f9
--- /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 7feb33e4..6004fe87 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 00000000..719df28d
--- /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 0e6d701d..00000000
--- 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
--
GitLab