Renamed whole namespace

gmazzap · gmazzap · commit c431219d65fe · 2018-02-23T17:04:18.000+01:00
BC break. My bad. Sorry.
diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
@@ -13,7 +13,7 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard;
+namespace Inpsyde;
 
 use PHP_CodeSniffer\Exceptions\RuntimeException as CodeSnifferRuntimeException;
 use PHP_CodeSniffer\Files\File;
@@ -23,7 +23,7 @@
  * @package php-coding-standards
  * @license http://opensource.org/licenses/MIT MIT
  */
-class Helpers
+class PhpcsHelpers
 {
     const CODE_TO_TYPE_MAP = [
         T_CONST => 'Constant',
@@ -452,8 +452,8 @@ public static function countReturns(File $file, int $functionPosition): array
             }
 
             if (!$scopeClosers->count() && $tokens[$i]['code'] === T_RETURN) {
-                Helpers::isVoidReturn($file, $i) ? $voidReturnCount++ : $nonVoidReturnCount++;
-                Helpers::isNullReturn($file, $i) and $nullReturnCount++;
+                PhpcsHelpers::isVoidReturn($file, $i) ? $voidReturnCount++ : $nonVoidReturnCount++;
+                PhpcsHelpers::isNullReturn($file, $i) and $nullReturnCount++;
             }
         }
 
diff --git a/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
@@ -41,9 +41,9 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        if (Helpers::functionIsArrayAccess($file, $position)
-            || Helpers::isHookClosure($file, $position)
-            || Helpers::isHookFunction($file, $position)
+        if (PhpcsHelpers::functionIsArrayAccess($file, $position)
+            || PhpcsHelpers::isHookClosure($file, $position)
+            || PhpcsHelpers::isHookFunction($file, $position)
         ) {
             return;
         }
@@ -57,7 +57,7 @@ public function process(File $file, $position)
             return;
         }
 
