Commit 2bf55735 authored by alexpott's avatar alexpott

Issue #2421005 by tim.plunkett: Add \Drupal::hasContainer() instead of...

Issue #2421005 by tim.plunkett: Add \Drupal::hasContainer() instead of checking if \Drupal::getContainer() === NULL
parent 9407ae4a
......@@ -733,7 +733,7 @@ function drupal_bootstrap($phase = NULL) {
$boot_level = $phase;
}
return \Drupal::getContainer() ? DRUPAL_BOOTSTRAP_CODE : DRUPAL_BOOTSTRAP_CONFIGURATION;
return \Drupal::hasContainer() ? DRUPAL_BOOTSTRAP_CODE : DRUPAL_BOOTSTRAP_CONFIGURATION;
}
/**
......
......@@ -123,6 +123,16 @@ public static function getContainer() {
return static::$container;
}
/**
* Returns TRUE if the container has been initialized, FALSE otherwise.
*
* @return bool
*/
public static function hasContainer() {
return static::$container !== NULL;
}
/**
* Retrieves a service from the container.
*
......@@ -149,7 +159,8 @@ public static function service($id) {
* TRUE if the specified service exists, FALSE otherwise.
*/
public static function hasService($id) {
return static::$container && static::$container->has($id);
// Check hasContainer() first in order to always return a Boolean.
return static::hasContainer() && static::getContainer()->has($id);
}
/**
......@@ -168,7 +179,8 @@ public static function root() {
* TRUE if there is a currently active request object, FALSE otherwise.
*/
public static function hasRequest() {
return static::$container && static::$container->has('request_stack') && static::$container->get('request_stack')->getCurrentRequest() !== NULL;
// Check hasContainer() first in order to always return a Boolean.
return static::hasContainer() && static::getContainer()->has('request_stack') && static::getContainer()->get('request_stack')->getCurrentRequest() !== NULL;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment