Remove duplicate code in helper class and make needed changes

Author: tommy-muehle

src/Script/Decision/DoReplaceDecision.php

@@ -36,7 +36,7 @@ public function __construct(Configuration $configuration, Helper $helper, IOInte
      */
     public function canProceed(Tool $tool)
     {
-        if (false === $this->helper->isFileAlreadyExist($tool->getFilename(), null)) {
+        if (false === $this->helper->getFilesystem()->isFileAlreadyExist($tool->getFilename())) {
             return true;
         }
 

src/Script/Decision/IsAccessibleDecision.php

@@ -16,15 +16,15 @@ class IsAccessibleDecision extends AbstractDecision
      */
     public function canProceed(Tool $tool)
     {
-        if (false === $this->helper->isAccessible($tool->getUrl())) {
+        if (false === $this->helper->getDownloader()->isAccessible($tool->getUrl())) {
             return false;
         }
 
         if (empty($tool->getSignUrl())) {
             return true;
         }
 
-        if (false === $this->helper->isAccessible($tool->getSignUrl())) {
+        if (false === $this->helper->getDownloader()->isAccessible($tool->getSignUrl())) {
             return false;
         }
 

src/Script/Helper.php

@@ -38,16 +38,6 @@ public function __construct(Filesystem $filesystem, Downloader $downloader, Veri
         $this->verifier   = $verifier;
     }
 
-    /**
-     * @param string $url
-     *
-     * @return bool
-     */
-    public function isAccessible($url)
-    {
-        return $this->downloader->isAccessible($url);
-    }
-
     /**
      * @param string $filename
      * @param string $targetFile
@@ -74,14 +64,14 @@ public function isFileAlreadyExist($filename, $targetFile)
      */
     public function isVerified($signatureUrl, $fileUrl)
     {
-        $data = $this->download($fileUrl);
-        $signatureData = $this->download($signatureUrl);
+        $data = $this->downloader->download($fileUrl);
+        $signatureData = $this->downloader->download($signatureUrl);
 
         $tmpFile = rtrim(sys_get_temp_dir(), '/') . '/_tool';
-        $this->createFile($tmpFile, $data);
+        $this->filesystem->createFile($tmpFile, $data);
 
         $tmpSignFile = rtrim(sys_get_temp_dir(), '/') . '/_tool.sign';
-        $this->createFile($tmpSignFile, $signatureData);
+        $this->filesystem->createFile($tmpSignFile, $signatureData);
 
         $result = $this->verifier->checkGPGSignature($tmpSignFile, $tmpFile);
 
@@ -92,34 +82,26 @@ public function isVerified($signatureUrl, $fileUrl)
     }
 
     /**
-     * @param string $url
-     *
-     * @return string
+     * @return Filesystem
      */
-    public function download($url)
+    public function getFilesystem()
     {
-        return $this->downloader->download($url);
+        return $this->filesystem;
     }
 
     /**
-     * @param string $filename
-     * @param string $content
-     *
-     * @return bool
+     * @return Downloader
      */
-    public function createFile($filename, $content)
+    public function getDownloader()
     {
-        return $this->filesystem->createFile($filename, $content);
+        return $this->downloader;
     }
 
     /**
-     * @param string $sourceFile
-     * @param string $file
-     *
-     * @return bool
+     * @return Verifier
      */
-    public function symlinkFile($sourceFile, $file)
+    public function getVerifier()
     {
-        return $this->filesystem->symlinkFile($sourceFile, $file);
+        return $this->verifier;
     }
 }

src/Script/Processor.php

@@ -78,10 +78,10 @@ public function process(Tool $tool)
             return;
         }
 
-        $data = $this->helper->download($tool->getUrl());
+        $data = $this->helper->getDownloader()->download($tool->getUrl());
         $filename = $tool->getFilename();
 
-        $this->helper->createFile($filename, $data);
+        $this->helper->getFilesystem()->createFile($filename, $data);
 
         $this->io->write(sprintf(
             '<info>File "%s" successfully downloaded!</info>',
@@ -98,7 +98,7 @@ public function symlink(Tool $tool)
         $composerDir = $this->configuration->getComposerBinDirectory();
         $composerPath = $composerDir . DIRECTORY_SEPARATOR . basename($filename);
 
-        $this->helper->symlinkFile($filename, $composerPath);
+        $this->helper->getFilesystem()->symlinkFile($filename, $composerPath);
     }
 
     /**

tests/Script/Decision/IsAccessibleDecisionTest.php

@@ -5,6 +5,7 @@
 use Tooly\Factory\ToolFactory;
 use Tooly\Model\Tool;
 use Tooly\Script\Decision\IsAccessibleDecision;
+use Tooly\Script\Helper\Downloader;
 
 /**
  * @package Tooly\Tests\Script\Decision
@@ -13,32 +14,60 @@ class IsAccessibleDecisionTest extends DecisionTestCase
 {
     public function testNotAccessibleToolUrlReturnsFalse()
     {
-        $this->helper
+        $downloader = $this
+            ->getMockBuilder(Downloader::class)
+            ->getMock();
+
+        $downloader
             ->expects($this->once())
             ->method('isAccessible')
             ->willReturn(false);
 
+        $this->helper
+            ->expects($this->once())
+            ->method('getDownloader')
+            ->willReturn($downloader);
+
         $decision = new IsAccessibleDecision($this->configuration, $this->helper);
         $this->assertFalse($decision->canProceed(ToolFactory::createTool('tool', __DIR__, [])));
     }
 
     public function testEmptySignUrlReturnsTrue()
     {
-        $this->helper
+        $downloader = $this
+            ->getMockBuilder(Downloader::class)
+            ->getMock();
+
+        $downloader
             ->expects($this->once())
             ->method('isAccessible')
             ->willReturn(true);
 
+        $this->helper
+            ->expects($this->once())
+            ->method('getDownloader')
+            ->willReturn($downloader);
+
         $decision = new IsAccessibleDecision($this->configuration, $this->helper);
         $this->assertTrue($decision->canProceed(ToolFactory::createTool('tool', __DIR__, [])));
     }
 
     public function testNotAccessibleToolSignUrlReturnsFalse()
     {
-        $this->helper
+        $downloader = $this
+            ->getMockBuilder(Downloader::class)
+            ->getMock();
+
+        $downloader
+            ->expects($this->exactly(2))
             ->method('isAccessible')
             ->will($this->onConsecutiveCalls(true, false));
 
+        $this->helper
+            ->expects($this->exactly(2))
+            ->method('getDownloader')
+            ->willReturn($downloader);
+
         $decision = new IsAccessibleDecision($this->configuration, $this->helper);
         $this->assertFalse($decision->canProceed(ToolFactory::createTool('tool', __DIR__, [
             'sign-url' => 'sign-url'
@@ -47,10 +76,20 @@ public function testNotAccessibleToolSignUrlReturnsFalse()
 
     public function testAccessibleUrlsWillReturnTrue()
     {
-        $this->helper
+        $downloader = $this
+            ->getMockBuilder(Downloader::class)
+            ->getMock();
+
+        $downloader
+            ->expects($this->exactly(2))
             ->method('isAccessible')
             ->will($this->onConsecutiveCalls(true, true));
 
+        $this->helper
+            ->expects($this->exactly(2))
+            ->method('getDownloader')
+            ->willReturn($downloader);
+
         $decision = new IsAccessibleDecision($this->configuration, $this->helper);
         $this->assertTrue($decision->canProceed(ToolFactory::createTool('tool', __DIR__, [
             'sign-url' => 'sign-url'

tests/Script/HelperTest.php

@@ -84,7 +84,7 @@ public function testCanCheckIfFileAlreadyExist()
         $this->assertFalse($helper->isFileAlreadyExist('foo', 'bar'));
     }
 
-    public function testCanCopyAFile()
+    public function testCanSymlinkAFile()
     {
         $filesystem = $this
             ->getMockBuilder(Filesystem::class)
@@ -96,6 +96,6 @@ public function testCanCopyAFile()
             ->willReturn(true);
 
         $helper = new Helper($filesystem, new Downloader, new Verifier);
-        $this->assertTrue($helper->symlinkFile('foo', 'bar'));
+        $this->assertTrue($helper->getFilesystem()->symlinkFile('foo', 'bar'));
     }
 }