diff -u b/core/includes/bootstrap.inc b/core/includes/bootstrap.inc --- b/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -4,23 +4,17 @@ * Functions that need to be loaded on every Drupal request. */ -use Drupal\Component\Datetime\DateTimePlus; use Drupal\Component\Utility\Crypt; -use Drupal\Component\Utility\Environment; use Drupal\Component\Utility\Html; use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\Unicode; use Drupal\Core\DrupalKernel; -use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Logger\RfcLogLevel; use Drupal\Core\Render\SafeString; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Site\Settings; use Drupal\Core\Utility\Error; -use Symfony\Component\ClassLoader\ApcClassLoader; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; -use Drupal\Core\Language\LanguageInterface; /** * Minimum supported version of PHP. @@ -223,6 +217,7 @@ // Profiles are converted into modules in system_rebuild_module_data(). // @todo Remove false-exposure of profiles as modules. + $original_type = $type; if ($type == 'profile') { $type = 'module'; } @@ -232,8 +227,7 @@ // Profiles are converted into modules in system_rebuild_module_data(). // @todo Remove false-exposure of profiles as modules. - $original_type = $type; - if ($type == 'profile') { + if ($type === 'profile') { $type = 'module'; } if (!isset($files[$type])) { @@ -1021,7 +1015,7 @@ chdir(DRUPAL_ROOT); try { - while (list($key, $callback) = each($callbacks)) { + foreach ($callbacks as $callback) { call_user_func_array($callback['callback'], $callback['arguments']); } }