Test default container factory

pennyphp · Oct 2, 2015 · 7455612 · 7455612
1 parent b1b5eed
commit 7455612
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/App.php b/src/App.php
@@ -43,7 +43,10 @@ class App
      */
     public function __construct(ContainerInterface $container = null)
     {
-        $this->container = $container ?: Container\PHPDiFactory::buildContainer(Loader::load());
+        if ($container === null) {
+            $container = Container\PHPDiFactory::buildContainer(Loader::load());
+        }
+        $this->container = $container;
 
         if ($container->has('router') == false) {
             throw new Exception('Define router config');

diff --git a/src/Container/PHPDiFactory.php b/src/Container/PHPDiFactory.php
@@ -21,8 +21,8 @@ public static function buildContainer($config = [])
         $builder->useAnnotations(true);
         $builder->addDefinitions(
             [
-                "event_manager" =>  DI\object('Zend\EventManager\EventManager'),
-                "dispatcher" => DI\object('GianArb\Penny\Dispatcher')
+                'event_manager' =>  DI\object('Zend\EventManager\EventManager'),
+                'dispatcher' => DI\object('GianArb\Penny\Dispatcher')
                     ->constructor(DI\get('router')),
             ]
         );

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -179,7 +179,21 @@ public function testDispatcherShouldBeCallable()
         });
         $config['dispatcher'] = new \StdClass();
 
-        $app = new App(App::buildContainer($config));
+        $app = new App(Container\PHPDiFactory::buildContainer($config));
         $app->run($request, $response);
     }
+
+    public function testWithInternalContainerFactory()
+    {
+        chdir(dirname(__DIR__.'/../'));
+        $app = new App();
+
+        $request = (new Request())
+        ->withUri(new Uri('/'))
+        ->withMethod('GET');
+        $response = new Response();
+
+        $response = $app->run($request, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+    }
 }
diff --git a/tests/config/app.test.config.php b/tests/config/app.test.config.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'router' => \FastRoute\simpleDispatcher(function (FastRoute\RouteCollector $r) {
+        $r->addRoute('GET', '/', ['TestApp\Controller\Index', 'index']);
+    })
+];