X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Fsystem%2Ftests%2Fsrc%2FKernel%2FCommon%2FSystemListingTest.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Ftests%2Fsrc%2FKernel%2FCommon%2FSystemListingTest.php;h=1a3f373f34af1e35d15f7af96b2fd72f2645066e;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=b0412b4336fd20d6c4d0ea1f306561fe442e2a9c;hpb=74df008bdbb3a11eeea356744f39b802369bda3c;p=yaffs-website

diff --git a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
index b0412b433..1a3f373f3 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
@@ -11,6 +11,7 @@ use Drupal\KernelTests\KernelTestBase;
  * @group Common
  */
 class SystemListingTest extends KernelTestBase {
+
   /**
    * Tests that files in different directories take precedence as expected.
    */
@@ -32,13 +33,13 @@ class SystemListingTest extends KernelTestBase {
     foreach ($expected_directories as $module => $directories) {
       foreach ($directories as $directory) {
         $filename = "$directory/$module/$module.info.yml";
-        $this->assertTrue(file_exists(\Drupal::root() . '/' . $filename), format_string('@filename exists.', ['@filename' => $filename]));
+        $this->assertTrue(file_exists($this->root . '/' . $filename), format_string('@filename exists.', ['@filename' => $filename]));
       }
     }
 
     // Now scan the directories and check that the files take precedence as
     // expected.
-    $listing = new ExtensionDiscovery(\Drupal::root());
+    $listing = new ExtensionDiscovery($this->root);
     $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     foreach ($expected_directories as $module => $directories) {
@@ -55,7 +56,7 @@ class SystemListingTest extends KernelTestBase {
    * Tests that directories matching file_scan_ignore_directories are ignored
    */
   public function testFileScanIgnoreDirectory() {
-    $listing = new ExtensionDiscovery(\Drupal::root(), FALSE);
+    $listing = new ExtensionDiscovery($this->root, FALSE);
     $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     $this->assertArrayHasKey('drupal_system_listing_compatible_test', $files);
@@ -67,7 +68,7 @@ class SystemListingTest extends KernelTestBase {
     $reflected_property->setValue($reflected_class, []);
 
     $this->setSetting('file_scan_ignore_directories', ['drupal_system_listing_compatible_test']);
-    $listing = new ExtensionDiscovery(\Drupal::root(), FALSE);
+    $listing = new ExtensionDiscovery($this->root, FALSE);
     $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     $this->assertArrayNotHasKey('drupal_system_listing_compatible_test', $files);