Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2631478 by neclimdul: bootstrap.php loader can show as changed global state

8.1.x
Alex Pott 2015-12-12 01:02:55 +00:00
parent 17bc367138
commit 87cded8723
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/Drupal/KernelTests/KernelTestBase.php
View File

@ -235,8 +235,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
$this->streamWrappers = array(); $this->streamWrappers = array();
\Drupal::unsetContainer(); \Drupal::unsetContainer();
// @see /core/tests/bootstrap.php $this->classLoader = require $this->root . '/autoload.php';
$this->classLoader = $GLOBALS['loader'];
require_once $this->root . '/core/includes/bootstrap.inc'; require_once $this->root . '/core/includes/bootstrap.inc';

35
core/tests/bootstrap.php
View File

@ -87,22 +87,41 @@ function drupal_phpunit_get_extension_namespaces($dirs) {
if (!defined('PHPUNIT_COMPOSER_INSTALL')) { if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
define('PHPUNIT_COMPOSER_INSTALL', __DIR__ . '/../../autoload.php'); define('PHPUNIT_COMPOSER_INSTALL', __DIR__ . '/../../autoload.php');
} }
// Start with classes in known locations.
$loader = require __DIR__ . '/../../autoload.php';
$loader->add('Drupal\\Tests', __DIR__);
$loader->add('Drupal\\KernelTests', __DIR__);
if (!isset($GLOBALS['namespaces'])) { /**
* Populate class loader with additional namespaces for tests.
*
* We run this in a function to avoid setting the class loader to a global
* that can change. This change can cause unpredictable false positives for
* phpunit's global state change watcher. The class loader can be retrieved from
* composer at any time by requiring autoload.php.
*/
function drupal_phpunit_populate_class_loader() {
/** @var \Composer\Autoload\ClassLoader $loader */
$loader = require __DIR__ . '/../../autoload.php';
// Start with classes in known locations.
$loader->add('Drupal\\Tests', __DIR__);
$loader->add('Drupal\\KernelTests', __DIR__);
if (!isset($GLOBALS['namespaces'])) {
// Scan for arbitrary extension namespaces from core and contrib. // Scan for arbitrary extension namespaces from core and contrib.
$extension_roots = drupal_phpunit_contrib_extension_directory_roots(); $extension_roots = drupal_phpunit_contrib_extension_directory_roots();
$dirs = array_map('drupal_phpunit_find_extension_directories', $extension_roots); $dirs = array_map('drupal_phpunit_find_extension_directories', $extension_roots);
$dirs = array_reduce($dirs, 'array_merge', array()); $dirs = array_reduce($dirs, 'array_merge', array());
$GLOBALS['namespaces'] = drupal_phpunit_get_extension_namespaces($dirs); $GLOBALS['namespaces'] = drupal_phpunit_get_extension_namespaces($dirs);
} }
foreach ($GLOBALS['namespaces'] as $prefix => $paths) { foreach ($GLOBALS['namespaces'] as $prefix => $paths) {
$loader->addPsr4($prefix, $paths); $loader->addPsr4($prefix, $paths);
} }
return $loader;
};
// Do class loader population.
drupal_phpunit_populate_class_loader();
// Set sane locale settings, to ensure consistent string, dates, times and // Set sane locale settings, to ensure consistent string, dates, times and
// numbers handling. // numbers handling.