dantleech · October 21, 2021 21:22 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
diff --git a/phpstan_autoload.php b/phpstan_autoload.php
@@ -24,7 +24,3 @@
 $drupalKernel->boot();
 
 return $autoload;
-
-$container = $drupal->boot();
-
-return $autoload;
diff --git a/phpstan_autoload.php b/phpstan_autoload.php
@@ -1,22 +1,30 @@
 <?php
 
 use Drupal\Console\Core\Utils\DrupalFinder;
-use Drupal\Console\Bootstrap\Drupal;
-use Drupal\Console\Application;
+use Drupal\Console\Bootstrap\DrupalKernel;
+use Symfony\Component\HttpFoundation\Request;
 
 $autoload = require_once __DIR__ . '/autoload.php';
 
 $root = getcwd();
 
 $drupalFinder = new DrupalFinder();
 if (!$drupalFinder->locateRoot($root)) {
-    echo ('DrupalConsole must be executed within a Drupal Site.');
-
-    exit(1);
+    die('DrupalConsole must be executed within a Drupal Site.');
 }
 
 chdir($drupalFinder->getDrupalRoot());
-$drupal = new Drupal($autoload, $drupalFinder);
+$drupalKernel = DrupalKernel::createFromRequest(
+  Request::createFromGlobals(),
+  $autoload,
+  'prod',
+  true,
+  $drupalFinder->getDrupalRoot()
+);
+$drupalKernel->boot();
+
+return $autoload;
+
 $container = $drupal->boot();
 
 return $autoload;
diff --git a/README.md b/README.md
@@ -1,7 +1,11 @@
+```
+$ composer require phpstan/phpstan
+```
+
 Drupal dynamically adds to the class autoloader at runtime, so it is necessary to bootstrap Drupal in order that
 it is fully populated. Note that this may require that the database be accessible (i.e. may be problematic when
 working with Docker). This is why we use a custom autoload file below.
 
 ```
-$ phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom
+$ ./bin/phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom
 ```
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 Drupal dynamically adds to the class autoloader at runtime, so it is necessary to bootstrap Drupal in order that
-it is fully populated. This is why we use a custom autoload file below.
+it is fully populated. Note that this may require that the database be accessible (i.e. may be problematic when
+working with Docker). This is why we use a custom autoload file below.
 
 ```
 $ phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,2 +1,2 @@
 parameters:
-	bootstrap: ./docroot/phpstan_autoload.php
+  bootstrap: ./docroot/phpstan_autoload.php
diff --git a/README b/README
@@ -1,6 +0,0 @@
-Drupal dynamically adds to the class autoloader at runtime, so it is necessary to bootstrap Drupal in order that
-it is fully populated.
-
-```
-phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom
-```

diff --git a/README.md b/README.md
@@ -0,0 +1,6 @@
+Drupal dynamically adds to the class autoloader at runtime, so it is necessary to bootstrap Drupal in order that
+it is fully populated. This is why we use a custom autoload file below.
+
+```
+$ phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom
+```
diff --git a/README b/README
@@ -0,0 +1,6 @@
+Drupal dynamically adds to the class autoloader at runtime, so it is necessary to bootstrap Drupal in order that
+it is fully populated.
+
+```
+phpstan analyse --level=7 -c phpstan.neon docroot/modules/custom
+```
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,2 @@
+parameters:
+	bootstrap: ./docroot/phpstan_autoload.php
diff --git a/phpstan_autoload.php b/phpstan_autoload.php
@@ -0,0 +1,22 @@
+<?php
+
+use Drupal\Console\Core\Utils\DrupalFinder;
+use Drupal\Console\Bootstrap\Drupal;
+use Drupal\Console\Application;
+
+$autoload = require_once __DIR__ . '/autoload.php';
+
+$root = getcwd();
+
+$drupalFinder = new DrupalFinder();
+if (!$drupalFinder->locateRoot($root)) {
+    echo ('DrupalConsole must be executed within a Drupal Site.');
+
+    exit(1);
+}
+
+chdir($drupalFinder->getDrupalRoot());
+$drupal = new Drupal($autoload, $drupalFinder);
+$container = $drupal->boot();
+
+return $autoload;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		parameters:
		bootstrap: ./docroot/phpstan_autoload.php