Merge pull request #196 from jmolivas/drupal_classloader-function

Drupal drupal_classloader function no longer exist
hechoendrupal · Sep 6, 2014 · fdfcd4f · fdfcd4f
2 parents 467a19b + 47671d8
commit fdfcd4f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git 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();

diff --git 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';
diff --git 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(),

diff --git a/src/Command/Helper/KernelHelper.php b/src/Command/Helper/KernelHelper.php
@@ -13,6 +13,12 @@
 
 class KernelHelper extends Helper
 {
+  private $class_loader;
+
+  function __construct($class_loader){
+    $this->class_loader = $class_loader;
+  }
+
   /**
    * @var DrupalKernel
    */
@@ -42,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;