remove additional method in favour of variable parameters in constructor

maglnet · Oct 11, 2018 · 266391f · 266391f
1 parent 326308f
commit 266391f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/ComposerRequireChecker/Cli/CheckCommand.php b/src/ComposerRequireChecker/Cli/CheckCommand.php
@@ -108,8 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln("The following unknown symbols were found:");
         $table = new Table($output);
         $table->setHeaders(['unknown symbol', 'guessed dependency']);
-        $guesser = new DependencyGuesser();
-        $guesser->addGuesser(new GuessFromComposerAutoloader($composerJson));
+        $guesser = new DependencyGuesser(new GuessFromComposerAutoloader($composerJson));
         foreach ($unknownSymbols as $unknownSymbol) {
             $guessedDependencies = [];
             foreach ($guesser($unknownSymbol) as $guessedDependency) {

diff --git a/src/ComposerRequireChecker/DependencyGuesser/DependencyGuesser.php b/src/ComposerRequireChecker/DependencyGuesser/DependencyGuesser.php
@@ -10,14 +10,12 @@ class DependencyGuesser
      */
     private $guessers = [];
 
-    public function __construct()
+    public function __construct(GuesserInterface ...$guessers)
     {
         $this->guessers[] = new GuessFromLoadedExtensions();
-    }
-
-    public function addGuesser(GuesserInterface $guesser): void
-    {
-        $this->guessers[] = $guesser;
+        foreach ($guessers as $guesser) {
+            $this->guessers[] = $guesser;
+        }
     }
 
     public function __invoke($symbolName): \Generator

diff --git a/test/ComposerRequireCheckerTest/DependencyGuesser/GuessFromComposerAutoloaderTest.php b/test/ComposerRequireCheckerTest/DependencyGuesser/GuessFromComposerAutoloaderTest.php
@@ -3,6 +3,7 @@
 namespace ComposerRequireCheckerTest\DependencyGuesser;
 
 
+use ComposerRequireChecker\DependencyGuesser\DependencyGuesser;
 use ComposerRequireChecker\DependencyGuesser\GuessFromComposerAutoloader;
 use PhpParser\ParserFactory;
 use PHPUnit\Framework\TestCase;
@@ -11,15 +12,14 @@ class GuessFromComposerAutoloaderTest extends TestCase
 {
 
     /**
-     * @var GuessFromComposerAutoloader
+     * @var DependencyGuesser
      */
     private $guesser;
 
     public function setUp()
     {
-        parent::setUp();
         $dir = dirname(__DIR__, 3);
-        $this->guesser = new GuessFromComposerAutoloader($dir . '/composer.json');
+        $this->guesser = new DependencyGuesser(new GuessFromComposerAutoloader($dir . '/composer.json'));
     }
 
     public function testClassWillBeFound()