-        $variables = Helpers::filterTokensByType($paramsStart, $paramsEnd, $file, T_VARIABLE);
+        $variables = PhpcsHelpers::filterTokensByType($paramsStart, $paramsEnd, $file, T_VARIABLE);
 
         foreach (array_keys($variables) as $varPosition) {
             $typePosition = $file->findPrevious(
diff --git a/Inpsyde/Sniffs/CodeQuality/AssignmentInsideConditionSniff.php b/Inpsyde/Sniffs/CodeQuality/AssignmentInsideConditionSniff.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
@@ -78,7 +78,7 @@ private function findAssignmentPositions(
         File $file
     ): array {
 
-        $assignmentTokens = Helpers::filterTokensByType(
+        $assignmentTokens = PhpcsHelpers::filterTokensByType(
             $ifOpenerPosition + 1,
             $ifCloserPosition - 1,
             $file,
@@ -123,7 +123,7 @@ private function isAssignmentWrapped(
             return false;
         }
 
-        $parenthesisInBetween = Helpers::filterTokensByType(
+        $parenthesisInBetween = PhpcsHelpers::filterTokensByType(
             $insideIfOpenParenthesisPosition + 1,
             $insideIfCloserParenthesisPosition - 1,
             $file,
diff --git a/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php b/Inpsyde/Sniffs/CodeQuality/DisallowShortOpenTagSniff.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
 use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP as Generic;
 
diff --git a/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -60,14 +60,14 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        $elementName = Helpers::tokenName($file, $position);
+        $elementName = PhpcsHelpers::tokenName($file, $position);
         $elementNameLength = mb_strlen($elementName);
 
         if ($this->shouldBeSkipped($elementNameLength, $elementName)) {
             return;
         }
 
-        $typeName = Helpers::tokenTypeName($file, $position);
+        $typeName = PhpcsHelpers::tokenTypeName($file, $position);
         $message = sprintf(
             '%s name "%s" is only %d chars long. Must be at least %d.',
             $typeName,
diff --git a/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php b/Inpsyde/Sniffs/CodeQuality/ForbiddenPublicPropertySniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
@@ -40,7 +40,7 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        if (!Helpers::variableIsProperty($file, $position)) {
+        if (!PhpcsHelpers::variableIsProperty($file, $position)) {
             return;
         }
 
diff --git a/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php
@@ -13,7 +13,7 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php b/Inpsyde/Sniffs/CodeQuality/HookClosureReturnSniff.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
@@ -29,18 +29,18 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        if (!Helpers::isHookClosure($file, $position)) {
+        if (!PhpcsHelpers::isHookClosure($file, $position)) {
             return;
         }
 
-        list($functionStart, $functionEnd) = Helpers::functionBoundaries($file, $position);
+        list($functionStart, $functionEnd) = PhpcsHelpers::functionBoundaries($file, $position);
         if (!$functionStart < 0 || $functionEnd <= 0) {
             return;
         }
 
-        list($nonVoidReturnCount, $voidReturnCount) = Helpers::countReturns($file, $position);
+        list($nonVoidReturnCount, $voidReturnCount) = PhpcsHelpers::countReturns($file, $position);
 
-        $isFilterClosure = Helpers::isHookClosure($file, $position, true, false);
+        $isFilterClosure = PhpcsHelpers::isHookClosure($file, $position, true, false);
 
         if ($isFilterClosure && (!$nonVoidReturnCount || $voidReturnCount)) {
             $file->addError(
diff --git a/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php b/Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php
@@ -13,7 +13,7 @@
  * released under BSD license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
@@ -22,7 +22,7 @@
  * Modified version of the `LineLengthSniff` from "Generic" standard that
  * ignores long lines when they contain string
  *
- * @package Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality
+ * @package Inpsyde\Sniffs\CodeQuality
  */
 class LineLengthSniff implements Sniff
 {
diff --git a/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php b/Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -49,7 +49,7 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        if ($this->skipForFunctions && !Helpers::functionIsMethod($file, $position)) {
+        if ($this->skipForFunctions && !PhpcsHelpers::functionIsMethod($file, $position)) {
             return;
         }
 
diff --git a/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php b/Inpsyde/Sniffs/CodeQuality/NoElseSniff.php
@@ -13,7 +13,7 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php b/Inpsyde/Sniffs/CodeQuality/NoTopLevelDefineSniff.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -38,7 +38,7 @@ public function process(File $file, $position)
 
         if (($token['content'] ?? '') !== 'define'
             || ($token['level'] ?? -1) !== 0
-            || !Helpers::isFunctionCall($file, $position)
+            || !PhpcsHelpers::isFunctionCall($file, $position)
         ) {
             return;
         }
diff --git a/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php b/Inpsyde/Sniffs/CodeQuality/PropertyPerClassLimitSniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -44,7 +44,7 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        $count = count(Helpers::classPropertiesTokenIndexes($file, $position));
+        $count = count(PhpcsHelpers::classPropertiesTokenIndexes($file, $position));
 
         if ($count > $this->maxCount) {
             $tokenType = $file->getTokens()[$position]['content'];
diff --git a/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php b/Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -94,7 +94,7 @@ private function checkNamespace(
         string $className
     ) {
 
-        list($namespacePos, $namespace) = Helpers::findNamespace($file, $position);
+        list($namespacePos, $namespace) = PhpcsHelpers::findNamespace($file, $position);
 
         $fullyQualifiedName = "{$namespace}\\{$className}";
         if (in_array($fullyQualifiedName, $this->exclude, true)) {
diff --git a/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php b/Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php
@@ -13,9 +13,9 @@
  * released under MIT license.
  */
 
-namespace Inpsyde\InpsydeCodingStandard\Sniffs\CodeQuality;
+namespace Inpsyde\Sniffs\CodeQuality;
 
-use Inpsyde\InpsydeCodingStandard\Helpers;
+use Inpsyde\PhpcsHelpers;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 use PHPCompatibility;
@@ -42,11 +42,11 @@ public function register()
      */
     public function process(File $file, $position)
     {
-        if (Helpers::functionIsArrayAccess($file, $position)) {
+        if (PhpcsHelpers::functionIsArrayAccess($file, $position)) {
             return;
         }
 
-        list($functionStart, $functionEnd) = Helpers::functionBoundaries($file, $position);
+        list($functionStart, $functionEnd) = PhpcsHelpers::functionBoundaries($file, $position);
         if (!$functionStart < 0 || $functionEnd <= 0) {
             return;
         }
@@ -56,7 +56,7 @@ public function process(File $file, $position)
             $position
         );
 
-        list($nonVoidReturnCount, $voidReturnCount, $nullReturnCount) = Helpers::countReturns(
+        list($nonVoidReturnCount, $voidReturnCount, $nullReturnCount) = PhpcsHelpers::countReturns(
             $file,
             $position
         );
@@ -114,7 +114,7 @@ private function maybeErrors(
             );
         }
 
-        if (Helpers::isHookClosure($file, $position) || Helpers::isHookFunction($file, $position)) {
+        if (PhpcsHelpers::isHookClosure($file, $position) || PhpcsHelpers::isHookFunction($file, $position)) {
             return;
         }
 
@@ -167,7 +167,7 @@ private function returnTypeInfo(File $file, int $functionPosition): array
      */
     private function hasReturnNullDocBloc(File $file, int $functionPosition): bool
     {
-        $return = Helpers::functionDocBlockTag('@return', $file, $functionPosition);
+        $return = PhpcsHelpers::functionDocBlockTag('@return', $file, $functionPosition);
         if (!$return) {
             return false;
         }
diff --git a/Inpsyde/ruleset.xml b/Inpsyde/ruleset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<ruleset name="Inpsyde Coding Standard" namespace="Inpsyde\InpsydeCodingStandard">
+<ruleset name="Inpsyde Coding Standard">
 
 	<description>PHP 7+ coding standards for Inpsyde WordPress projects.</description>
 
-    <autoload>./Helpers.php</autoload>
+    <autoload>./PhpcsHelpers.php</autoload>
     <autoload>./PHPCSAliases.php</autoload>
 
 	<!--
diff --git a/README.md b/README.md
diff --git a/docs/rules-list/custom.md b/docs/rules-list/custom.md
diff --git a/phpcs.xml b/phpcs.xml
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* released under MIT license.`
`14`	`14`	`*/`
`15`	`15`
`16`		`-namespace Inpsyde\InpsydeCodingStandard;`
	`16`	`+namespace Inpsyde;`
`17`	`17`
`18`	`18`	`use PHP_CodeSniffer\Exceptions\RuntimeException as CodeSnifferRuntimeException;`
`19`	`19`	`use PHP_CodeSniffer\Files\File;`
`@@ -23,7 +23,7 @@`
`23`	`23`	`* @package php-coding-standards`
`24`	`24`	`* @license http://opensource.org/licenses/MIT MIT`
`25`	`25`	`*/`
`26`		`-class Helpers`
	`26`	`+class PhpcsHelpers`
`27`	`27`	`{`
`28`	`28`	`const CODE_TO_TYPE_MAP = [`
`29`	`29`	`T_CONST => 'Constant',`
`@@ -452,8 +452,8 @@ public static function countReturns(File $file, int $functionPosition): array`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`if (!$scopeClosers->count() && $tokens[$i]['code'] === T_RETURN) {`
`455`		`- Helpers::isVoidReturn($file, $i) ? $voidReturnCount++ : $nonVoidReturnCount++;`
`456`		`- Helpers::isNullReturn($file, $i) and $nullReturnCount++;`
	`455`	`+ PhpcsHelpers::isVoidReturn($file, $i) ? $voidReturnCount++ : $nonVoidReturnCount++;`
	`456`	`+ PhpcsHelpers::isNullReturn($file, $i) and $nullReturnCount++;`
`457`	`457`	`}`
`458`	`458`	`}`
`459`	`459`