diff --git a/core/INSTALL.sqlite.txt b/core/INSTALL.sqlite.txt index e22aaa89c3..96092c3760 100644 --- a/core/INSTALL.sqlite.txt +++ b/core/INSTALL.sqlite.txt @@ -20,13 +20,13 @@ SQLITE DATABASE CREATION The Drupal installer will create the SQLite database for you. The only requirement is that the installer must have write permissions to the directory where the database file resides. This directory (not just the database file) also -has to remain writeable by the web server going forward for SQLite to continue to +has to remain writable by the web server going forward for SQLite to continue to be able to operate. On the "Database configuration" form in the "Database file" field, you must supply the exact path to where you wish your database file to reside. It is strongly suggested that you choose a path that is outside of the webroot, yet -ensure that the directory is writeable by the web server. +ensure that the directory is writable by the web server. If you must place your database file in your webroot, you could try using the following in your "Database file" field: diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 5dbc9e0233..fcfa09d150 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -190,7 +190,7 @@ INSTALLATION chmod a+w sites/default/files Be sure to set the permissions for the default directory back after the - installation is finished! (Leave the files directory writeable.) + installation is finished! (Leave the files directory writable.) Sample command: chmod go-w sites/default diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index c75da59c7a..e2a2e6cd06 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1030,7 +1030,7 @@ function install_display_output($output, $install_state) { // Prevent install.php from being indexed when installed in a sub folder. // robots.txt rules are not read if the site is within domain.com/subfolder // resulting in /subfolder/install.php being found through search engines. - // When settings.php is writeable this can be used via an external database + // When settings.php is writable this can be used via an external database // leading a malicious user to gain php access to the server. $noindex_meta_tag = [ '#tag' => 'meta', diff --git a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php index fb9194c98a..7a370d252a 100644 --- a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php +++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php @@ -52,7 +52,7 @@ public function load($name); public function save($name, $code); /** - * Whether this is a writeable storage. + * Whether this is a writable storage. * * @return bool */ diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php index a354785aff..039dd340fa 100644 --- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php +++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php @@ -18,6 +18,7 @@ * and for consistency Drupal will only accept URIs of form "scheme://target". * * @see http://www.faqs.org/rfcs/rfc3986.html + * @see http://bugs.php.net/bug.php?id=47070 */ interface StreamWrapperInterface extends PhpStreamWrapperInterface { @@ -45,7 +46,7 @@ const READ = 0x0004; /** - * Wrapper is writeable. + * Wrapper is writable. */ const WRITE = 0x0008; @@ -67,12 +68,12 @@ const HIDDEN = 0x000C; /** - * Hidden, readable and writeable using local files. + * Hidden, readable and writable using local files. */ const LOCAL_HIDDEN = 0x000D; /** - * Visible, readable and writeable. + * Visible, readable and writable. */ const WRITE_VISIBLE = 0x001C; @@ -91,7 +92,7 @@ const NORMAL = 0x001C; /** - * Visible, readable and writeable using local files. + * Visible, readable and writable using local files. */ const LOCAL_NORMAL = 0x001D; diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php index 03d4784ad6..c3dade39ae 100644 --- a/core/modules/simpletest/src/KernelTestBase.php +++ b/core/modules/simpletest/src/KernelTestBase.php @@ -151,7 +151,7 @@ protected function prepareConfigDirectories() { $this->configDirectories = []; // Assign the relative path to the global variable. $path = $this->siteDirectory . '/config_' . CONFIG_SYNC_DIRECTORY; - // Ensure the directory can be created and is writeable. + // Ensure the directory can be created and is writable. if (!\Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS)) { throw new \RuntimeException("Failed to create '" . CONFIG_SYNC_DIRECTORY . "' config directory $path"); } diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php index d81488b44e..cad3342d6b 100644 --- a/core/modules/system/src/Form/FileSystemForm.php +++ b/core/modules/system/src/Form/FileSystemForm.php @@ -122,7 +122,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#markup' => $this->fileSystem->getTempDirectory(), '#description' => t('A local file system path where temporary files will be stored. This directory should not be accessible over the web. This must be changed in settings.php.'), ]; - // Any visible, writeable wrapper can potentially be used for the files + // Any visible, writable wrapper can potentially be used for the files // directory, including a remote file system that integrates with a CDN. $options = $this->streamWrapperManager->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE); diff --git a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php index c8834e7bd8..d6fa68e9e7 100644 --- a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php @@ -84,11 +84,11 @@ public function testFileCheckDirectoryHandling() { // Make directory read only. @$file_system->chmod($directory, 0444); - $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writeable directory.', 'File'); + $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writable directory.', 'File'); // Test directory permission modification. $this->setSetting('file_chmod_directory', 0777); - $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writeable.', 'File'); + $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writable.', 'File'); } // Test that the directory has the correct permissions. diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php index 991006b5a2..dfa8b097b2 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php @@ -78,7 +78,7 @@ public function testReadOnly() { } /** - * @covers ::writeable + * @covers ::writable */ public function testWriteable() { $php_read = new FileReadOnlyStorage($this->readonlyStorage); diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php index 891a1dcceb..58adb1940f 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php @@ -47,7 +47,7 @@ public function testCRUD() { } /** - * @covers ::writeable + * @covers ::writable */ public function testWriteable() { $php = new FileStorage($this->standardSettings);