From c0cd04ea66c45a523ec01cfb7bcedf8f4c1b021e Mon Sep 17 00:00:00 2001
From: jens1o <jenshausdorf@gmail.com>
Date: Tue, 7 Aug 2018 14:04:25 +0200
Subject: [PATCH] fixes https://github.com/alchemy-fr/BinaryDriver/issues/27

---
 .travis.yml                                   | 12 ++------
 src/Alchemy/BinaryDriver/AbstractBinary.php   | 29 +++++++++----------
 .../BinaryDriver/BinaryDriverTestCase.php     |  6 ++--
 src/Alchemy/BinaryDriver/BinaryInterface.php  |  9 +++---
 src/Alchemy/BinaryDriver/Configuration.php    | 13 +++++----
 .../ConfigurationAwareInterface.php           |  7 +++--
 .../BinaryDriver/ConfigurationInterface.php   | 13 +++++----
 .../Exception/ExceptionInterface.php          |  1 +
 .../Exception/ExecutableNotFoundException.php |  1 +
 .../Exception/ExecutionFailureException.php   |  1 +
 .../Exception/InvalidArgumentException.php    |  1 +
 .../BinaryDriver/Listeners/DebugListener.php  | 13 +++++----
 .../Listeners/ListenerInterface.php           |  9 ++++--
 .../BinaryDriver/Listeners/Listeners.php      |  9 +++---
 .../BinaryDriver/ProcessBuilderFactory.php    | 21 +++++++-------
 .../ProcessBuilderFactoryAwareInterface.php   |  5 ++--
 .../ProcessBuilderFactoryInterface.php        | 11 +++----
 src/Alchemy/BinaryDriver/ProcessRunner.php    | 24 ++++++++-------
 .../ProcessRunnerAwareInterface.php           |  7 +++--
 .../BinaryDriver/ProcessRunnerInterface.php   |  9 +++---
 .../Tests/BinaryDriver/AbstractBinaryTest.php |  2 +-
 .../AbstractProcessBuilderFactoryTest.php     |  2 +-
 .../Tests/BinaryDriver/ConfigurationTest.php  |  2 +-
 .../Listeners/DebugListenerTest.php           |  2 +-
 .../BinaryDriver/Listeners/ListenersTest.php  | 14 ++++++---
 .../NONLTSProcessBuilderFactoryTest.php       |  2 +-
 .../Tests/BinaryDriver/ProcessRunnerTest.php  | 18 ++++++++----
 tests/bootstrap.php                           |  2 +-
 28 files changed, 137 insertions(+), 108 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02e7ad4..46e9b71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,21 +3,15 @@ language: php
 sudo: false
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
+  - nightly
 
 matrix:
   include:
-    - php: 5.5
+    - php: 7.1
       env: COMPOSER_OPTIONS="--prefer-lowest --prefer-stable"
-    - php: 7.0
-      env: COMPOSER_REQUIRE="symfony/process:^2.0"
-    - php: 7.0
-      env: COMPOSER_REQUIRE="symfony/process:^3.0"
 
 before_script:
   - composer self-update
-  - if [ -n "$COMPOSER_REQUIRE" ]; then composer require --no-update $COMPOSER_REQUIRE; fi
   - composer update $COMPOSER_OPTIONS
