Merge pull request #4 from Codeception/develop

Fixed replacing service in DI from functional test not working

Author: ruudboon

src/Codeception/Module/Phalcon4.php

@@ -165,25 +165,7 @@ public function _before(TestInterface $test)
             $this->di['db']->begin();
             $this->debugSection('Database', 'Transaction started');
         }
-
-        // localize
-        $bootstrap = $this->bootstrapFile;
-        $this->client->setApplication(function () use ($bootstrap) {
-            $currentDi = Di::getDefault();
-            /** @noinspection PhpIncludeInspection */
-            $application = require $bootstrap;
-            $di = $application->getDI();
-            if ($currentDi->has('db')) {
-                $di['db'] = $currentDi['db'];
-            }
-            if ($currentDi->has('session')) {
-                $di['session'] = $currentDi['session'];
-            }
-            if ($di->has('cookies')) {
-                $di['cookies']->useEncryption(false);
-            }
-            return $application;
-        });
+        $this->client->setApplication($application);
     }
 
     /**

tests/_data/App/Controllers/DatetimeController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Controllers;
+
+use Phalcon\Mvc\Controller;
+
+class DatetimeController extends Controller
+{
+    public function indexAction()
+    {
+        echo "class: " . get_class($this->getDI()->get('datetime'));
+    }
+
+    public function splAction()
+    {
+        echo spl_object_hash($this->getDI());
+    }
+}

tests/_data/bootstrap.php

@@ -97,11 +97,27 @@ function ($view) use ($di) {
 });
 
 
+$di->set('datetime', function () {
+    return new DateTime();
+});
+
+
 $router = $di->getRouter();
 
 $router->add('/', [
     'controller' => 'App\Controllers\Index',
     'action'     => 'index'
 ])->setName('front.index');
 
+$router->add('/datetime', [
+    'controller' => 'App\Controllers\Datetime',
+    'action'     => 'index'
+])->setName('front.datetime');
+
+$router->add('/datetime/spl', [
+    'controller' => 'App\Controllers\Datetime',
+    'action'     => 'spl'
+])->setName('front.spl');
+
+
 return new Application($di);

tests/unit/Phalcon4ModuleTest.php

@@ -150,6 +150,30 @@ public function testContainerMethods()
         $module->_after($test);
     }
 
+    public function testReplaceService()
+    {
+        $module = $this->getPhalconModule();
+        $test = new Codeception\Test\Unit();
+        $module->_before($test);
+        $diHash = spl_object_hash($module->di);
+
+        $datetime = $module->grabServiceFromContainer('datetime');
+        $this->assertInstanceOf('DateTime', $datetime);
+        $this->assertEquals($diHash, spl_object_hash($module->di));
+
+        $std = $module->addServiceToContainer('datetime', function () {
+            return new \stdClass();
+        }, false);
+        $this->assertInstanceOf('stdClass', $std);
+        $this->assertInstanceOf('stdClass', $module->grabServiceFromContainer('datetime'));
+        $this->assertEquals($diHash, spl_object_hash($module->di));
+        $module->amOnPage('/datetime/spl');
+        $module->see($diHash);
+        $module->amOnPage('/datetime');
+        $module->see('class: stdClass');
+        $module->_after($test);
+    }
+
     public function testRoutes()
     {
         $module = $this->getPhalconModule();