From 19d66267e724f1125b0ddd6f3c1761c0801ef879 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 11:57:31 -0700
Subject: [PATCH 1/6] Add class_loader variable

---
 bin/console | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/console b/bin/console
index e8ba8b506..d3eae607a 100755
--- a/bin/console
+++ b/bin/console
@@ -1,9 +1,9 @@
 #!/usr/bin/env php
 <?php
 if (file_exists(__DIR__ . '/../../../core/vendor/autoload.php')) {
-  require __DIR__ . '/../../../core/vendor/autoload.php';
+  $class_loader = require __DIR__ . '/../../../core/vendor/autoload.php';
 } else {
-  require __DIR__ . '/../vendor/autoload.php';
+  $class_loader = require __DIR__ . '/../vendor/autoload.php';
 }
 
 require __DIR__ . '/console.php';

From 467d167696de8d75c4a5229fb3065128bf8cce28 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 12:00:18 -0700
Subject: [PATCH 2/6] Pass class_loader to KernelHelper as argument

---
 bin/console.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/console.php b/bin/console.php
index bd602dc59..81de60e55 100644
--- a/bin/console.php
+++ b/bin/console.php
@@ -21,7 +21,7 @@
 $application->setHelperSet(new HelperSet(array(
   'bootstrap' => new DrupalBootstrapHelper(),
   'finder' => new BootstrapFinderHelper(new Finder()),
-  'kernel' => new KernelHelper(),
+  'kernel' => new KernelHelper($class_loader),
   'shell' => new ShellHelper(new Shell($application)),
   'dialog' => new DialogHelper(),
   'formatter' => new FormatterHelper(),

From 5f0c6c67539ef818434d5ab1cba5aa86542f98a9 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 12:02:01 -0700
Subject: [PATCH 3/6] Add class_loader property to KernelHelper

---
 src/Command/Helper/KernelHelper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Command/Helper/KernelHelper.php b/src/Command/Helper/KernelHelper.php
index bfecb8986..a988e4d63 100644
--- a/src/Command/Helper/KernelHelper.php
+++ b/src/Command/Helper/KernelHelper.php
@@ -13,6 +13,8 @@
 
 class KernelHelper extends Helper
 {
+  private $class_loader;
+  
   /**
    * @var DrupalKernel
    */

From 61bb366faf9c15718b6c95b89b1b67d53075e69f Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 12:02:41 -0700
Subject: [PATCH 4/6] Add __construct to KernelHelper

---
 src/Command/Helper/KernelHelper.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Command/Helper/KernelHelper.php b/src/Command/Helper/KernelHelper.php
index a988e4d63..544fe2d44 100644
--- a/src/Command/Helper/KernelHelper.php
+++ b/src/Command/Helper/KernelHelper.php
@@ -14,7 +14,11 @@
 class KernelHelper extends Helper
 {
   private $class_loader;
-  
+
+  function __construct($class_loader){
+    $this->class_loader = $class_loader;
+  }
+
   /**
    * @var DrupalKernel
    */

From 6595ab074fc362cb5b45228585b69631b1c94c92 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 12:12:00 -0700
Subject: [PATCH 5/6] Pass class_loader to DrupalKernel as argument

---
 src/Command/Helper/KernelHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Command/Helper/KernelHelper.php b/src/Command/Helper/KernelHelper.php
index 544fe2d44..4b76cfa5f 100644
--- a/src/Command/Helper/KernelHelper.php
+++ b/src/Command/Helper/KernelHelper.php
@@ -48,7 +48,7 @@ public function setKernel(DrupalKernel $kernel)
   public function getKernel()
   {
     if (!$this->kernel) {
-      $this->kernel = new DrupalKernel($this->environment, \drupal_classloader(), !$this->debug);
+      $this->kernel = new DrupalKernel($this->environment, $this->class_loader, !$this->debug);
     }
 
     return $this->kernel;

From 47671d8d0c98b670025a8d9f8e77a1cb923f5239 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Sat, 6 Sep 2014 12:46:42 -0700
Subject: [PATCH 6/6] DisableOriginalConstructor on KernelHelper Mock

---
 Tests/Console/ApplicationTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Tests/Console/ApplicationTest.php b/Tests/Console/ApplicationTest.php
index d7542baf8..feedc302d 100644
--- a/Tests/Console/ApplicationTest.php
+++ b/Tests/Console/ApplicationTest.php
@@ -75,6 +75,7 @@ protected function setUp()
     $this->drupalBootstrap = $this->getMockBuilder('Drupal\AppConsole\Command\Helper\DrupalBootstrapHelper')
                                   ->getMock();
     $this->kernel = $this->getMockBuilder('Drupal\AppConsole\Command\Helper\KernelHelper')
+                         ->disableOriginalConstructor()
                          ->getMock();
     $this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
                                   ->getMock();