Merge branch '2.0' of github.com:Codeception/Codeception into 2.0

Author: DavertMik

CHANGELOG.md

@@ -10,7 +10,7 @@
   * Added `getApplication()` method
   * Added `seeFormHasErrors()`, `seeFormErrorMessages(array $bindings)` and `seeFormErrorMessage($key, $errorMessage)` methods
   * Deprecated `seeSessionHasErrors()` and `seeSessionErrorMessage(array $bindings)` methods.
-* fixed stderr tput messages in PHPStorm console *2015-04-26*
+* fixed stderr output messages in PHPStorm console *2015-04-26*
 
 #### 2.0.13
 

src/Codeception/Lib/Connector/Laravel4.php

@@ -1,69 +1,177 @@
 <?php
 namespace Codeception\Lib\Connector;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Application;
+use Symfony\Component\BrowserKit\Request as BrowserKitRequest;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Client;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\TerminableInterface;
 
-class Laravel4 extends Client implements HttpKernelInterface, TerminableInterface
+class Laravel4 extends Client
 {
 
     /**
-     * @var Application
+     * @var \Illuminate\Foundation\Application
      */
     private $app;
 
     /**
-     * @var HttpKernelInterface
+     * @var \Codeception\Module\Laravel4
      */
-    private $httpKernel;
+    private $module;
 
     /**
      * Constructor.
      *
-     * @param Application $app
+     * @param \Codeception\Module\Laravel4 $module
      */
-    public function  __construct(Application $app)
+    public function  __construct($module)
     {
-        $this->app = $app;
-        $this->app->boot();
-        $this->httpKernel = $this->getStackedClient();
+        $this->module = $module;
+        $this->initialize();
 
-        parent::__construct($this);
+        parent::__construct($this->kernel);
+
+        // Parent constructor defaults to not following redirects
+        $this->followRedirects(true);
     }
 
     /**
-     * Handle a request.
-     *
      * @param Request $request
-     * @param int $type
-     * @param bool $catch
      * @return Response
      */
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    protected function doRequest($request)
     {
-        // Populate the $errors object of the view. Normally this is done in the ViewServiceProvider,
-        // but the ViewServiceProvider is executed before the session data is loaded
-        // in the /Illuminate/Session/Middleware class.
-        if ($this->app['session.store']->has('errors')) {
-            $this->app['view']->share('errors', $this->app['session.store']->get('errors'));
-        }
+        $this->initialize();
 
-        return $this->httpKernel->handle($request);
+        return $this->kernel->handle($request);
     }
 
     /**
-     * Terminates a request/response cycle.
+     * @param BrowserKitRequest $request
+     * @return Request
+     */
+    protected function filterRequest(BrowserKitRequest $request)
+    {
+        $request = parent::filterRequest($request);
+
+        return $this->addSessionCookiesToRequest($request);
+    }
+
+    /**
+     * Initialize the Laravel Framework.
      *
+     * @throws ModuleConfig
+     */
+    private function initialize()
+    {
+        // Store a reference to the database object
+        // so the database connection can be reused during tests
+        $oldDb = null;
+        if ($this->app['db'] && $this->app['db']->connection()) {
+            $oldDb = $this->app['db'];
+        }
+
+        $this->app = $this->loadApplication();
+        $this->kernel = $this->getStackedClient();
+        $this->app->boot();
+
+        // Reset the booted flag of the Application object
+        // so the app will be booted again if it receives a new Request
+        $property = new \ReflectionProperty(get_class($this->app), 'booted');
+        $property->setAccessible(true);
+        $property->setValue($this->app, false);
+
+        if ($oldDb) {
+            $this->app['db'] = $oldDb;
+            Model::setConnectionResolver($this->app['db']);
+        }
+
+        $this->module->setApplication($this->app);
+    }
+
+    /**
+     * Boot the Laravel application object.
+     * @return Application
+     * @throws ModuleConfig
+     */
+    protected function loadApplication()
+    {
+
+        $projectDir = explode('workbench', \Codeception\Configuration::projectDir())[0];
+        $projectDir .= $this->module->config['root'];
+        require $projectDir . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+        \Illuminate\Support\ClassLoader::register();
+
+        if (is_dir($workbench = $projectDir . 'workbench')) {
+            \Illuminate\Workbench\Starter::start($workbench);
+        }
+
+        $startFile = $projectDir . $this->module->config['start'];
+
+        if (! file_exists($startFile)) {
+            throw new ModuleConfig(
+                $this, "Laravel bootstrap start.php file not found in $startFile.\nPlease provide a valid path to it using 'start' config param. "
+            );
+        }
+
+        // The following two variables are used in the Illuminate/Foundation/start.php file
+        // which is included in the bootstrap start file.
+        $unitTesting = $this->module->config['unit'];
+        $testEnvironment = $this->module->config['environment'];
+
+        $app = require $startFile;
+        $this->setConfiguredSessionDriver($app);
+
+        return $app;
+    }
+
+    /**
      * @param Request $request
-     * @param Response $response
+     * @return Request
+     */
+    private function addSessionCookiesToRequest(Request $request)
+    {
+        $session = $this->app['session'];
+        $sessionIsPersistent = ! in_array($session->getSessionConfig()['driver'], array(null, 'array'));
+
+        if ($sessionIsPersistent) {
+            $encryptedSessionId = $this->app['encrypter']->encrypt($session->getId());
+            $request->cookies->add([$session->getName() => $encryptedSessionId]);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Get the configured session driver.
+     * Laravel 4 forces the array session driver if the application is run from the console.
+     * This happens in \Illuminate\Session\SessionServiceProvider::setupDefaultDriver() method.
+     * This method is used to set the correct session driver that is configured in the config files.
+     *
+     * @param Application $app
      */
-    public function terminate(Request $request, Response $response)
+    private function setConfiguredSessionDriver(Application $app)
     {
-        $this->httpKernel->terminate($request, $response);
+        $configDir = $app['path'] . DIRECTORY_SEPARATOR . 'config';
+        $configFiles = array(
+            $configDir . DIRECTORY_SEPARATOR . $this->module->config['environment'] . DIRECTORY_SEPARATOR . 'session.php',
+            $configDir . DIRECTORY_SEPARATOR . 'session.php',
+
+        );
+
+        foreach ($configFiles as $configFile) {
+            if (file_exists($configFile)) {
+                $sessionConfig = require $configFile;
+
+                if (is_array($sessionConfig) && isset($sessionConfig['driver'])) {
+                    $app['config']['session.driver'] = $sessionConfig['driver'];
+                    break;
+                }
+            }
+        }
     }
 
     /**
@@ -72,7 +180,7 @@ public function terminate(Request $request, Response $response)
      * @see Illuminate\Foundation\Application::getStackedClient()
      * @return \Stack\StackedHttpKernel
      */
-    protected function getStackedClient()
+    private function getStackedClient()
     {
         $method = new \ReflectionMethod(get_class($this->app), 'getStackedClient');
         $method->setAccessible(true);