Add usage of ApplicationEnvironmentAwareInterface (#50)

Author: maciejmrozinski

Bootstraps/Drupal.php

@@ -12,7 +12,7 @@
  * @see \PHPPM\Bootstraps\Symfony
  * @see \PHPPM\Bridges\HttpKernel
  */
-class Drupal implements BootstrapInterface
+class Drupal implements BootstrapInterface, ApplicationEnvironmentAwareInterface
 {
     /**
      * The PHP environment in which to bootstrap (such as 'dev' or 'production').
@@ -27,9 +27,12 @@ class Drupal implements BootstrapInterface
     protected $debug;
 
     /**
-     * Instantiate the bootstrap, storing the $appenv.
+     * Instantiate the bootstrap, storing the $appenv
+     *
+     * @param $appenv
+     * @param $debug
      */
-    public function __construct($appenv, $debug)
+    public function initialize($appenv, $debug)
     {
         $this->appenv = $appenv;
         $this->debug = $debug;

Bootstraps/Laravel.php

@@ -5,7 +5,8 @@
 /**
  * A default bootstrap for the Laravel framework
  */
-class Laravel implements BootstrapInterface, HooksInterface, RequestClassProviderInterface
+class Laravel implements BootstrapInterface, HooksInterface, RequestClassProviderInterface,
+    ApplicationEnvironmentAwareInterface
 {
     /**
      * @var string|null The application environment
@@ -26,9 +27,11 @@ class Laravel implements BootstrapInterface, HooksInterface, RequestClassProvide
 
     /**
      * Instantiate the bootstrap, storing the $appenv
+     *
      * @param string|null $appenv The environment your application will use to bootstrap (if any)
+     * @param $debug
      */
-    public function __construct($appenv, $debug)
+    public function initialize($appenv, $debug)
     {
         $this->appenv = $appenv;
         $this->debug = $debug;

Bootstraps/Symfony.php

@@ -9,7 +9,7 @@
 /**
  * A default bootstrap for the Symfony framework
  */
-class Symfony implements BootstrapInterface, HooksInterface
+class Symfony implements BootstrapInterface, HooksInterface, ApplicationEnvironmentAwareInterface
 {
     /**
      * @var string|null The application environment
@@ -23,8 +23,11 @@ class Symfony implements BootstrapInterface, HooksInterface
 
     /**
      * Instantiate the bootstrap, storing the $appenv
+     *
+     * @param $appenv
+     * @param $debug
      */
-    public function __construct($appenv, $debug)
+    public function initialize($appenv, $debug)
     {
         $this->appenv = $appenv;
         $this->debug = $debug;

Bridges/HttpKernel.php

@@ -2,6 +2,7 @@
 
 namespace PHPPM\Bridges;
 
+use PHPPM\Bootstraps\ApplicationEnvironmentAwareInterface;
 use PHPPM\Bootstraps\BootstrapInterface;
 use PHPPM\Bootstraps\HooksInterface;
 use PHPPM\Bootstraps\RequestClassProviderInterface;
@@ -47,7 +48,10 @@ public function bootstrap($appBootstrap, $appenv, $debug)
     {
         $appBootstrap = $this->normalizeAppBootstrap($appBootstrap);
 
-        $this->bootstrap = new $appBootstrap($appenv, $debug);
+        $this->bootstrap = new $appBootstrap();
+        if ($this->bootstrap instanceof ApplicationEnvironmentAwareInterface) {
+            $this->bootstrap->initialize($appenv, $debug);
+        }
         if ($this->bootstrap instanceof BootstrapInterface) {
             $this->application = $this->bootstrap->getApplication();
         }