From c342fe44f7052fb8cd3d3675c2e8e3e18cf8357b Mon Sep 17 00:00:00 2001
From: tedbow <tedbow@240860.no-reply.drupal.org>
Date: Wed, 8 Dec 2021 23:04:05 +0000
Subject: [PATCH] Issue #3253395 by tedbow: Fix functional test deprecation
notices for core
---
.../src/Functional/ExcludedPathsTest.php | 28 +++++++++----------
.../tests/src/Kernel/ComposerUtilityTest.php | 2 +-
tests/src/Build/CoreUpdateTest.php | 2 +-
.../Functional/FileSystemOperationsTest.php | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/package_manager/tests/src/Functional/ExcludedPathsTest.php b/package_manager/tests/src/Functional/ExcludedPathsTest.php
index f9e53994df..2870806996 100644
--- a/package_manager/tests/src/Functional/ExcludedPathsTest.php
+++ b/package_manager/tests/src/Functional/ExcludedPathsTest.php
@@ -119,21 +119,21 @@ class ExcludedPathsTest extends BrowserTestBase {
$stage_dir = $stage::$stagingRoot . DIRECTORY_SEPARATOR . $stage->create();
$this->assertDirectoryExists($stage_dir);
- $this->assertDirectoryNotExists("$stage_dir/sites/simpletest");
- $this->assertFileNotExists("$stage_dir/vendor/web.config");
- $this->assertDirectoryNotExists("$stage_dir/$site_path/files");
- $this->assertDirectoryNotExists("$stage_dir/private");
- $this->assertFileNotExists("$stage_dir/$site_path/settings.php");
- $this->assertFileNotExists("$stage_dir/$site_path/settings.local.php");
- $this->assertFileNotExists("$stage_dir/$site_path/services.yml");
+ $this->assertDirectoryDoesNotExist("$stage_dir/sites/simpletest");
+ $this->assertFileDoesNotExist("$stage_dir/vendor/web.config");
+ $this->assertDirectoryDoesNotExist("$stage_dir/$site_path/files");
+ $this->assertDirectoryDoesNotExist("$stage_dir/private");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/settings.php");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/settings.local.php");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/services.yml");
// SQLite databases and their support files should never be staged.
- $this->assertFileNotExists("$stage_dir/$site_path/db.sqlite");
- $this->assertFileNotExists("$stage_dir/$site_path/db.sqlite-shm");
- $this->assertFileNotExists("$stage_dir/$site_path/db.sqlite-wal");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite-shm");
+ $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite-wal");
// Default site-specific settings files should never be staged.
- $this->assertFileNotExists("$stage_dir/sites/default/settings.php");
- $this->assertFileNotExists("$stage_dir/sites/default/settings.local.php");
- $this->assertFileNotExists("$stage_dir/sites/default/services.yml");
+ $this->assertFileDoesNotExist("$stage_dir/sites/default/settings.php");
+ $this->assertFileDoesNotExist("$stage_dir/sites/default/settings.local.php");
+ $this->assertFileDoesNotExist("$stage_dir/sites/default/services.yml");
// A non-excluded file in the default site directory should be staged.
$this->assertFileExists("$stage_dir/sites/default/stage.txt");
@@ -148,7 +148,7 @@ class ExcludedPathsTest extends BrowserTestBase {
}
$stage->apply();
foreach ($files as $file) {
- $this->assertFileNotExists("$active_dir/$file");
+ $this->assertFileDoesNotExist("$active_dir/$file");
}
}
diff --git a/package_manager/tests/src/Kernel/ComposerUtilityTest.php b/package_manager/tests/src/Kernel/ComposerUtilityTest.php
index d770cd3a12..2356c46209 100644
--- a/package_manager/tests/src/Kernel/ComposerUtilityTest.php
+++ b/package_manager/tests/src/Kernel/ComposerUtilityTest.php
@@ -26,7 +26,7 @@ class ComposerUtilityTest extends KernelTestBase {
file_put_contents($dir . '/composer.json', '{}');
ComposerUtility::createForDirectory($dir);
- $this->assertFileNotExists($dir . '/.htaccess');
+ $this->assertFileDoesNotExist($dir . '/.htaccess');
}
/**
diff --git a/tests/src/Build/CoreUpdateTest.php b/tests/src/Build/CoreUpdateTest.php
index 8b579dd57b..662090dc8b 100644
--- a/tests/src/Build/CoreUpdateTest.php
+++ b/tests/src/Build/CoreUpdateTest.php
@@ -51,7 +51,7 @@ class CoreUpdateTest extends UpdateTestBase {
// ignores .htaccess files and everything in them, so a Composer-generated
// .htaccess file won't cause this test to fail.
if ($template === 'drupal/recommended-project') {
- $this->assertFileNotExists($dir . '/.htaccess');
+ $this->assertFileDoesNotExist($dir . '/.htaccess');
}
// Ensure that Drupal thinks we are running 9.8.0, then refresh information
diff --git a/tests/src/Functional/FileSystemOperationsTest.php b/tests/src/Functional/FileSystemOperationsTest.php
index 3bb2bdb3f7..4e812a080b 100644
--- a/tests/src/Functional/FileSystemOperationsTest.php
+++ b/tests/src/Functional/FileSystemOperationsTest.php
@@ -118,7 +118,7 @@ class FileSystemOperationsTest extends AutomaticUpdatesFunctionalTestBase {
// Make the staged site directory read-only, so we can test that it will be
// made writable on clean-up.
$this->assertTrue(chmod("$this->stageDir/$stage_id/sites/default", 0400));
- $this->assertNotIsWritable("$this->stageDir/$stage_id/sites/default/staged.txt");
+ $this->assertIsNotWritable("$this->stageDir/$stage_id/sites/default/staged.txt");
// If the site directory is not writable, this will throw an exception.
$this->updater->destroy();
$this->assertDirectoryDoesNotExist($this->stageDir);
--
GitLab