Merge pull request #421 from ergebnis/fix/static

Fix: Methods can be static
ergebnis · May 1, 2020 · 3079ef8 · 3079ef8
2 parents ae07699 + 0f41247
commit 3079ef8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 30 deletions.
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -25,6 +25,7 @@
     "Composer\\Plugin\\Capability\\CommandProvider",
     "Composer\\Plugin\\Capable",
     "Composer\\Plugin\\PluginInterface",
+    "Symfony\\Component\\Console\\Application",
     "Symfony\\Component\\Console\\Input\\ArrayInput",
     "Symfony\\Component\\Console\\Input\\InputArgument",
     "Symfony\\Component\\Console\\Input\\InputInterface",

diff --git a/src/Command/NormalizeCommand.php b/src/Command/NormalizeCommand.php
@@ -106,7 +106,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
         $io = $this->getIO();
 
         try {
-            $indent = $this->indentFrom($input);
+            $indent = self::indentFrom($input);
         } catch (\RuntimeException $exception) {
             $io->writeError(\sprintf(
                 '<error>%s</error>',
@@ -154,7 +154,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
         } catch (Normalizer\Exception\OriginalInvalidAccordingToSchemaException $exception) {
             $io->writeError('<error>Original composer.json does not match the expected JSON schema:</error>');
 
-            $this->showValidationErrors(
+            self::showValidationErrors(
                 $io,
                 ...$exception->errors()
             );
@@ -163,7 +163,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
         } catch (Normalizer\Exception\NormalizedInvalidAccordingToSchemaException $exception) {
             $io->writeError('<error>Normalized composer.json does not match the expected JSON schema:</error>');
 
-            $this->showValidationErrors(
+            self::showValidationErrors(
                 $io,
                 ...$exception->errors()
             );
@@ -204,17 +204,15 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
                 $composerFile
             ));
 
-            $io->write([
-                '',
-                '<fg=yellow>---------- begin diff ----------</>',
-            ]);
-
-            $io->write($this->diff(
+            $diff = $this->differ->diff(
                 $json->encoded(),
                 $formatted->encoded()
-            ));
+            );
 
             $io->write([
+                '',
+                '<fg=yellow>---------- begin diff ----------</>',
+                self::formatDiff($diff),
                 '<fg=yellow>----------- end diff -----------</>',
                 '',
             ]);
@@ -239,7 +237,8 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
 
         $this->resetComposer();
 
-        return $this->updateLockerInWorkingDirectory(
+        return self::updateLockerInWorkingDirectory(
+            $this->getApplication(),
             $output,
             \dirname($composerFile)
         );
@@ -252,7 +251,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
      *
      * @return null|Normalizer\Format\Indent
      */
-    private function indentFrom(Console\Input\InputInterface $input): ?Normalizer\Format\Indent
+    private static function indentFrom(Console\Input\InputInterface $input): ?Normalizer\Format\Indent
     {
         /** @var null|string $indentSize */
         $indentSize = $input->getOption('indent-size');
@@ -304,7 +303,7 @@ private function indentFrom(Console\Input\InputInterface $input): ?Normalizer\Fo
         return $indent;
     }
 
-    private function showValidationErrors(IO\IOInterface $io, string ...$errors): void
+    private static function showValidationErrors(IO\IOInterface $io, string ...$errors): void
     {
         foreach ($errors as $error) {
             $io->writeError(\sprintf(
@@ -316,19 +315,8 @@ private function showValidationErrors(IO\IOInterface $io, string ...$errors): vo
         $io->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
     }
 
-    /**
-     * @param string $before
-     * @param string $after
-     *
-     * @return string
-     */
-    private function diff(string $before, string $after): string
+    private static function formatDiff(string $diff): string
     {
-        $diff = $this->differ->diff(
-            $before,
-            $after
-        );
-
         $lines = \explode(
             "\n",
             $diff
@@ -363,18 +351,19 @@ private function diff(string $before, string $after): string
     /**
      * @see https://getcomposer.org/doc/03-cli.md#update
      *
+     * @param Console\Application            $application
      * @param Console\Output\OutputInterface $output
      * @param string                         $workingDirectory
      *
      * @throws \Exception
      *
      * @return int
      */
-    private function updateLockerInWorkingDirectory(Console\Output\OutputInterface $output, string $workingDirectory): int
-    {
-        /** @var Console\Application $application */
-        $application = $this->getApplication();
-
+    private static function updateLockerInWorkingDirectory(
+        Console\Application $application,
+        Console\Output\OutputInterface $output,
+        string $workingDirectory
+    ): int {
         return $application->run(
             new Console\Input\ArrayInput([
                 'command' => 'update',