IN-1729 - Autofix code style errors

vladimir-flyeralarm · vladimir-flyeralarm · commit 1e781bdb5339 · 2023-03-23T14:13:44.000+01:00
diff --git a/custom-standards/Flyeralarm/Sniffs/Classes/FullyQualifiedSniff.php b/custom-standards/Flyeralarm/Sniffs/Classes/FullyQualifiedSniff.php
@@ -13,7 +13,7 @@ class FullyQualifiedSniff implements Sniff
      */
     public function register()
     {
-        return array(T_DOUBLE_COLON, T_NEW, T_EXTENDS, T_IMPLEMENTS);
+        return [T_DOUBLE_COLON, T_NEW, T_EXTENDS, T_IMPLEMENTS];
     }
 
     /**
diff --git a/custom-standards/Flyeralarm/Sniffs/ControlStructures/YodaSniff.php b/custom-standards/Flyeralarm/Sniffs/ControlStructures/YodaSniff.php
@@ -12,7 +12,7 @@ class YodaSniff implements Sniff
      */
     public function register()
     {
-        return array(T_IF, T_ELSEIF, T_WHILE);
+        return [T_IF, T_ELSEIF, T_WHILE];
     }
 
     /**
@@ -87,21 +87,25 @@ private function checkConditionalOrderForArithmeticExpression(
 
         // e.g. if ($foo = true)
         // e.g. if ($foo = 'bar')
-        if (in_array($leftOperandTokenId, $functionAndVariableTokenIds)
+        if (
+            in_array($leftOperandTokenId, $functionAndVariableTokenIds)
             && in_array($rightOperandTokenId, $languageTypeTokenIds)
         ) {
             return;
         }
         // e.g. if (count(..) > $test)
         // e.g. if ($foo == $bar)
-        if (in_array($leftOperandTokenId, $functionAndVariableTokenIds)
+        if (
+            in_array($leftOperandTokenId, $functionAndVariableTokenIds)
             && in_array($rightOperandTokenId, $functionAndVariableTokenIds)
         ) {
             return;
         }
         // e.g. if ('foo' == 'bar')
-        if (in_array($leftOperandTokenId, $languageTypeTokenIds)
-            && in_array($rightOperandTokenId, $languageTypeTokenIds)) {
+        if (
+            in_array($leftOperandTokenId, $languageTypeTokenIds)
+            && in_array($rightOperandTokenId, $languageTypeTokenIds)
+        ) {
             return;
         }
 
diff --git a/custom-standards/Flyeralarm/Sniffs/Docblock/ExpectedExceptionMessageSniff.php b/custom-standards/Flyeralarm/Sniffs/Docblock/ExpectedExceptionMessageSniff.php
@@ -12,7 +12,7 @@ class ExpectedExceptionMessageSniff implements Sniff
      */
     public function register()
     {
-        return array(T_DOC_COMMENT_OPEN_TAG);
+        return [T_DOC_COMMENT_OPEN_TAG];
     }
 
     /**
@@ -25,8 +25,10 @@ public function process(File $phpcsFile, $stackPtr)
         if (!$this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedException')) {
             return;
         }
-        if ($this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessage')
-            || $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessageRegExp')) {
+        if (
+            $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessage')
+            || $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessageRegExp')
+        ) {
             return;
         }
 
diff --git a/custom-standards/Flyeralarm/Sniffs/File/ExceptionMessageSniff.php b/custom-standards/Flyeralarm/Sniffs/File/ExceptionMessageSniff.php
@@ -12,7 +12,7 @@ class ExceptionMessageSniff implements Sniff
      */
     public function register()
     {
-        return array(T_CLASS);
+        return [T_CLASS];
     }
 
     /**
@@ -31,7 +31,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $tokens = $phpcsFile->getTokens();
         $ptr = -1;
-        while($ptr = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, $ptr + 1)) {
+        while ($ptr = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, $ptr + 1)) {
             if (strpos($tokens[$ptr]['content'], '!') !== false) {
                 $phpcsFile->addError(
                     'Exclamationmarks are not allowed in Exceptionmessages',
diff --git a/custom-standards/Flyeralarm/Sniffs/File/ForbiddenKeywordsSniff.php b/custom-standards/Flyeralarm/Sniffs/File/ForbiddenKeywordsSniff.php
@@ -12,7 +12,7 @@ class ForbiddenKeywordsSniff implements Sniff
      */
     public function register()
     {
-        return array(T_CLASS, T_ABSTRACT, T_TRAIT);
+        return [T_CLASS, T_ABSTRACT, T_TRAIT];
     }
 
     /**
diff --git a/custom-standards/Flyeralarm/Sniffs/File/NamespacesSniff.php b/custom-standards/Flyeralarm/Sniffs/File/NamespacesSniff.php
@@ -12,7 +12,7 @@ class NamespacesSniff implements Sniff
      */
     public function register()
     {
-        return array(T_CLASS, T_ABSTRACT, T_TRAIT, T_INTERFACE);
+        return [T_CLASS, T_ABSTRACT, T_TRAIT, T_INTERFACE];
     }
 
     /**
@@ -24,7 +24,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $ptr = -1;
-        while($ptr = $phpcsFile->findNext(T_NS_SEPARATOR, $ptr + 1)) {
+        while ($ptr = $phpcsFile->findNext(T_NS_SEPARATOR, $ptr + 1)) {
             if (strpos($tokens[$ptr + 1]['content'], '_') !== false) {
                 $phpcsFile->addError(
                     'Using underscore within namespaces is discouraged',
diff --git a/custom-standards/Flyeralarm/Sniffs/File/NoClassKindSuffixSniff.php b/custom-standards/Flyeralarm/Sniffs/File/NoClassKindSuffixSniff.php
@@ -12,7 +12,7 @@ class NoClassKindSuffixSniff implements Sniff
      */
     public function register()
     {
-        return array(T_INTERFACE, T_CLASS, T_TRAIT);
+        return [T_INTERFACE, T_CLASS, T_TRAIT];
     }
 
     /**
diff --git a/custom-standards/Flyeralarm/Sniffs/Variable/LowerCamelCaseSniff.php b/custom-standards/Flyeralarm/Sniffs/Variable/LowerCamelCaseSniff.php
@@ -28,7 +28,7 @@ class LowerCamelCaseSniff implements Sniff
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return [T_OPEN_TAG];
     }
 
     /**
diff --git a/tests/rules/array/allowed/ShortArraySyntax.php b/tests/rules/array/allowed/ShortArraySyntax.php
@@ -1,4 +1,5 @@
 <?php
+
 // @expectedPass
 
 $array = [];
diff --git a/tests/rules/classes/allowed/LowercaseNamespaceCapitalization.php b/tests/rules/classes/allowed/LowercaseNamespaceCapitalization.php
@@ -6,5 +6,4 @@
 
 class LowercaseNamespaceCapitalization
 {
-
 }
diff --git a/tests/rules/doc/allowed/ReturnTypeResource.php b/tests/rules/doc/allowed/ReturnTypeResource.php
@@ -6,7 +6,6 @@
 
 class FooTest
 {
-
     /**
      * @return resource
      */
diff --git a/tests/rules/variables/allowed/SuperGlobals.php b/tests/rules/variables/allowed/SuperGlobals.php
@@ -2,12 +2,12 @@
 
 // @expectedPass
 
-$GLOBALS=true;
-$_SERVER=true;
-$_GET=true;
-$_POST=true;
-$_FILES=true;
-$_COOKIE=true;
-$_SESSION=true;
-$_REQUEST=true;
-$_ENV=true;
+$GLOBALS = true;
+$_SERVER = true;
+$_GET = true;
+$_POST = true;
+$_FILES = true;
+$_COOKIE = true;
+$_SESSION = true;
+$_REQUEST = true;
+$_ENV = true;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class FullyQualifiedSniff implements Sniff`
`13`	`13`	`*/`
`14`	`14`	`public function register()`
`15`	`15`	`{`
`16`		`- return array(T_DOUBLE_COLON, T_NEW, T_EXTENDS, T_IMPLEMENTS);`
	`16`	`+ return [T_DOUBLE_COLON, T_NEW, T_EXTENDS, T_IMPLEMENTS];`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class ExpectedExceptionMessageSniff implements Sniff`
`12`	`12`	`*/`
`13`	`13`	`public function register()`
`14`	`14`	`{`
`15`		`- return array(T_DOC_COMMENT_OPEN_TAG);`
	`15`	`+ return [T_DOC_COMMENT_OPEN_TAG];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`@@ -25,8 +25,10 @@ public function process(File $phpcsFile, $stackPtr)`
`25`	`25`	`if (!$this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedException')) {`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`		`- if ($this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessage')`
`29`		`- \|\| $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessageRegExp')) {`
	`28`	`+ if (`
	`29`	`+ $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessage')`
	`30`	`+ \|\| $this->hasAnnotationInDoc($phpcsFile, $stackPtr, '@expectedExceptionMessageRegExp')`
	`31`	`+ ) {`
`30`	`32`	`return;`
`31`	`33`	`}`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class ForbiddenKeywordsSniff implements Sniff`
`12`	`12`	`*/`
`13`	`13`	`public function register()`
`14`	`14`	`{`
`15`		`- return array(T_CLASS, T_ABSTRACT, T_TRAIT);`
	`15`	`+ return [T_CLASS, T_ABSTRACT, T_TRAIT];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class NamespacesSniff implements Sniff`
`12`	`12`	`*/`
`13`	`13`	`public function register()`
`14`	`14`	`{`
`15`		`- return array(T_CLASS, T_ABSTRACT, T_TRAIT, T_INTERFACE);`
	`15`	`+ return [T_CLASS, T_ABSTRACT, T_TRAIT, T_INTERFACE];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`@@ -24,7 +24,7 @@ public function process(File $phpcsFile, $stackPtr)`
`24`	`24`	`{`
`25`	`25`	`$tokens = $phpcsFile->getTokens();`
`26`	`26`	`$ptr = -1;`
`27`		`- while($ptr = $phpcsFile->findNext(T_NS_SEPARATOR, $ptr + 1)) {`
	`27`	`+ while ($ptr = $phpcsFile->findNext(T_NS_SEPARATOR, $ptr + 1)) {`
`28`	`28`	`if (strpos($tokens[$ptr + 1]['content'], '_') !== false) {`
`29`	`29`	`$phpcsFile->addError(`
`30`	`30`	`'Using underscore within namespaces is discouraged',`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class NoClassKindSuffixSniff implements Sniff`
`12`	`12`	`*/`
`13`	`13`	`public function register()`
`14`	`14`	`{`
`15`		`- return array(T_INTERFACE, T_CLASS, T_TRAIT);`
	`15`	`+ return [T_INTERFACE, T_CLASS, T_TRAIT];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class LowerCamelCaseSniff implements Sniff`
`28`	`28`	`*/`
`29`	`29`	`public function register()`
`30`	`30`	`{`
`31`		`- return array(T_OPEN_TAG);`
	`31`	`+ return [T_OPEN_TAG];`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 <?php
++
 // @expectedPass
 $array = [];
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,4 @@`
`6`	`6`
`7`	`7`	`class LowercaseNamespaceCapitalization`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`}`