code grooming

Author: SpacePossum

src/AbstractNoUselessElseFixer.php

@@ -12,7 +12,6 @@
 
 namespace PhpCsFixer;
 
-use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
 /**

src/Cache/SignatureInterface.php

@@ -47,7 +47,7 @@ public function getRules();
     /**
      * @param SignatureInterface $signature
      *
-     * @return mixed
+     * @return bool
      */
     public function equals(self $signature);
 }

src/Console/Command/DescribeCommand.php

@@ -251,6 +251,7 @@ function ($type) {
             $output->writeln('');
         }
 
+        /** @var CodeSampleInterface[] $codeSamples */
         $codeSamples = array_filter($definition->getCodeSamples(), static function (CodeSampleInterface $codeSample) {
             if ($codeSample instanceof VersionSpecificCodeSampleInterface) {
                 return $codeSample->isSuitableFor(\PHP_VERSION_ID);

src/Fixer/Basic/NonPrintableCharacterFixer.php

@@ -93,7 +93,7 @@ public function isRisky()
      */
     public function isCandidate(Tokens $tokens)
     {
-        return \count($tokens) > 1 && $tokens->isAnyTokenKindsFound(self::$tokens);
+        return $tokens->isAnyTokenKindsFound(self::$tokens);
     }
 
     /**

src/Fixer/Phpdoc/PhpdocOrderFixer.php

@@ -45,7 +45,7 @@ public function getDefinition()
 /**
  * Hello there!
  *
- * @throws Exception|RuntimeException dfsdf
+ * @throws Exception|RuntimeException foo
  * @custom Test!
  * @return int  Return the number of changes.
  * @param string $foo

src/Fixer/Phpdoc/PhpdocSummaryFixer.php

@@ -14,7 +14,6 @@
 
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\DocBlock\DocBlock;
-use PhpCsFixer\DocBlock\Line;
 use PhpCsFixer\DocBlock\ShortDescription;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;

src/FixerFactory.php

@@ -17,6 +17,7 @@
 use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use Symfony\Component\Finder\Finder as SymfonyFinder;
+use Symfony\Component\Finder\SplFileInfo;
 
 /**
  * Class provides a way to create a group of fixers.
@@ -94,6 +95,7 @@ public function registerBuiltInFixers()
         if (null === $builtInFixers) {
             $builtInFixers = [];
 
+            /** @var SplFileInfo $file */
             foreach (SymfonyFinder::create()->files()->in(__DIR__.'/Fixer') as $file) {
                 $relativeNamespace = $file->getRelativePath();
                 $fixerClass = 'PhpCsFixer\\Fixer\\'.($relativeNamespace ? $relativeNamespace.'\\' : '').$file->getBasename('.php');

src/Tokenizer/Transformers.php

@@ -14,6 +14,7 @@
 
 use PhpCsFixer\Utils;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 /**
  * Collection of Transformer classes.
@@ -101,6 +102,7 @@ private function registerBuiltInTransformers()
      */
     private function findBuiltInTransformers()
     {
+        /** @var SplFileInfo $file */
         foreach (Finder::create()->files()->in(__DIR__.'/Transformer') as $file) {
             $relativeNamespace = $file->getRelativePath();
             $class = __NAMESPACE__.'\\Transformer\\'.($relativeNamespace ? $relativeNamespace.'\\' : '').$file->getBasename('.php');

tests/Fixtures/Integration/set/@PSR2.test-in.php

@@ -1,12 +1,12 @@
 <?
 namespace Vendor\Package;
-use FooInterface, FooInterfaceB;
+use FooInterfaceA, FooInterfaceB;
 use BarClass as Bar;
 use OtherVendor\OtherPackage\BazClass;
-class Foo extends Bar implements FooInterface{
+class Foo extends Bar implements FooInterfaceA{
     var $aaa = 1, $bbb = 2;
 
-    public function sampleFunction($a, $b = null)
+    public function sampleFunction($a, $arg1, $arg2, $arg3, $foo, $b = null)
     {
         if ($a === $b) {
             bar();

tests/Fixtures/Integration/set/@PSR2.test-out.php

@@ -1,17 +1,17 @@
 <?php
 namespace Vendor\Package;
 
-use FooInterface;
+use FooInterfaceA;
 use FooInterfaceB;
 use BarClass as Bar;
 use OtherVendor\OtherPackage\BazClass;
 
-class Foo extends Bar implements FooInterface
+class Foo extends Bar implements FooInterfaceA
 {
     public $aaa = 1;
     public $bbb = 2;
 
-    public function sampleFunction($a, $b = null)
+    public function sampleFunction($a, $arg1, $arg2, $arg3, $foo, $b = null)
     {
         if ($a === $b) {
             bar();