more tests

Author: IonBazan

src/Command/DiffCommand.php

@@ -15,6 +15,18 @@
 
 class DiffCommand extends BaseCommand
 {
+    /**
+     * @var PackageDiff
+     */
+    protected $packageDiff;
+
+    public function __construct(PackageDiff $packageDiff)
+    {
+        $this->packageDiff = $packageDiff;
+
+        parent::__construct();
+    }
+
     protected function configure()
     {
         $this->setName('diff')
@@ -32,15 +44,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $base = $input->getOption('base');
         $target = $input->getOption('target');
         $withPlatform = $input->getOption('with-platform');
-        $diff = new PackageDiff();
 
         if (!$input->getOption('no-prod')) {
-            $operations = $diff->getPackageDiff($base, $target, false, $withPlatform);
+            $operations = $this->packageDiff->getPackageDiff($base, $target, false, $withPlatform);
             $this->displayTable($operations, 'Prod Packages', $output);
         }
 
         if (!$input->getOption('no-dev')) {
-            $operations = $diff->getPackageDiff($base, $target, true, $withPlatform);
+            $operations = $this->packageDiff->getPackageDiff($base, $target, true, $withPlatform);
             $this->displayTable($operations, 'Dev Packages', $output);
         }
 

src/PackageDiff.php

@@ -99,7 +99,7 @@ private function getFileContents($path)
         }
 
         $output = array();
-        exec('git show '.escapeshellarg($path), $output, $exit);
+        @exec('git show '.escapeshellarg($path), $output, $exit);
 
         if (0 !== $exit) {
             throw new \RuntimeException(sprintf('Could not open file %s or find it in git as %s', $originalPath, $path));

src/Plugin.php

@@ -23,7 +23,7 @@ public function activate(Composer $composer, IOInterface $io)
 
     public function getCommands()
     {
-        return array(new DiffCommand());
+        return array(new DiffCommand(new PackageDiff()));
     }
 
     public function getCapabilities()

tests/PackageDiffTest.php

@@ -64,7 +64,11 @@ public function testInvalidGitRef()
     {
         $diff = new PackageDiff();
         $this->prepareGit();
-        $this->expectException('RuntimeException');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('RuntimeException');
+        } else {
+            $this->setExpectedException('RuntimeException');
+        }
         $diff->getPackageDiff('invalid-ref', '');
     }
 

tests/PluginTest.php

@@ -3,6 +3,7 @@
 namespace IonBazan\ComposerDiff\Tests;
 
 use IonBazan\ComposerDiff\Command\DiffCommand;
+use IonBazan\ComposerDiff\PackageDiff;
 use IonBazan\ComposerDiff\Plugin;
 use PHPUnit\Framework\TestCase;
 
@@ -15,11 +16,12 @@ public function testPlugin()
 
         $plugin = new Plugin();
         $plugin->activate($composer, $io);
+        $command = new DiffCommand(new PackageDiff());
 
         $this->assertSame(
             array('Composer\Plugin\Capability\CommandProvider' => 'IonBazan\ComposerDiff\Plugin'),
             $plugin->getCapabilities()
         );
-        $this->assertEquals(array(new DiffCommand()), $plugin->getCommands());
+        $this->assertEquals(array($command), $plugin->getCommands());
     }
 }