Merge pull request #2 from dutekvejin/improvement/strict-typing

Missing strict types
nikolaposa · Jun 23, 2017 · 26ae3ea · 26ae3ea
2 parents 8c6b84b + 5a8ee38
commit 26ae3ea
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/src/Bootstrap/Bootstrap.php b/src/Bootstrap/Bootstrap.php
@@ -49,7 +49,7 @@ public function __construct(ConfigLoaderInterface $configLoader, DiContainerFact
         $this->diContainerFactory = $diContainerFactory;
     }
 
-    public function __invoke()
+    public function __invoke() : ContainerInterface
     {
         $this->loadConfig();
         $this->buildDiContainer();

diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -19,7 +19,7 @@
  */
 class Config extends ArrayObject
 {
-    public static function fromArray(array $config)
+    public static function fromArray(array $config) : Config
     {
         return new self($config);
     }

diff --git a/src/Di/Container/Factory/AbstractFactory.php b/src/Di/Container/Factory/AbstractFactory.php
@@ -49,11 +49,11 @@ public function __invoke(Config $config) : ContainerInterface
         return $container;
     }
 
-    abstract protected function createContainer();
+    abstract protected function createContainer() : ContainerInterface;
 
-    abstract protected function configure($container);
+    abstract protected function configure(ContainerInterface $container);
 
-    final protected function getConfig()
+    final protected function getConfig() : Config
     {
         return $this->config;
     }

diff --git a/src/Di/Container/Factory/AuraDiFactory.php b/src/Di/Container/Factory/AuraDiFactory.php
@@ -14,6 +14,7 @@
 
 use Aura\Di\Container;
 use Aura\Di\ContainerBuilder;
+use Interop\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>
@@ -25,12 +26,12 @@ final class AuraDiFactory extends AbstractFactory
      */
     protected $container;
 
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return (new ContainerBuilder())->newInstance();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         $this->container = $container;
 

diff --git a/src/Di/Container/Factory/PimpleFactory.php b/src/Di/Container/Factory/PimpleFactory.php
@@ -12,6 +12,7 @@
 
 namespace Phoundation\Di\Container\Factory;
 
+use Interop\Container\ContainerInterface;
 use Xtreamwayz\Pimple\Container;
 
 /**
@@ -24,12 +25,12 @@ final class PimpleFactory extends AbstractFactory
      */
     private $container;
 
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return new Container();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         $this->container = $container;
 

diff --git a/src/Di/Container/Factory/ZendServiceManagerFactory.php b/src/Di/Container/Factory/ZendServiceManagerFactory.php
@@ -12,19 +12,20 @@
 
 namespace Phoundation\Di\Container\Factory;
 
+use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\ServiceManager;
 
 /**
  * @author Nikola Posa <[email protected]>
  */
 final class ZendServiceManagerFactory extends AbstractFactory
 {
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return new ServiceManager();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         /* @var $container ServiceManager */