Merge pull request #27 from mateu-aguilo-bosch/easier-autoload-inclusion

Easier autoload inclusion

README.md

@@ -38,7 +38,14 @@ The problem that this project aims to solve is to give you a way to provide a si
 all those scenarios.
 
 ## The Solution
-Meet the Drupal Unit Autoload.
+Meet the Drupal Unit Autoload. To include it, just add the following to your PHPUnit test class (change the path
+depending on the location of your test classes):
+
+```php
+require_once __DIR__ . '/../../vendor/mateu-aguilo-bosch/drupal-unit-autoload/autoload.php';
+```
+
+That will load Composer's autoloader + the Drupal capabilities.
 
 The only thing that you need to do is add a new `composer.json` key with tokens in the path.
 

autoload.php

@@ -0,0 +1,9 @@
+<?php
+
+use Drupal\Composer\ClassLoader\AutoloaderBootstrap;
+
+// Load Composer's autoloader.
+$loader = require __DIR__ . '/../../autoload.php';
+
+$autoloader_init = new AutoloaderBootstrap($loader);
+$autoloader_init->register();

src/AutoloaderBootstrap.php

@@ -14,7 +14,7 @@
  *
  * @package Drupal\Composer\ClassLoader
  */
-class AutoloaderBootstrap {
+class AutoloaderBootstrap implements AutoloaderBootstrapInterface {
 
   const AUTOLOAD_METHOD = 'autoload';
   const COMPOSER_CONFIGURATION_NAME = 'composer.json';
@@ -67,7 +67,7 @@ public function __construct(\Composer\Autoload\ClassLoader $classLoader, $seed =
   }
 
   /**
-   * Register the autoloader if it is not registered.
+   * {@inheritdoc}
    */
   public function register() {
     if ($this->checkLoadedAutoloader()) {
@@ -132,20 +132,15 @@ protected function registerPsr(array $composer_config) {
   }
 
   /**
-   * Checks if the autoloader has been added.
-   *
-   * @return bool
+   * {@inheritdoc}
    */
   public function checkLoadedAutoloader() {
     $functions = spl_autoload_functions();
     return in_array(array($this->loader, static::AUTOLOAD_METHOD), $functions);
   }
 
   /**
-   * Gets the configuration for the drupal loader from the Composer loader.
-   *
-   * @return array
-   *   The configuration array for the drupal loader.
+   * {@inheritdoc}
    */
   public function getConfig() {
     // Initialize empty configuration.
@@ -196,4 +191,11 @@ public function getConfig() {
     return $config;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getClassLoader() {
+    return $this->classLoader;
+  }
+
 }

src/AutoloaderBootstrapInterface.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: e0ipso
+ * Date: 03/07/15
+ * Time: 13:00
+ */
+
+namespace Drupal\Composer\ClassLoader;
+
+
+interface AutoloaderBootstrapInterface {
+
+  /**
+   * Register the autoloader if it is not registered.
+   */
+  public function register();
+
+
+  /**
+   * Checks if the autoloader has been added.
+   *
+   * @return bool
+   */
+  public function checkLoadedAutoloader();
+
+  /**
+   * Gets the configuration for the drupal loader from the Composer loader.
+   *
+   * @return array
+   *   The configuration array for the drupal loader.
+   */
+  public function getConfig();
+  /**
+   * Gets the class loader.
+   *
+   * @return \Composer\Autoload\ClassLoader
+   *   The loader.
+   */
+  public function getClassLoader();
+
+}

tests/src/AutoloaderBootstrapTest.php

@@ -182,4 +182,15 @@ public function test_getConfig() {
     $this->assertEquals($expected, $config);
   }
 
+  /**
+   * Tests the ::getClassLoader method.
+   *
+   * @covers ::getClassLoader()
+   */
+  public function test_getClassLoader() {
+    $loader = m::mock('\Composer\Autoload\ClassLoader');
+    $autoloader = new AutoloaderBootstrap($loader, 'data/docroot/sites/all/modules/testmodule/composer.json');
+    $this->assertEquals($loader, $autoloader->getClassLoader());
+  }
+
 }