Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2940135 by andypost, Berdir, alexpott: Use file_system service to \Drupal\Core\Config\FileStorage

merge-requests/1119/head
Alex Pott 2019-03-08 06:33:06 +00:00
parent 8cd35dbe20
commit 2348afa46a
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/lib/Drupal/Core/Config/FileStorage.php
View File

@ -76,7 +76,7 @@ class FileStorage implements StorageInterface {
*/
protected function ensureStorage() {
$dir = $this->getCollectionDirectory();
$success = \Drupal::service('file_system')->prepareDirectory($dir, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS);
$success = $this->getFileSystem()->prepareDirectory($dir, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS);
// Only create .htaccess file in root directory.
if ($dir == $this->directory) {
$success = $success && file_save_htaccess($this->directory, TRUE, TRUE);
@ -156,7 +156,7 @@ class FileStorage implements StorageInterface {
throw new StorageException('Failed to write configuration file: ' . $this->getFilePath($name));
}
else {
\Drupal::service('file_system')->chmod($target);
$this->getFileSystem()->chmod($target);
}
$this->fileCache->set($target, $data);
@ -172,7 +172,7 @@ class FileStorage implements StorageInterface {
return FALSE;
}
$this->fileCache->delete($this->getFilePath($name));
return drupal_unlink($this->getFilePath($name));
return $this->getFileSystem()->unlink($this->getFilePath($name));
}
/**
@ -248,7 +248,7 @@ class FileStorage implements StorageInterface {
if ($success && $this->collection != StorageInterface::DEFAULT_COLLECTION) {
// Remove empty directories.
if (!(new \FilesystemIterator($this->getCollectionDirectory()))->valid()) {
\Drupal::service('file_system')->rmdir($this->getCollectionDirectory());
$this->getFileSystem()->rmdir($this->getCollectionDirectory());
}
}
return $success;
@ -358,4 +358,14 @@ class FileStorage implements StorageInterface {
return $dir;
}
/**
* Returns file system service.
*
* @return \Drupal\Core\File\FileSystemInterface
* The file system service.
*/
private function getFileSystem() {
return \Drupal::service('file_system');
}
}