Merge pull request #25 from jibran/16-docroot

[#16] Use webflo/drupal-finder to find docroot.

Author: mglaman

composer.json

@@ -11,7 +11,8 @@
     "require": {
         "php": "^7.1",
         "phpstan/phpstan": "^0.10.6",
-        "symfony/yaml": "~3.4.5|^4.2"
+        "symfony/yaml": "~3.4.5|^4.2",
+        "webflo/drupal-finder": "^1.1"
     },
     "autoload": {
         "psr-4": {

src/DependencyInjection/DrupalExtension.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\DependencyInjection;
 
+use DrupalFinder\DrupalFinder;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Config\Helpers;
 use PHPStan\Drupal\ExtensionDiscovery;
@@ -19,11 +20,6 @@ class DrupalExtension extends CompilerExtension
         'themes' => [],
     ];
 
-    /**
-     * @var ?string
-     */
-    private $autoloaderPath;
-
     /**
      * @var string
      */
@@ -55,27 +51,9 @@ class DrupalExtension extends CompilerExtension
 
     public function loadConfiguration(): void
     {
-
-        $this->autoloaderPath = $GLOBALS['autoloaderInWorkingDirectory'];
-        $realpath = realpath($this->autoloaderPath);
-        if ($realpath === false) {
-            throw new \InvalidArgumentException('Cannot determine the realpath of the autoloader.');
-        }
-        $project_root = dirname($realpath, 2);
-        $drupalRoot = null;
-        if (is_dir($project_root . '/core')) {
-            $drupalRoot = $project_root;
-        }
-        foreach (['web', 'docroot'] as $possible_docroot) {
-            if (is_dir("$project_root/$possible_docroot/core")) {
-                $drupalRoot = "$project_root/$possible_docroot";
-            }
-        }
-        if ($drupalRoot === null) {
-            throw new \InvalidArgumentException('Unable to determine the Drupal root');
-        }
-
-        $this->drupalRoot = $drupalRoot;
+        $finder = new DrupalFinder();
+        $finder->locateRoot(getcwd());
+        $this->drupalRoot = $finder->getDrupalRoot();
 
         $builder = $this->getContainerBuilder();
         $builder->parameters['drupalRoot'] = $this->drupalRoot;

src/Drupal/Bootstrap.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Drupal;
 
-use Composer\Autoload\ClassLoader;
+use DrupalFinder\DrupalFinder;
 use Nette\Utils\Finder;
 
 class Bootstrap
@@ -15,11 +15,6 @@ class Bootstrap
         'themes' => [],
     ];
 
-    /**
-     * @var ?string
-     */
-    private $autoloaderPath;
-
     /**
      * @var \Composer\Autoload\ClassLoader
      */
@@ -66,31 +61,10 @@ class Bootstrap
 
     public function register(): void
     {
-
-        $this->autoloaderPath = $GLOBALS['autoloaderInWorkingDirectory'];
-        /** @noinspection PhpIncludeInspection */
-        $this->autoloader = require $this->autoloaderPath;
-        if (!$this->autoloader instanceof ClassLoader) {
-            throw new \InvalidArgumentException('Unable to determine the Composer class loader for Drupal');
-        }
-        $realpath = realpath($this->autoloaderPath);
-        if ($realpath === false) {
-            throw new \InvalidArgumentException('Cannot determine the realpath of the autoloader.');
-        }
-        $project_root = dirname($realpath, 2);
-        if (is_dir($project_root . '/core')) {
-            $this->drupalRoot = $project_root;
-        }
-        $drupalRoot = null;
-        foreach (['web', 'docroot'] as $possible_docroot) {
-            if (is_dir("$project_root/$possible_docroot/core")) {
-                $drupalRoot = "$project_root/$possible_docroot";
-            }
-        }
-        if ($drupalRoot === null) {
-            throw new \InvalidArgumentException('Unable to determine the Drupal root');
-        }
-        $this->drupalRoot = $drupalRoot;
+        $finder = new DrupalFinder();
+        $finder->locateRoot(getcwd());
+        $this->autoloader = include $finder->getVendorDir() . '/autoload.php';
+        $this->drupalRoot = $finder->getDrupalRoot();
 
         $this->extensionDiscovery = new ExtensionDiscovery($this->drupalRoot);
         $this->extensionDiscovery->setProfileDirectories([]);