Clean up commands

Mostly explicit property definiation, but also a missing use for Exceptions.
AJenbo · Dec 20, 2017 · 8a56573 · 8a56573
1 parent 5ba7ce2
commit 8a56573
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/PHPWeaver/Command/TraceCommand.php b/src/PHPWeaver/Command/TraceCommand.php
@@ -50,8 +50,6 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->output = $output;
-
         $tracefile = $input->getOption('tracefile');
         $append = $input->getOption('append');
         $phpscript = $input->getArgument('phpscript');

diff --git a/src/PHPWeaver/Command/WeaveCommand.php b/src/PHPWeaver/Command/WeaveCommand.php
@@ -1,5 +1,6 @@
 <?php namespace PHPWeaver\Command;
 
+use PHPWeaver\Exceptions\Exception;
 use PHPWeaver\Reflector\StaticReflector;
 use PHPWeaver\Scanner\ClassScanner;
 use PHPWeaver\Scanner\FunctionBodyScanner;
@@ -37,8 +38,16 @@ class WeaveCommand extends Command
     private $nextSteps = 0;
     /** @var float */
     private $nextUpdate = 0.0;
-    /** @var ProgressBar */
+    /** @var ?SymfonyStyle */
+    private $output;
+    /** @var ?ProgressBar */
     private $progressBar;
+    /** @var ?TokenStreamParser */
+    private $tokenizer;
+    /** @var ?ScannerMultiplexer */
+    private $scanner;
+    /** @var ?DocCommentEditorTransformer */
+    private $transformer;
 
     /**
      * Set up command parameteres and help message.
@@ -131,13 +140,10 @@ private function getFilesToProcess(array $pathsToWeave): array
      */
     private function parseTrace(string $tracefile): Signatures
     {
-        $reflector = new StaticReflector();
-        $sigs = new Signatures($reflector);
+        $sigs = new Signatures(new StaticReflector());
         if (is_file($tracefile)) {
             $traceFile = new SplFileObject($tracefile);
-            $collector = new TraceSignatureLogger($sigs, $reflector);
-            $handler = new FunctionTracer($collector, $reflector);
-            $trace = new TraceReader($handler);
+            $trace = new TraceReader(new FunctionTracer(new TraceSignatureLogger($sigs)));
 
             $traceFile->setFlags(SplFileObject::READ_AHEAD);
             $this->progressBarStart(iterator_count($traceFile), '<info>Parsing tracefile …</info>');

diff --git a/tests/PHPWeaver/CollationTest.php b/tests/PHPWeaver/CollationTest.php
@@ -1,12 +1,12 @@
 <?php namespace PHPWeaver\Test;
 
+use PHPUnit\Framework\TestCase;
 use PHPWeaver\Command\TraceCommand;
 use PHPWeaver\Reflector\StaticReflector;
 use PHPWeaver\Signature\Signatures;
 use PHPWeaver\Xtrace\FunctionTracer;
 use PHPWeaver\Xtrace\TraceReader;
 use PHPWeaver\Xtrace\TraceSignatureLogger;
-use PHPUnit\Framework\TestCase;
 use SplFileObject;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -74,10 +74,8 @@ public function testCanCollateClasses(): void
         chdir($this->sandbox());
         $commandTester = new CommandTester(new TraceCommand());
         $commandTester->execute(['phpscript' => $this->sandbox() . '/main.php']);
-        $reflector = new StaticReflector();
-        $sigs = new Signatures($reflector);
-        $collector = new TraceSignatureLogger($sigs, $reflector);
-        $trace = new TraceReader(new FunctionTracer($collector));
+        $sigs = new Signatures(new StaticReflector());
+        $trace = new TraceReader(new FunctionTracer(new TraceSignatureLogger($sigs)));
         foreach (new SplFileObject($this->sandbox() . '/dumpfile.xt') as $line) {
             $trace->processLine($line);
         }