DX: code cleanup

src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php

@@ -359,14 +359,14 @@ private function splitUpDocBlock($lines, Tokens $tokens, $docBlockIndex)
     }
 
     /**
-     * @param Line []$line
+     * @param Line[] $lines
      *
      * @return string
      */
-    private function getSingleLineDocBlockEntry($line)
+    private function getSingleLineDocBlockEntry(array $lines)
     {
-        $line = $line[0];
-        $line = str_replace('*/', '', $line);
+        $line = $lines[0];
+        $line = str_replace('*/', '', $line->getContent());
         $line = trim($line);
         $line = str_split($line);
         $i = \count($line);

src/Fixer/Whitespace/NoExtraBlankLinesFixer.php

@@ -374,7 +374,7 @@ private function removeBetweenUse($index)
             return;
         }
 
-        return $this->removeEmptyLinesAfterLineWithTokenAt($next);
+        $this->removeEmptyLinesAfterLineWithTokenAt($next);
     }
 
     private function removeMultipleBlankLines($index)

src/Runner/Runner.php

@@ -281,7 +281,7 @@ private function fixFile(\SplFileInfo $file, LintingResultInterface $lintingResu
                         sprintf('Failed to write file "%s", "%s".', $fileName, $error ? $error['message'] : 'no reason available'),
                         0,
                         null,
-                        $file
+                        $fileName
                     );
                 }
             }

src/Tokenizer/Tokens.php

@@ -291,13 +291,18 @@ public static function getBlockEdgeDefinitions()
      * Set new size of collection.
      *
      * @param int $size
+     *
+     * @return bool
      */
     public function setSize($size)
     {
         if ($this->getSize() !== $size) {
             $this->changed = true;
-            parent::setSize($size);
+
+            return parent::setSize($size);
         }
+
+        return true;
     }
 
     /**

tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php

@@ -75,7 +75,7 @@ public function testFixWithDifferentLineEndings($expected, $input = null, array
             $input = str_replace("\n", "\r\n", $input);
         }
 
-        return $this->testFix(
+        $this->testFix(
             str_replace("\n", "\r\n", $expected),
             $input,
             $configuration