diff --git a/src/Alchemy/BinaryDriver/AbstractBinary.php b/src/Alchemy/BinaryDriver/AbstractBinary.php
index 7430ad8..b5372ca 100644
--- a/src/Alchemy/BinaryDriver/AbstractBinary.php
+++ b/src/Alchemy/BinaryDriver/AbstractBinary.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -48,7 +49,7 @@ public function __construct(ProcessBuilderFactoryInterface $factory, LoggerInter
     /**
      * @inheritDoc
      */
-    public function listen(ListenerInterface $listener)
+    public function listen(ListenerInterface $listener) : BinaryInterface
     {
         $this->listenersManager->register($listener, $this);
 
@@ -58,7 +59,7 @@ public function listen(ListenerInterface $listener)
     /**
      * @inheritDoc
      */
-    public function unlisten(ListenerInterface $listener)
+    public function unlisten(ListenerInterface $listener) : BinaryInterface
     {
         $this->listenersManager->unregister($listener, $this);
 
@@ -68,17 +69,15 @@ public function unlisten(ListenerInterface $listener)
     /**
      * @inheritDoc
      */
-    public function getConfiguration()
+    public function getConfiguration() : ConfigurationInterface
     {
         return $this->configuration;
     }
 
     /**
      * @inheritDoc
-     *
-     * @return BinaryInterface
      */
-    public function setConfiguration(ConfigurationInterface $configuration)
+    public function setConfiguration(ConfigurationInterface $configuration) : ConfigurationAwareInterface
     {
         $this->configuration = $configuration;
         $this->applyProcessConfiguration();
@@ -89,7 +88,7 @@ public function setConfiguration(ConfigurationInterface $configuration)
     /**
      * @inheritDoc
      */
-    public function getProcessBuilderFactory()
+    public function getProcessBuilderFactory() : ProcessBuilderFactoryInterface
     {
         return $this->factory;
     }
@@ -97,9 +96,9 @@ public function getProcessBuilderFactory()
     /**
      * @inheritDoc
      *
-     * @return BinaryInterface
+     * @return ProcessBuilderFactoryAwareInterface
      */
-    public function setProcessBuilderFactory(ProcessBuilderFactoryInterface $factory)
+    public function setProcessBuilderFactory(ProcessBuilderFactoryInterface $factory) : ProcessBuilderFactoryAwareInterface
     {
         $this->factory = $factory;
         $this->applyProcessConfiguration();
@@ -110,7 +109,7 @@ public function setProcessBuilderFactory(ProcessBuilderFactoryInterface $factory
     /**
      * @inheritDoc
      */
-    public function getProcessRunner()
+    public function getProcessRunner() : ProcessRunnerInterface
     {
         return $this->processRunner;
     }
@@ -118,17 +117,15 @@ public function getProcessRunner()
     /**
      * @inheritDoc
      */
-    public function setProcessRunner(ProcessRunnerInterface $runner)
+    public function setProcessRunner(ProcessRunnerInterface $runner) : void
     {
         $this->processRunner = $runner;
-
-        return $this;
     }
 
     /**
      * @inheritDoc
      */
-    public function command($command, $bypassErrors = false, $listeners = null)
+    public function command($command, bool $bypassErrors = false, $listeners = null) : string
     {
         if (!is_array($command)) {
             $command = (array)$command;
@@ -140,11 +137,11 @@ public function command($command, $bypassErrors = false, $listeners = null)
     /**
      * @inheritDoc
      */
-    public static function load($binaries, LoggerInterface $logger = null, $configuration = [])
+    public static function load($binaries, ? LoggerInterface $logger = null, $configuration = []) : BinaryInterface
     {
         $finder = new ExecutableFinder();
         $binary = null;
-        $binaries = is_array($binaries) ? $binaries : array($binaries);
+        $binaries = is_array($binaries) ? $binaries : (array)$binaries;
 
         foreach ($binaries as $candidate) {
             if (file_exists($candidate) && is_executable($candidate)) {
diff --git a/src/Alchemy/BinaryDriver/BinaryDriverTestCase.php b/src/Alchemy/BinaryDriver/BinaryDriverTestCase.php
index dcef80c..9b9b3d8 100644
--- a/src/Alchemy/BinaryDriver/BinaryDriverTestCase.php
+++ b/src/Alchemy/BinaryDriver/BinaryDriverTestCase.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 namespace Alchemy\BinaryDriver;
 
@@ -25,10 +26,11 @@ public function createProcessBuilderFactoryMock()
      * @param string  $commandLine The commandline executed
      * @param string  $output      The process output
      * @param string  $error       The process error output
+     * @param bool $enableCallback
      *
      * @return Process
      */
-    public function createProcessMock($runs = 1, $success = true, $commandLine = null, $output = null, $error = null, $callback = false)
+    public function createProcessMock(int $runs = 1, bool $success = true, string $commandLine = null, string $output = null, string $error = null, bool $enableCallback = false)
     {
         $process = $this->getMockBuilder(\Symfony\Component\Process\Process::class)
             ->disableOriginalConstructor()
@@ -37,7 +39,7 @@ public function createProcessMock($runs = 1, $success = true, $commandLine = nul
         $builder = $process->expects($this->exactly($runs))
             ->method('run');
 
-        if (true === $callback) {
+        if (true === $enableCallback) {
             $builder->with($this->isInstanceOf('Closure'));
         }
 
diff --git a/src/Alchemy/BinaryDriver/BinaryInterface.php b/src/Alchemy/BinaryDriver/BinaryInterface.php
index ab2f170..e320a68 100644
--- a/src/Alchemy/BinaryDriver/BinaryInterface.php
+++ b/src/Alchemy/BinaryDriver/BinaryInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -26,7 +27,7 @@ interface BinaryInterface extends ConfigurationAwareInterface, ProcessBuilderFac
      *
      * @return BinaryInterface
      */
-    public function listen(ListenerInterface $listener);
+    public function listen(ListenerInterface $listener) : self;
 
     /**
      * Removes a listener from the binary driver
@@ -35,7 +36,7 @@ public function listen(ListenerInterface $listener);
      *
      * @return BinaryInterface
      */
-    public function unlisten(ListenerInterface $listener);
+    public function unlisten(ListenerInterface $listener) : self;
 
     /**
      * Runs a command against the driver.
@@ -50,7 +51,7 @@ public function unlisten(ListenerInterface $listener);
      *
      * @throws ExecutionFailureException in case of process failure.
      */
-    public function command($command, $bypassErrors = false, $listeners = null);
+    public function command($command, bool $bypassErrors = false, $listeners = null) : string;
 
     /**
      * Loads a binary
@@ -63,5 +64,5 @@ public function command($command, $bypassErrors = false, $listeners = null);
      *
      * @return BinaryInterface
      */
-    public static function load($binaries, LoggerInterface $logger = null, $configuration = []);
+    public static function load($binaries, LoggerInterface $logger = null, $configuration = []) : BinaryInterface;
 }
diff --git a/src/Alchemy/BinaryDriver/Configuration.php b/src/Alchemy/BinaryDriver/Configuration.php
index a143e00..b08b05c 100644
--- a/src/Alchemy/BinaryDriver/Configuration.php
+++ b/src/Alchemy/BinaryDriver/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -31,7 +32,7 @@ public function getIterator()
     /**
      * @inheritDoc
      */
-    public function get($key, $default = null)
+    public function get(string $key, $default = null)
     {
         return isset($this->data[$key]) ? $this->data[$key] : $default;
     }
@@ -39,7 +40,7 @@ public function get($key, $default = null)
     /**
      * @inheritDoc
      */
-    public function set($key, $value)
+    public function set(string $key, $value)
     {
         $this->data[$key] = $value;
 
@@ -49,15 +50,15 @@ public function set($key, $value)
     /**
      * @inheritDoc
      */
-    public function has($key)
+    public function has(string $key) : bool
     {
-        return array_key_exists($key, $this->data);
+        return isset($this->data[$key]) || array_key_exists($key, $this->data);
     }
 
     /**
      * @inheritDoc
      */
-    public function remove($key)
+    public function remove(string $key)
     {
         $value = $this->get($key);
         unset($this->data[$key]);
@@ -68,7 +69,7 @@ public function remove($key)
     /**
      * @inheritDoc
      */
-    public function all()
+    public function all() : array
     {
         return $this->data;
     }
diff --git a/src/Alchemy/BinaryDriver/ConfigurationAwareInterface.php b/src/Alchemy/BinaryDriver/ConfigurationAwareInterface.php
index 3b14f9e..bc4a730 100644
--- a/src/Alchemy/BinaryDriver/ConfigurationAwareInterface.php
+++ b/src/Alchemy/BinaryDriver/ConfigurationAwareInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -18,12 +19,14 @@ interface ConfigurationAwareInterface
      *
      * @return ConfigurationInterface
      */
-    public function getConfiguration();
+    public function getConfiguration() : ConfigurationInterface;
 
     /**
      * Set the configuration
      *
      * @param ConfigurationInterface $configuration
+     *
+     * @return ConfigurationAwareInterface
      */
-    public function setConfiguration(ConfigurationInterface $configuration);
+    public function setConfiguration(ConfigurationInterface $configuration) : ConfigurationAwareInterface;
 }
diff --git a/src/Alchemy/BinaryDriver/ConfigurationInterface.php b/src/Alchemy/BinaryDriver/ConfigurationInterface.php
index 4c8cc12..36a0d1e 100644
--- a/src/Alchemy/BinaryDriver/ConfigurationInterface.php
+++ b/src/Alchemy/BinaryDriver/ConfigurationInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -21,7 +22,7 @@ interface ConfigurationInterface extends \ArrayAccess, \IteratorAggregate
      *
      * @return mixed
      */
-    public function get($key, $default = null);
+    public function get(string $key, $default = null);
 
     /**
      * Set a value to configuration
@@ -29,7 +30,7 @@ public function get($key, $default = null);
      * @param string $key   The key
      * @param mixed  $value The value corresponding to the key
      */
-    public function set($key, $value);
+    public function set(string $key, $value);
 
     /**
      * Tells if Configuration contains `$key`
@@ -38,7 +39,7 @@ public function set($key, $value);
      *
      * @return bool
      */
-    public function has($key);
+    public function has(string $key) : bool;
 
     /**
      * Removes a value given a key
@@ -47,12 +48,12 @@ public function has($key);
      *
      * @return mixed The previous value
      */
-    public function remove($key);
+    public function remove(string $key);
 
     /**
      * Returns all values set in the configuration
      *
-     * @return array
+     * @return mixed[]
      */
-    public function all();
+    public function all() : array;
 }
diff --git a/src/Alchemy/BinaryDriver/Exception/ExceptionInterface.php b/src/Alchemy/BinaryDriver/Exception/ExceptionInterface.php
index aaa1e32..653eabd 100644
--- a/src/Alchemy/BinaryDriver/Exception/ExceptionInterface.php
+++ b/src/Alchemy/BinaryDriver/Exception/ExceptionInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
diff --git a/src/Alchemy/BinaryDriver/Exception/ExecutableNotFoundException.php b/src/Alchemy/BinaryDriver/Exception/ExecutableNotFoundException.php
index 6f267ea..c117875 100644
--- a/src/Alchemy/BinaryDriver/Exception/ExecutableNotFoundException.php
+++ b/src/Alchemy/BinaryDriver/Exception/ExecutableNotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
diff --git a/src/Alchemy/BinaryDriver/Exception/ExecutionFailureException.php b/src/Alchemy/BinaryDriver/Exception/ExecutionFailureException.php
index c25af97..70dcacd 100644
--- a/src/Alchemy/BinaryDriver/Exception/ExecutionFailureException.php
+++ b/src/Alchemy/BinaryDriver/Exception/ExecutionFailureException.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
diff --git a/src/Alchemy/BinaryDriver/Exception/InvalidArgumentException.php b/src/Alchemy/BinaryDriver/Exception/InvalidArgumentException.php
index 4e9cfe4..8f72732 100644
--- a/src/Alchemy/BinaryDriver/Exception/InvalidArgumentException.php
+++ b/src/Alchemy/BinaryDriver/Exception/InvalidArgumentException.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
diff --git a/src/Alchemy/BinaryDriver/Listeners/DebugListener.php b/src/Alchemy/BinaryDriver/Listeners/DebugListener.php
index a35104d..4690cf0 100644
--- a/src/Alchemy/BinaryDriver/Listeners/DebugListener.php
+++ b/src/Alchemy/BinaryDriver/Listeners/DebugListener.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -21,7 +22,7 @@ class DebugListener extends EventEmitter implements ListenerInterface
     private $eventOut;
     private $eventErr;
 
-    public function __construct($prefixOut = '[OUT] ', $prefixErr = '[ERROR] ', $eventOut = 'debug', $eventErr = 'debug')
+    public function __construct(string $prefixOut = '[OUT] ', string $prefixErr = '[ERROR] ', string $eventOut = 'debug', string $eventErr = 'debug')
     {
         $this->prefixOut = $prefixOut;
         $this->prefixErr = $prefixErr;
@@ -32,7 +33,7 @@ public function __construct($prefixOut = '[OUT] ', $prefixErr = '[ERROR] ', $eve
     /**
      * @inheritDoc
      */
-    public function handle($type, $data)
+    public function handle(string $type, string $data) : void
     {
         if (Process::ERR === $type) {
             $this->emitLines($this->eventErr, $this->prefixErr, $data);
@@ -44,15 +45,15 @@ public function handle($type, $data)
     /**
      * @inheritDoc
      */
-    public function forwardedEvents()
+    public function forwardedEvents() : array
     {
-        return array_unique(array($this->eventErr, $this->eventOut));
+        return array_unique([$this->eventErr, $this->eventOut]);
     }
 
-    private function emitLines($event, $prefix, $lines)
+    private function emitLines(string $event, string $prefix, string $lines)
     {
         foreach (explode("\n", $lines) as $line) {
-            $this->emit($event, array($prefix . $line));
+            $this->emit($event, [$prefix . $line]);
         }
     }
 }
diff --git a/src/Alchemy/BinaryDriver/Listeners/ListenerInterface.php b/src/Alchemy/BinaryDriver/Listeners/ListenerInterface.php
index 920a6d5..761da0b 100644
--- a/src/Alchemy/BinaryDriver/Listeners/ListenerInterface.php
+++ b/src/Alchemy/BinaryDriver/Listeners/ListenerInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -20,13 +21,15 @@ interface ListenerInterface extends EventEmitterInterface
      *
      * @param string $type The data type, one of Process::ERR, Process::OUT constants
      * @param string $data The output
+     *
+     * @return void
      */
-    public function handle($type, $data);
+    public function handle(string $type, string $data) : void;
 
     /**
      * An array of events that should be forwarded to BinaryInterface
      *
-     * @return array
+     * @return string[]
      */
-    public function forwardedEvents();
+    public function forwardedEvents() : array;
 }
diff --git a/src/Alchemy/BinaryDriver/Listeners/Listeners.php b/src/Alchemy/BinaryDriver/Listeners/Listeners.php
index 406d8ab..1b949cf 100644
--- a/src/Alchemy/BinaryDriver/Listeners/Listeners.php
+++ b/src/Alchemy/BinaryDriver/Listeners/Listeners.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 namespace Alchemy\BinaryDriver\Listeners;
 
@@ -30,7 +31,7 @@ public function __clone()
      *
      * @return ListenersInterface
      */
-    public function register(ListenerInterface $listener, EventEmitter $target = null)
+    public function register(ListenerInterface $listener, EventEmitter $target = null) : self
     {
         $EElisteners = [];
 
@@ -52,7 +53,7 @@ public function register(ListenerInterface $listener, EventEmitter $target = nul
      *
      * @throws InvalidArgumentException In case the listener is not registered
      */
-    public function unregister(ListenerInterface $listener)
+    public function unregister(ListenerInterface $listener) : self
     {
         if (!isset($this->storage[$listener])) {
             throw new InvalidArgumentException('Listener is not registered.');
@@ -67,7 +68,7 @@ public function unregister(ListenerInterface $listener)
         return $this;
     }
 
-    private function forwardEvents($source, $target, array $events)
+    private function forwardEvents(ListenerInterface $source, EventEmitter $target, array $events) : array
     {
         $EElisteners = [];
 
@@ -79,7 +80,7 @@ private function forwardEvents($source, $target, array $events)
         return $EElisteners;
     }
 
-    private function createListener($event, $target)
+    private function createListener(string $event, EventEmitter $target) : callable
     {
         return function () use ($event, $target) {
             $target->emit($event, func_get_args());
diff --git a/src/Alchemy/BinaryDriver/ProcessBuilderFactory.php b/src/Alchemy/BinaryDriver/ProcessBuilderFactory.php
index 2ca8689..dd7a57f 100644
--- a/src/Alchemy/BinaryDriver/ProcessBuilderFactory.php
+++ b/src/Alchemy/BinaryDriver/ProcessBuilderFactory.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -52,11 +53,11 @@ class ProcessBuilderFactory implements ProcessBuilderFactoryInterface
     /**
      * Constructor
      *
-     * @param String $binary The path to the binary
+     * @param string $binary The path to the binary
      *
      * @throws InvalidArgumentException In case binary path is invalid
      */
-    public function __construct($binary)
+    public function __construct(string $binary)
     {
         $this->detectEmulation();
 
@@ -91,17 +92,17 @@ public function setBuilder(ProcessBuilder $builder)
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
-    public function getBinary()
+    public function getBinary() : string
     {
         return $this->binary;
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
-    public function useBinary($binary)
+    public function useBinary(string $binary) : ProcessBuilderFactoryInterface
     {
         if (!is_executable($binary)) {
             throw new InvalidArgumentException(sprintf('`%s` is not an executable binary', $binary));
@@ -117,7 +118,7 @@ public function useBinary($binary)
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function setTimeout($timeout)
     {
@@ -131,7 +132,7 @@ public function setTimeout($timeout)
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function getTimeout()
     {
@@ -139,9 +140,9 @@ public function getTimeout()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
-    public function create($arguments = [])
+    public function create($arguments = []) : Process
     {
         if (null === $this->binary) {
             throw new InvalidArgumentException('No binary set');
diff --git a/src/Alchemy/BinaryDriver/ProcessBuilderFactoryAwareInterface.php b/src/Alchemy/BinaryDriver/ProcessBuilderFactoryAwareInterface.php
index 1398bb4..ae48739 100644
--- a/src/Alchemy/BinaryDriver/ProcessBuilderFactoryAwareInterface.php
+++ b/src/Alchemy/BinaryDriver/ProcessBuilderFactoryAwareInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -18,12 +19,12 @@ interface ProcessBuilderFactoryAwareInterface
      *
      * @return ProcessBuilderFactoryInterface
      */
-    public function getProcessBuilderFactory();
+    public function getProcessBuilderFactory() : ProcessBuilderFactoryInterface;
 
     /**
      * Set a process builder factory
      *
      * @param ProcessBuilderFactoryInterface $factory
      */
-    public function setProcessBuilderFactory(ProcessBuilderFactoryInterface $factory);
+    public function setProcessBuilderFactory(ProcessBuilderFactoryInterface $factory) : ProcessBuilderFactoryAwareInterface;
 }
diff --git a/src/Alchemy/BinaryDriver/ProcessBuilderFactoryInterface.php b/src/Alchemy/BinaryDriver/ProcessBuilderFactoryInterface.php
index cfa025f..fcb9d5e 100644
--- a/src/Alchemy/BinaryDriver/ProcessBuilderFactoryInterface.php
+++ b/src/Alchemy/BinaryDriver/ProcessBuilderFactoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -25,25 +26,25 @@ interface ProcessBuilderFactoryInterface
      *
      * @throws InvalidArgumentException
      */
-    public function create($arguments = []);
+    public function create($arguments = []) : Process;
 
     /**
      * Returns the path to the binary that is used
      *
-     * @return String
+     * @return string
      */
-    public function getBinary();
+    public function getBinary() : string;
 
     /**
      * Sets the path to the binary
      *
-     * @param String $binary A path to a binary
+     * @param string $binary A path to a binary
      *
      * @return ProcessBuilderFactoryInterface
      *
      * @throws InvalidArgumentException In case binary is not executable
      */
-    public function useBinary($binary);
+    public function useBinary(string $binary) : ProcessBuilderFactoryInterface;
 
     /**
      * Set the default timeout to apply on created processes.
diff --git a/src/Alchemy/BinaryDriver/ProcessRunner.php b/src/Alchemy/BinaryDriver/ProcessRunner.php
index 1bc2568..fc6676b 100644
--- a/src/Alchemy/BinaryDriver/ProcessRunner.php
+++ b/src/Alchemy/BinaryDriver/ProcessRunner.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -25,7 +26,7 @@ class ProcessRunner implements ProcessRunnerInterface
     /** @var string */
     private $name;
 
-    public function __construct(LoggerInterface $logger, $name)
+    public function __construct(LoggerInterface $logger, string $name)
     {
         $this->logger = $logger;
         $this->name = $name;
@@ -33,20 +34,16 @@ public function __construct(LoggerInterface $logger, $name)
 
     /**
      * @inheritDoc
-     *
-     * @return ProcessRunner
      */
-    public function setLogger(LoggerInterface $logger)
+    public function setLogger(LoggerInterface $logger) : void
     {
         $this->logger = $logger;
-
-        return $this;
     }
 
     /**
      * @return LoggerInterface
      */
-    public function getLogger()
+    public function getLogger() : LoggerInterface
     {
         return $this->logger;
     }
@@ -54,7 +51,7 @@ public function getLogger()
     /**
      * @inheritDoc
      */
-    public function run(Process $process, SplObjectStorage $listeners, $bypassErrors)
+    public function run(Process $process, SplObjectStorage $listeners, bool $bypassErrors = false) : string
     {
         $this->logger->info(sprintf(
             '%s running command %s',
@@ -80,7 +77,7 @@ public function run(Process $process, SplObjectStorage $listeners, $bypassErrors
                 $process->getErrorOutput()
             ));
 
-            return;
+            return "";
         } else {
             $this->logger->info(sprintf('%s executed command successfully', $this->name));
 
@@ -97,7 +94,12 @@ private function buildCallback(SplObjectStorage $listeners)
         };
     }
 
-    private function doExecutionFailure($command, \Exception $e = null)
+    /**
+     * @throws ExecutionFailureException
+     *
+     * @return void
+     */
+    private function doExecutionFailure(? string $command, \Throwable $e = null) : void
     {
         $this->logger->error(sprintf(
             '%s failed to execute command %s',
@@ -108,6 +110,6 @@ private function doExecutionFailure($command, \Exception $e = null)
             '%s failed to execute command %s',
             $this->name,
             $command
-        ), $e ? $e->getCode() : null, $e ? : null);
+        ), $e ? $e->getCode() : 0, $e);
     }
 }
diff --git a/src/Alchemy/BinaryDriver/ProcessRunnerAwareInterface.php b/src/Alchemy/BinaryDriver/ProcessRunnerAwareInterface.php
index 807c33e..eeb48ac 100644
--- a/src/Alchemy/BinaryDriver/ProcessRunnerAwareInterface.php
+++ b/src/Alchemy/BinaryDriver/ProcessRunnerAwareInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -18,12 +19,14 @@ interface ProcessRunnerAwareInterface
      *
      * @return ProcessRunnerInterface
      */
-    public function getProcessRunner();
+    public function getProcessRunner() : ProcessRunnerInterface;
 
     /**
      * Sets a process runner
      *
      * @param ProcessRunnerInterface $runner
+     *
+     * @return void
      */
-    public function setProcessRunner(ProcessRunnerInterface $runner);
+    public function setProcessRunner(ProcessRunnerInterface $runner) : void;
 }
diff --git a/src/Alchemy/BinaryDriver/ProcessRunnerInterface.php b/src/Alchemy/BinaryDriver/ProcessRunnerInterface.php
index d9fc81c..53cc4a3 100644
--- a/src/Alchemy/BinaryDriver/ProcessRunnerInterface.php
+++ b/src/Alchemy/BinaryDriver/ProcessRunnerInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -21,13 +22,13 @@ interface ProcessRunnerInterface extends LoggerAwareInterface
     /**
      * Executes a process, logs events
      *
-     * @param Process          $process
-     * @param SplObjectStorage $listeners    Some listeners
-     * @param bool          $bypassErrors Set to true to disable throwing ExecutionFailureExceptions
+     * @param Process           $process
+     * @param SplObjectStorage  $listeners    Some listeners
+     * @param bool              $bypassErrors Set to true to disable throwing ExecutionFailureExceptions
      *
      * @return string The Process output
      *
      * @throws ExecutionFailureException in case of process failure.
      */
-    public function run(Process $process, SplObjectStorage $listeners, $bypassErrors);
+    public function run(Process $process, SplObjectStorage $listeners, bool $bypassErrors) : string;
 }
diff --git a/tests/Alchemy/Tests/BinaryDriver/AbstractBinaryTest.php b/tests/Alchemy/Tests/BinaryDriver/AbstractBinaryTest.php
index efc19cf..df80c43 100644
--- a/tests/Alchemy/Tests/BinaryDriver/AbstractBinaryTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/AbstractBinaryTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Alchemy\Tests\BinaryDriver;
 
diff --git a/tests/Alchemy/Tests/BinaryDriver/AbstractProcessBuilderFactoryTest.php b/tests/Alchemy/Tests/BinaryDriver/AbstractProcessBuilderFactoryTest.php
index c030cdb..044f790 100644
--- a/tests/Alchemy/Tests/BinaryDriver/AbstractProcessBuilderFactoryTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/AbstractProcessBuilderFactoryTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Alchemy\Tests\BinaryDriver;
 
diff --git a/tests/Alchemy/Tests/BinaryDriver/ConfigurationTest.php b/tests/Alchemy/Tests/BinaryDriver/ConfigurationTest.php
index affeb4d..5e5c4cb 100644
--- a/tests/Alchemy/Tests/BinaryDriver/ConfigurationTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/ConfigurationTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Alchemy\Tests\BinaryDriver;
 
diff --git a/tests/Alchemy/Tests/BinaryDriver/Listeners/DebugListenerTest.php b/tests/Alchemy/Tests/BinaryDriver/Listeners/DebugListenerTest.php
index 3f48655..25d5df8 100644
--- a/tests/Alchemy/Tests/BinaryDriver/Listeners/DebugListenerTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/Listeners/DebugListenerTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Alchemy\Tests\BinaryDriver\Listeners;
 
diff --git a/tests/Alchemy/Tests/BinaryDriver/Listeners/ListenersTest.php b/tests/Alchemy/Tests/BinaryDriver/Listeners/ListenersTest.php
index 62a2d7f..ef8713b 100644
--- a/tests/Alchemy/Tests/BinaryDriver/Listeners/ListenersTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/Listeners/ListenersTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare (strict_types = 1);
 
 namespace Alchemy\Tests\BinaryDriver\Listeners;
 
@@ -81,13 +81,19 @@ public function testRegisterAndForwardThenUnregister()
 
 class MockListener extends EventEmitter implements ListenerInterface
 {
-    public function handle($type, $data)
+    /**
+     * @inheritDoc
+     */
+    public function handle(string $type, string $data) : void
     {
         $this->emit('received', array($type, $data));
     }
 
-    public function forwardedEvents()
+    /**
+     * @inheritDoc
+     */
+    public function forwardedEvents() : array
     {
-        return array('received');
+        return ['received'];
     }
 }
diff --git a/tests/Alchemy/Tests/BinaryDriver/NONLTSProcessBuilderFactoryTest.php b/tests/Alchemy/Tests/BinaryDriver/NONLTSProcessBuilderFactoryTest.php
index fe5f343..c84ed0e 100644
--- a/tests/Alchemy/Tests/BinaryDriver/NONLTSProcessBuilderFactoryTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/NONLTSProcessBuilderFactoryTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Alchemy\Tests\BinaryDriver;
 
diff --git a/tests/Alchemy/Tests/BinaryDriver/ProcessRunnerTest.php b/tests/Alchemy/Tests/BinaryDriver/ProcessRunnerTest.php
index fd8a30a..f9e154d 100644
--- a/tests/Alchemy/Tests/BinaryDriver/ProcessRunnerTest.php
+++ b/tests/Alchemy/Tests/BinaryDriver/ProcessRunnerTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare (strict_types = 1);
 
 /*
  * This file is part of Alchemy\BinaryDriver.
@@ -123,7 +123,7 @@ public function testRunfailingProcessBypassingErrors()
             ->expects($this->once())
             ->method('info');
 
-        $this->assertNull($runner->run($process, new \SplObjectStorage(), true));
+        $this->assertSame('', $runner->run($process, new \SplObjectStorage(), true));
     }
 
     public function testRunFailingProcessWithExceptionBypassingErrors()
@@ -146,7 +146,7 @@ public function testRunFailingProcessWithExceptionBypassingErrors()
             ->expects($this->once())
             ->method('info');
 
-        $this->assertNull($runner->run($process, new \SplObjectStorage(), true));
+        $this->assertSame('', $runner->run($process, new \SplObjectStorage(), true));
     }
 
     public function testRunSuccessFullProcessWithHandlers()
@@ -196,12 +196,18 @@ public function testRunSuccessFullProcessWithHandlers()
 
 class TestListener extends EventEmitter implements ListenerInterface
 {
-    public function handle($type, $data)
+    /**
+     * @inheritDoc
+     */
+    public function handle(string $type, string $data) : void
     {
-        return $this->emit('received', array($type, $data));
+        $this->emit('received', [$type, $data]);
     }
 
-    public function forwardedEvents()
+    /**
+     * @inheritDoc
+     */
+    public function forwardedEvents() : array
     {
         return [];
     }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b5e2aed..1909d18 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 $loader = require __DIR__.'/../vendor/autoload.php';
 $loader->add('Alchemy\Tests', __DIR__);