Started support for built in test server

Author: dantleech

bin/console

@@ -1,35 +1,10 @@
 #!/usr/bin/env php
 <?php
 
-$rootDir = realpath(__DIR__.'/../../../..');
-$vendorDir = realpath($rootDir.'/vendor');
-$phpUnitFile = $rootDir.'/phpunit.xml.dist';
-
-if (!file_exists($phpUnitFile)) {
-    throw new \Exception(sprintf(
-        'Cannot find phpunit.xml.dist file in "%s"',
-        $phpUnitFile
-    ));
-}
-
-$xml = new \SimpleXMLElement(file_get_contents($phpUnitFile));
-$kernelDir = $xml->php[0]->server[0]['value'];
-
-$kernelFile = $kernelDir.'/AppKernel.php';
-
-if (!file_exists($kernelFile)) {
-    throw new \Exception(sprintf(
-        'Cannot find kernel file "%s"',
-        $kernelFile
-    ));
-}
-
-require_once $vendorDir.'/symfony-cmf/testing/bootstrap/bootstrap.php';
-require_once $kernelFile;
+$kernel = include __DIR__.'/../bootstrap/kernel_bootstrap.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
-$kernel = new AppKernel('test', true);
 $application = new Application($kernel);
 $application->run();

bin/generate_functional.php

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

bin/server

@@ -2,26 +2,29 @@
 
 $vendorDir = realpath(__DIR__.'/../../..');
 
-$file = $vendorDir.'/autoload.php';
-
-if (!file_exists($file)) {
-    throw new RuntimeException('Cannot find "'.$file.'". Run "composer update --dev" to run test suite.');
+if (!$loader = include $vendorDir.'/autoload.php') {
+    $nl = PHP_SAPI === 'cli' ? PHP_EOL : '<br />';
+    echo "$nl$nl";
+    die('You must set up the project dependencies.'.$nl.
+        'Run the following commands in '.dirname(__DIR__).':'.$nl.$nl.
+        'curl -s http://getcomposer.org/installer | php'.$nl.
+        'php composer.phar install'.$nl);
 }
 
-require_once $file;
-
-if (!class_exists('Symfony\\Component\\ClassLoader\\UniversalClassLoader')) {
-    throw new RuntimeException('Run "composer update --dev" to run test suite. (You seem to have missed the --dev part.)');
-}
 
-use Symfony\Component\ClassLoader\UniversalClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
-
-$loader = new UniversalClassLoader();
-
 AnnotationRegistry::registerLoader(function($class) use ($loader) {
     $loader->loadClass($class);
-    return class_exists($class, false);
+
+    // this was class_exists($class, false) i.e. do not autoload.
+    // this is required so that custom annotations (e.g. TreeUiBundle
+    // annotations) are autoloaded - but they should be found by the
+    // composer loader above.
+    //
+    // This probably slows things down.
+    //
+    // @todo: Fix me.
+    return class_exists($class);
 });
 
 AnnotationRegistry::registerFile($vendorDir.'/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');

bootstrap/bootstrap.php

@@ -0,0 +1,28 @@
+<?php
+$rootDir = realpath(__DIR__.'/../../../..');
+$vendorDir = realpath($rootDir.'/vendor');
+$phpUnitFile = $rootDir.'/phpunit.xml.dist';
+
+if (!file_exists($phpUnitFile)) {
+    throw new \Exception(sprintf(
+        'Cannot find phpunit.xml.dist file in "%s"',
+        $phpUnitFile
+    ));
+}
+
+$xml = new \SimpleXMLElement(file_get_contents($phpUnitFile));
+$kernelDir = $xml->php[0]->server[0]['value'];
+
+$kernelFile = $rootDir.'/'.$kernelDir.'/AppKernel.php';
+
+if (!file_exists($kernelFile)) {
+    throw new \Exception(sprintf(
+        'Cannot find kernel file "%s"',
+        $kernelFile
+    ));
+}
+
+require_once $vendorDir.'/symfony-cmf/testing/bootstrap/bootstrap.php';
+require_once $kernelFile;
+
+return new AppKernel('test', true);

bootstrap/kernel_bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+
+use Symfony\Component\HttpFoundation\Request;
+
+$kernel = include __DIR__.'/../../bootstrap/kernel_bootstrap.php';
+$kernel->loadClassCache();
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);

resources/web/app_test.php

@@ -0,0 +1,7 @@
+<?php
+
+$_SERVER['DOCUMENT_ROOT'] = __DIR__;
+$_SERVER['SCRIPT_FILENAME'] = __DIR__.DIRECTORY_SEPARATOR.'app_test.php';
+
+require 'app_test.php';
+