Add mode to prevent bool arguments

Author: tommy-muehle

src/Script/Configuration.php

@@ -25,49 +25,37 @@ class Configuration
      */
     private $composerBinDirectory;
 
-    /**
-     * @var bool
-     */
-    private $isDevMode = true;
-
-    /**
-     * @var bool
-     */
-    private $isInteractiveMode = true;
-
     /**
      * @param Composer $composer
-     * @param bool     $isDevMode
-     * @param bool     $isInteractiveMode
+     * @param Mode     $mode
      */
-    public function __construct(Composer $composer, $isDevMode = true, $isInteractiveMode = true)
+    public function __construct(Composer $composer, Mode $mode)
     {
         $extras = $composer->getPackage()->getExtra();
 
         if (true === array_key_exists('tools', $extras)) {
             $this->data = array_merge([], $extras['tools']);
         }
 
+        $this->mode = $mode;
         $this->binDirectory = realpath(__DIR__ . '/../../bin');
         $this->composerBinDirectory = $composer->getConfig()->get('bin-dir');
-        $this->isDevMode = $isDevMode;
-        $this->isInteractiveMode = $isInteractiveMode;
     }
 
     /**
      * @return bool
      */
     public function isDevMode()
     {
-        return $this->isDevMode;
+        return $this->mode->isDev();
     }
 
     /**
      * @return bool
      */
     public function isInteractiveMode()
     {
-        return $this->isInteractiveMode;
+        return $this->mode->isInteractive();
     }
 
     /**
@@ -88,6 +76,7 @@ public function getComposerBinDirectory()
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.StaticAccess)
      */
     public function getTools()
     {

src/Script/Mode.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Tooly\Script;
+
+/**
+ * @package Tooly\Script
+ */
+class Mode
+{
+    /**
+     * @var bool
+     */
+    private $isDev = true;
+
+    /**
+     * @var bool
+     */
+    private $isInteractive = true;
+
+    /**
+     * Set flag for composer dev-mode to false.
+     */
+    public function setNoDev()
+    {
+        $this->isDev = false;
+    }
+
+    /**
+     * Set flag for CLI interaction to false.
+     */
+    public function setNonInteractive()
+    {
+        $this->isInteractive = false;
+    }
+
+    /**
+     * Returns if composer runs in dev-mode.
+     *
+     * @return bool
+     */
+    public function isDev()
+    {
+        return $this->isDev;
+    }
+
+    /**
+     * Returns if the CLI can interact.
+     *
+     * @return bool
+     */
+    public function isInteractive()
+    {
+        return $this->isInteractive;
+    }
+}

src/ScriptHandler.php

@@ -8,6 +8,7 @@
 use Tooly\Script\Helper\Filesystem;
 use Tooly\Script\Helper\Downloader;
 use Tooly\Script\Helper\Verifier;
+use Tooly\Script\Mode;
 use Tooly\Script\Processor;
 use TM\GPG\Verification\Verifier as GPGVerifier;
 
@@ -22,11 +23,17 @@ class ScriptHandler
     public static function installPharTools(Event $event)
     {
         $gpgVerifier = null;
-        $configuration = new Configuration(
-            $event->getComposer(),
-            $event->isDevMode(),
-            $event->getIO()->isInteractive()
-        );
+        $mode = new Mode;
+
+        if (false === $event->isDevMode()) {
+            $mode->setNoDev();
+        }
+
+        if (false === $event->getIO()->isInteractive()) {
+            $mode->setNonInteractive();
+        }
+
+        $configuration = new Configuration($event->getComposer(), $mode);
 
         if (true === class_exists(GPGVerifier::class)) {
             $gpgVerifier = new GPGVerifier;

tests/Script/ConfigurationTest.php

@@ -6,6 +6,7 @@
 use Composer\Config;
 use Composer\Package\Package;
 use Tooly\Script\Configuration;
+use Tooly\Script\Mode;
 
 /**
  * @package Tooly\Tests\Script
@@ -14,7 +15,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
 {
     public function testIfNoToolsSetEmptyToolSetIsGiven()
     {
-        $configuration = new Configuration($this->getPreparedComposerInstance([], ''));
+        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), new Mode(true, false));
         $this->assertCount(0, $configuration->getTools());
     }
 
@@ -28,31 +29,37 @@ public function testCanGetCorrectToolSet()
             ]
         ];
 
-        $configuration = new Configuration($this->getPreparedComposerInstance($extra, ''));
+        $configuration = new Configuration($this->getPreparedComposerInstance($extra, ''), new Mode);
         $this->assertCount(1, $configuration->getTools());
     }
 
     public function testCanCheckDevMode()
     {
-        $configuration = new Configuration($this->getPreparedComposerInstance([], ''));
+        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), new Mode);
         $this->assertTrue($configuration->isDevMode());
     }
 
     public function testCanSetDevMode()
     {
-        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), false);
+        $mode = new Mode;
+        $mode->setNoDev();
+
+        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), $mode);
         $this->assertFalse($configuration->isDevMode());
     }
 
     public function testCanCheckInteractiveMode()
     {
-        $configuration = new Configuration($this->getPreparedComposerInstance([], ''));
+        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), new Mode);
         $this->assertTrue($configuration->isInteractiveMode());
     }
 
     public function testCanSetInteractiveMode()
     {
-        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), true, false);
+        $mode = new Mode;
+        $mode->setNonInteractive();
+
+        $configuration = new Configuration($this->getPreparedComposerInstance([], ''), $mode);
         $this->assertFalse($configuration->isInteractiveMode());
     }