Added super simple Drupal adapter.

Fixed also some double autoloading issues.

Author: marcj

Bootstraps/Drupal.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace PHPPM\Bootstraps;
+
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\Site\Settings;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * A PHP-PM bootstrap for the Drupal framework.
+ *
+ * @see \PHPPM\Bootstraps\Symfony
+ * @see \PHPPM\Bridges\HttpKernel
+ */
+class Drupal implements BootstrapInterface
+{
+    /**
+     * The PHP environment in which to bootstrap (such as 'dev' or 'production').
+     *
+     * @var string|null
+     */
+    protected $appenv;
+
+    /**
+     * @var boolean
+     */
+    protected $debug;
+
+    /**
+     * Instantiate the bootstrap, storing the $appenv.
+     */
+    public function __construct($appenv, $debug)
+    {
+        $this->appenv = $appenv;
+        $this->debug = $debug;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStaticDirectory() {
+        return './';
+    }
+
+    /**
+     * Create a Drupal application.
+     */
+    public function getApplication()
+    {
+        //load drupals autoload.php, so their classes are available
+        $autoloader = require './vendor/autoload.php';
+
+        $sitePath = 'sites/default';
+
+        Settings::initialize('./', $sitePath, $autoloader);
+
+        $app = new DrupalKernel($this->appenv, $autoloader);
+        $app->setSitePath($sitePath);
+
+        return $app;
+    }
+}

Bootstraps/Laravel.php

@@ -37,6 +37,13 @@ public function __construct($appenv, $debug)
         putenv("APP_DEBUG=" . ($debug ? 'TRUE' : 'FALSE'));
     }
 
+    /**
+     * @return string
+     */
+    public function getStaticDirectory() {
+        return 'public/';
+    }
+
     /**
      * Create a Laravel application
      */

Bootstraps/Symfony.php

@@ -27,18 +27,27 @@ public function __construct($appenv, $debug)
         $this->debug = $debug;
     }
 
+    /**
+     * @return string
+     */
+    public function getStaticDirectory() {
+        return 'web/';
+    }
+
     /**
      * Create a Symfony application
      * @return SymfonyAppKernel
      */
     public function getApplication()
     {
-        if (file_exists('./app/AppKernel.php')) {
-            require_once './app/AppKernel.php';
+        // include applications autoload
+        $appAutoLoader = './app/autoload.php';
+        if (file_exists($appAutoLoader)) {
+            require $appAutoLoader;
+        } else {
+            require './vendor/autoload.php';
         }
 
-        $this->includeAutoload();
-
         $app = new SymfonyAppKernel($this->appenv, $this->debug); //which extends \AppKernel
         $app->loadClassCache();
         $app->boot();
@@ -50,22 +59,4 @@ public function getApplication()
 
         return $app;
     }
-
-    /**
-     * Includes the autoload file from the app directory, if available.
-     *
-     * The Symfony standard edition configures the annotation class loading
-     * in that file.
-     * The alternative bootstrap.php.cache cannot be included as that leads
-     * to "Cannot redeclare class" error, when starting php-pm.
-     */
-    protected function includeAutoload()
-    {
-        $info = new \ReflectionClass('AppKernel');
-        $appDir = dirname($info->getFileName());
-        $symfonyAutoload = $appDir . '/autoload.php';
-        if (is_file($symfonyAutoload)) {
-            require_once $symfonyAutoload;
-        }
-    }
 }

Bridges/HttpKernel.php

@@ -20,6 +20,11 @@ class HttpKernel implements BridgeInterface
      */
     protected $application;
 
+    /**
+     * @var BootstrapInterface
+     */
+    protected $bootstrap;
+
     /**
      * Bootstrap an application implementing the HttpKernelInterface.
      *
@@ -37,18 +42,12 @@ class HttpKernel implements BridgeInterface
      */
     public function bootstrap($appBootstrap, $appenv, $debug)
     {
-        // include applications autoload
-        $autoloader = './vendor/autoload.php';
-        if (file_exists($autoloader)) {
-            require_once $autoloader;
-        }
-
         $appBootstrap = $this->normalizeAppBootstrap($appBootstrap);
 
-        $bootstrap = new $appBootstrap($appenv, $debug);
+        $this->bootstrap = new $appBootstrap($appenv, $debug);
 
-        if ($bootstrap instanceof BootstrapInterface) {
-            $this->application = $bootstrap->getApplication();
+        if ($this->bootstrap instanceof BootstrapInterface) {
+            $this->application = $this->bootstrap->getApplication();
         }
     }
 
@@ -57,7 +56,7 @@ public function bootstrap($appBootstrap, $appenv, $debug)
      */
     public function getStaticDirectory()
     {
-        return 'web/';
+        return $this->bootstrap->getStaticDirectory();
     }
 
     /**
@@ -186,13 +185,17 @@ protected static function mapResponse(HttpResponse $reactResponse, SymfonyRespon
     protected function normalizeAppBootstrap($appBootstrap)
     {
         $appBootstrap = str_replace('\\\\', '\\', $appBootstrap);
-        if (false === class_exists($appBootstrap)) {
-            $appBootstrap = '\\' . $appBootstrap;
-            if (false === class_exists($appBootstrap)) {
-                throw new \RuntimeException('Could not find bootstrap class ' . $appBootstrap);
+
+        $bootstraps = [
+            $appBootstrap,
+            '\\' . $appBootstrap,
+            '\\PHPPM\Bootstraps\\' . ucfirst($appBootstrap)
+        ];
+
+        foreach ($bootstraps as $class) {
+            if (class_exists($class)) {
+                return $class;
             }
-            return $appBootstrap;
         }
-        return $appBootstrap;
     }
 }