Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / tests / Drupal / KernelTests / Core / RouteProcessor / RouteProcessorCurrentIntegrationTest.php

diff --git a/web/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
index ea6a9c25380d6654b6d96ab5c11387cabe6eb852..4e42271aa586966b863ceb4bf867b7cb69744e0c 100644 (file)
--- a/web/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
@@ -54,7 +54,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // Test request with subdir on homepage.
     $server = [
       'SCRIPT_NAME' => '/subdir/index.php',
-      'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
+      'SCRIPT_FILENAME' => $this->root . '/index.php',
       'SERVER_NAME' => 'http://www.example.com',
     ];
     $request = Request::create('/subdir/', 'GET', [], [], [], $server);
@@ -69,7 +69,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // Test request with subdir on other page.
     $server = [
       'SCRIPT_NAME' => '/subdir/index.php',
-      'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
+      'SCRIPT_FILENAME' => $this->root . '/index.php',
       'SERVER_NAME' => 'http://www.example.com',
     ];
     $request = Request::create('/subdir/node/add', 'GET', [], [], [], $server);
@@ -84,7 +84,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // Test request without subdir on the homepage.
     $server = [
       'SCRIPT_NAME' => '/index.php',
-      'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
+      'SCRIPT_FILENAME' => $this->root . '/index.php',
       'SERVER_NAME' => 'http://www.example.com',
     ];
     $request = Request::create('/', 'GET', [], [], [], $server);
@@ -99,7 +99,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // Test request without subdir on other page.
     $server = [
       'SCRIPT_NAME' => '/index.php',
-      'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
+      'SCRIPT_FILENAME' => $this->root . '/index.php',
       'SERVER_NAME' => 'http://www.example.com',
     ];
     $request = Request::create('/node/add', 'GET', [], [], [], $server);
@@ -115,7 +115,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // not found exception page.
     $server = [
       'SCRIPT_NAME' => '/index.php',
-      'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
+      'SCRIPT_FILENAME' => $this->root . '/index.php',
       'SERVER_NAME' => 'http://www.example.com',
     ];
     $request = Request::create('/invalid-path', 'GET', [], [], [], $server);