diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php index 0a0fd18..35a4ef7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php @@ -111,8 +111,7 @@ protected function assertUrlOutboundAlter($original, $final) { * Assert that a inbound path is altered to an expected value. * * @param $original - * A string with the aliased or un-normal path that is run through - * drupal_container()->get('path.alias_manager')->getSystemPath(). + * The original path before it has been altered by inbound URL processing. * @param $final * A string with the expected result after url(). * @return @@ -120,7 +119,7 @@ protected function assertUrlOutboundAlter($original, $final) { */ protected function assertUrlInboundAlter($original, $final) { // Test inbound altering. - $result = drupal_container()->get('path.alias_manager')->getSystemPath($original); + $result = $this->container->get('path.alias_manager')->getSystemPath($original); $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php index e7bc98c..958128c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php @@ -39,13 +39,13 @@ function testTwigAutoReloadOverride() { $this->rebuildContainer(); // Check isAutoReload() via the Twig service container. - $this->assertTrue(drupal_container()->get('twig')->isAutoReload(), 'Automatic reloading of Twig templates enabled.'); + $this->assertTrue($this->container->get('twig')->isAutoReload(), 'Automatic reloading of Twig templates enabled.'); // Disable auto reload and check the service container again. $this->settingsSet('twig_auto_reload', FALSE); $this->rebuildContainer(); - $this->assertFalse(drupal_container()->get('twig')->isAutoReload(), 'Automatic reloading of Twig templates disabled.'); + $this->assertFalse($this->container->get('twig')->isAutoReload(), 'Automatic reloading of Twig templates disabled.'); } /** @@ -57,19 +57,19 @@ function testTwigDebugOverride() { $this->rebuildContainer(); // Check isDebug() via the Twig service container. - $this->assertTrue(drupal_container()->get('twig')->isDebug(), 'Twig debug enabled.'); - $this->assertTrue(drupal_container()->get('twig')->isAutoReload(), 'Twig automatic reloading is enabled when debug is enabled.'); + $this->assertTrue($this->container->get('twig')->isDebug(), 'Twig debug enabled.'); + $this->assertTrue($this->container->get('twig')->isAutoReload(), 'Twig automatic reloading is enabled when debug is enabled.'); // Override auto reload when debug is enabled. $this->settingsSet('twig_auto_reload', FALSE); $this->rebuildContainer(); - $this->assertFalse(drupal_container()->get('twig')->isAutoReload(), 'Twig automatic reloading can be disabled when debug is enabled.'); + $this->assertFalse($this->container->get('twig')->isAutoReload(), 'Twig automatic reloading can be disabled when debug is enabled.'); // Disable debug and check the service container again. $this->settingsSet('twig_debug', FALSE); $this->rebuildContainer(); - $this->assertFalse(drupal_container()->get('twig')->isDebug(), 'Twig debug disabled.'); + $this->assertFalse($this->container->get('twig')->isDebug(), 'Twig debug disabled.'); } /** @@ -94,7 +94,7 @@ function testTwigCacheOverride() { // Get the template filename and the cache filename for // theme_test.template_test.html.twig. $template_filename = $templates['theme_test_template_test']['path'] . '/' . $templates['theme_test_template_test']['template'] . $extension; - $cache_filename = drupal_container()->get('twig')->getCacheFilename($template_filename); + $cache_filename = $this->container->get('twig')->getCacheFilename($template_filename); // Navigate to the page and make sure the template gets cached. $this->drupalGet('theme-test/template-test'); @@ -105,7 +105,7 @@ function testTwigCacheOverride() { $this->rebuildContainer(); // This should return false after rebuilding the service container. - $new_cache_filename = drupal_container()->get('twig')->getCacheFilename($template_filename); + $new_cache_filename = $this->container->get('twig')->getCacheFilename($template_filename); $this->assertFalse($new_cache_filename, 'Twig environment does not return cache filename after caching is disabled.'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php index 6102a70..d581147 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php @@ -63,7 +63,7 @@ function testUpdateAccess() { // Access the update page as user 1. $user1 = user_load(1); $user1->pass_raw = user_password(); - $user1->pass = drupal_container()->get('password')->hash(trim($user1->pass_raw)); + $user1->pass = $this->container->get('password')->hash(trim($user1->pass_raw)); db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->getPassword(), ':uid' => $user1->id())); $this->drupalLogin($user1); $this->drupalGet($this->update_url, array('external' => TRUE)); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index f62f640..5135393 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2201,7 +2201,7 @@ function system_page_build(&$page) { */ function system_custom_theme() { if (drupal_container()->isScopeActive('request')) { - $request = drupal_container()->get('request'); + $request = Drupal::request(); $path = $request->attributes->get('_system_path'); if (user_access('view the administration theme') && path_is_admin($path)) { return \Drupal::config('system.theme')->get('admin'); diff --git a/core/modules/system/tests/modules/design_test/design_test.module b/core/modules/system/tests/modules/design_test/design_test.module index 1b9266a..f2198b4 100644 --- a/core/modules/system/tests/modules/design_test/design_test.module +++ b/core/modules/system/tests/modules/design_test/design_test.module @@ -95,8 +95,8 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) { if ($router_item['number_parts'] > 2 && strpos($root_path, 'design_test/') === 0) { $actions = &$data['actions']['output']; // Determine the currently selected theme, if any. - $selected_theme = drupal_container()->get('request')->query->get('theme'); - $default_theme = \Drupal::config('system.theme')->get('default'); + $selected_theme = Drupal::request()->query->get('theme'); + $default_theme = Drupal::config('system.theme')->get('default'); // Expand all enabled themes into action links. $themes = list_themes(); @@ -129,5 +129,5 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) { * query parameter. The returned value is validated by the menu system already. */ function design_test_menu_theme_callback() { - return drupal_container()->get('request')->query->get('theme'); + return Drupal::request()->query->get('theme'); }