Adopt CS

Author: Majkl578

lib/Doctrine/Sniffs/Spacing/ControlStructureSniff.php

@@ -1,21 +1,4 @@
 <?php
-/*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* This software consists of voluntary contributions made by many individuals
-* and is licensed under the MIT license. For more information, see
-* <http://www.doctrine-project.org>.
-*/
 
 declare(strict_types=1);
 
@@ -39,9 +22,9 @@ final class ControlStructureSniff implements Sniff
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return int[]
      */
-    public function register()
+    public function register() : array
     {
         return [
             \T_IF,
@@ -57,7 +40,11 @@ public function register()
         ];
     }
 
-    public function process(File $phpcsFile, $stackPtr)
+    /**
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+     * @param int $stackPtr
+     */
+    public function process(File $phpcsFile, $stackPtr) : void
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -72,6 +59,9 @@ public function process(File $phpcsFile, $stackPtr)
         $this->validateParenthesisCloser($phpcsFile, $tokens, $stackPtr, $openerPosition, $closerPosition);
     }
 
+    /**
+     * @param mixed[] $tokens
+     */
     private function validateParenthesisOpener(File $file, array $tokens, int $position, int $openerPosition) : void
     {
         $nextTokenPosition = $openerPosition + 1;
@@ -100,6 +90,9 @@ private function validateParenthesisOpener(File $file, array $tokens, int $posit
         $file->fixer->replaceToken($nextTokenPosition, '');
     }
 
+    /**
+     * @param mixed[][] $tokens
+     */
     private function validateParenthesisCloser(
         File $file,
         array $tokens,

lib/Doctrine/Sniffs/Spacing/EnsureSpaces.php

@@ -1,21 +1,4 @@
 <?php
-/*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* This software consists of voluntary contributions made by many individuals
-* and is licensed under the MIT license. For more information, see
-* <http://www.doctrine-project.org>.
-*/
 
 declare(strict_types=1);
 
@@ -25,6 +8,9 @@
 
 trait EnsureSpaces
 {
+    /**
+     * @param mixed[][] $tokens
+     */
     protected function ensureSpaceBefore(File $file, array $tokens, int $position, string $message) : void
     {
         $spacing = $this->numberOfSpaces($tokens, $position - 1);
@@ -45,6 +31,9 @@ protected function ensureSpaceBefore(File $file, array $tokens, int $position, s
         $file->fixer->replaceToken($position - 1, ' ');
     }
 
+    /**
+     * @param mixed[][] $tokens
+     */
     protected function ensureSpaceAfter(File $file, array $tokens, int $position, string $message) : void
     {
         $spacing = $this->numberOfSpaces($tokens, $position + 1);
@@ -65,6 +54,9 @@ protected function ensureSpaceAfter(File $file, array $tokens, int $position, st
         $file->fixer->replaceToken($position + 1, ' ');
     }
 
+    /**
+     * @param mixed[][] $tokens
+     */
     private function numberOfSpaces(array $tokens, int $position) : int
     {
         $token = $tokens[$position];

lib/Doctrine/Sniffs/Spacing/SpaceOnNotSniff.php

@@ -1,41 +1,31 @@
 <?php
-/*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* This software consists of voluntary contributions made by many individuals
-* and is licensed under the MIT license. For more information, see
-* <http://www.doctrine-project.org>.
-*/
 
 declare(strict_types=1);
 
 namespace Doctrine\Sniffs\Spacing;
 
-use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 final class SpaceOnNotSniff implements Sniff
 {
     use EnsureSpaces;
 
     private const MESSAGE = 'There must be a single space %s a NOT operator; %d found';
 
-    public function register()
+    /**
+     * @return int[]
+     */
+    public function register() : array
     {
         return [\T_BOOLEAN_NOT];
     }
 
-    public function process(File $phpcsFile, $stackPtr)
+    /**
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+     * @param int $stackPtr
+     */
+    public function process(File $phpcsFile, $stackPtr) : void
     {
         $tokens = $phpcsFile->getTokens();
 

tests/expected_report.txt

@@ -5,12 +5,10 @@ FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 tests/input/concatenation_spacing.php                 19      0
 tests/input/not_spacing.php                           7       0
-tests/input/return_type_on_closures.php               21      0
-tests/input/return_type_on_methods.php                16      0
 ----------------------------------------------------------------------
-A TOTAL OF 63 ERRORS AND 0 WARNINGS WERE FOUND IN 4 FILES
+A TOTAL OF 26 ERRORS AND 0 WARNINGS WERE FOUND IN 2 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 63 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 26 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/fixed/concatenation_spacing.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $string = 'Doctrine' . 'rulez';
 $string = 'Doctrine' . 'rulez';
 $string = 'Doctrine' . 'rulez';

tests/fixed/not_spacing.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $test = 1;
 
 if ( ! $test > 0) {

tests/input/concatenation_spacing.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $string = 'Doctrine' . 'rulez';
 $string = 'Doctrine'. 'rulez';
 $string = 'Doctrine' .'rulez';

tests/input/not_spacing.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $test = 1;
 
 if (!$test > 0) {