Merge pull request #21 from symfony-cmf/fix_server_run_regression

Quick fix for SHTB (self-hosting test bundle)  server run regression

Author: lsmith77

bin/console

@@ -1,9 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-$rootDir = realpath(__DIR__.'/../../../..');
-$vendorDir = realpath($rootDir.'/vendor');
-require_once $vendorDir.'/symfony-cmf/testing/bootstrap/bootstrap.php';
+require_once __DIR__.'/../bootstrap/bootstrap.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;

bin/server

@@ -1,16 +1,22 @@
 #!/usr/bin/env php
 <?php
 
-$kernel = include __DIR__.'/../bootstrap/kernel_bootstrap.php';
+require_once __DIR__.'/../bootstrap/bootstrap.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\ArgvInput;
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), 'phpcr');
 
 $input = new ArrayInput(array(
     'server:run',
     '--router' => CMF_TEST_ROOT_DIR.'/resources/web/router.php',
     '--docroot' => CMF_TEST_ROOT_DIR.'/resources/web',
 ));
 
+$kernel = include __DIR__.'/../bootstrap/kernel_bootstrap.php';
+
 $application = new Application($kernel);
 $application->run($input);

bootstrap/kernel_bootstrap.php

@@ -1,5 +1,6 @@
 <?php
 
+$rootDir = realpath(__DIR__.'/../../../..');
 $phpUnitFile = $rootDir.'/phpunit.xml.dist';
 
 if (!file_exists($phpUnitFile)) {

resources/web/app_test.php

@@ -5,9 +5,14 @@
 ini_set('display_errors', 'On');
 error_reporting(E_ALL);
 
+require_once __DIR__.'/../../bootstrap/bootstrap.php';
+
+$request = Request::createFromGlobals();
+$env = $request->query->get('env', 'phpcr');
+$request->query->remove('env');
+
 $kernel = include __DIR__.'/../../bootstrap/kernel_bootstrap.php';
 $kernel->loadClassCache();
-$request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();
 $kernel->terminate($request, $response);