Improve testing

Author: Marco Bunge

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Hawkbit Changelog
 
+## 2.1.1
+
+ - Add tests for controller constructor injection
+
 ## 2.1.0
 
 ### Fixed

README.md

@@ -267,6 +267,8 @@ $app->get('/', 'HomeController::index'); // calls index method on HomeController
 $app->run();
 ```
 
+*Please use boot method in Service Providers for correct injection of services into controller!*
+
 ```php
 <?php
 

composer.json

@@ -25,14 +25,14 @@
     }
   ],
   "require": {
-    "php": ">=5.5",
-    "filp/whoops": "~2.0",
-    "league/route": "dev-master#507606b53d3935e7830aa7c48c43337bc2b1b2ba",
-    "league/container": "~2.0",
-    "league/event": "~2.1",
-    "monolog/monolog": "~1.12",
+    "php": ">=5.5.9",
+    "filp/whoops": "^2.1",
+    "league/route": "dev-master#507606b53d3935e7830aa7c48c43337bc2b1b2ba@dev",
+    "league/container": "^2.2",
+    "league/event": "^2.1",
+    "monolog/monolog": "^1.22",
     "zendframework/zend-config": "^2.6",
-    "zendframework/zend-diactoros": "~1.3"
+    "zendframework/zend-diactoros": "^1.3"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.8",

tests/ServiceProviderTest.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 02.01.2017
+ * Time: 09:01
+ */
+
+namespace Hawkbit\Tests;
+
+
+
+use Hawkbit\Application;
+use Hawkbit\Tests\TestAsset\SingletonDummy;
+use Hawkbit\Tests\TestAsset\InjectableController;
+use Hawkbit\Tests\TestAsset\TestServiceProvider;
+use Zend\Diactoros\ServerRequestFactory;
+
+class ServiceProviderTest extends \PHPUnit_Framework_TestCase
+{
+
+
+    public function testGetSingleton()
+    {
+        $app = new Application();
+        $app->register(TestServiceProvider::class);
+
+        /** @var SingletonDummy $dummy */
+        $dummy = $app[SingletonDummy::class];
+
+        $this->assertInstanceOf(SingletonDummy::class, $dummy);
+        $this->assertEquals('singleton', $dummy->getValue());
+    }
+
+    public function testGetInjectedSingleton()
+    {
+        $app = new Application([
+            Application::KEY_ERROR => true,
+            Application::KEY_ERROR_CATCH => false,
+        ]);
+
+        $app->register(TestServiceProvider::class);
+
+        $app->get('/', [InjectableController::class, 'getIndex']);
+
+        $response = $app->handle(ServerRequestFactory::fromGlobals());
+
+        $this->assertEquals('singleton', $response->getBody()->__toString());
+
+
+    }
+}

tests/TestAsset/Dummy.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 02.01.2017
+ * Time: 09:02
+ */
+
+namespace Hawkbit\Tests\TestAsset;
+
+
+class sDummy
+{
+    private $value;
+
+    /**
+     * Dummy constructor.
+     * @param $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+}

tests/TestAsset/InjectableController.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * The Turbine Micro Framework. An advanced derivate of Proton Micro Framework
+ *
+ * @author Marco Bunge <marco_bunge@web.de>
+ * @author Alex Bilbie <hello@alexbilbie.com>
+ * @copyright Marco Bunge <marco_bunge@web.de>
+ *
+ * @license MIT
+ */
+
+namespace Hawkbit\Tests\TestAsset;
+
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * @codeCoverageIgnore
+ */
+class InjectableController
+{
+    /**
+     * @var SingletonDummy
+     */
+    private $dummy;
+
+    /**
+     * TestInjectableController constructor.
+     * @param SingletonDummy $dummy
+     */
+    public function __construct(SingletonDummy $dummy)
+    {
+        $this->dummy = $dummy;
+    }
+
+    public function getIndex(ServerRequestInterface $request, ResponseInterface $response, array $args = [])
+    {
+        $response->getBody()->write($this->dummy->getValue());
+        return $response;
+    }
+}

tests/TestAsset/SingletonDummy.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 02.01.2017
+ * Time: 09:02
+ */
+
+namespace Hawkbit\Tests\TestAsset;
+
+
+class SingletonDummy
+{
+    private $value;
+
+    /**
+     * Dummy constructor.
+     * @param $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+}

tests/TestAsset/TestServiceProvider.php

@@ -13,11 +13,12 @@
 
 
 use League\Container\ServiceProvider\AbstractServiceProvider;
+use League\Container\ServiceProvider\BootableServiceProviderInterface;
 
-class TestServiceProvider extends AbstractServiceProvider
+class TestServiceProvider extends AbstractServiceProvider implements BootableServiceProviderInterface
 {
 
-    protected $provides= [
+    protected $provides = [
         'TestService'
     ];
 
@@ -32,4 +33,15 @@ public function register()
     {
         $this->getContainer()->add('TestService', new \stdClass);
     }
+
+    /**
+     * Method will be invoked on registration of a service provider implementing
+     * this interface. Provides ability for eager loading of Service Providers.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->getContainer()->share(SingletonDummy::class, new SingletonDummy('singleton'));
+    }
 }