diff --git a/src/Plugin/ConfigFilter/SplitFilter.php b/src/Plugin/ConfigFilter/SplitFilter.php index ff24b0b..ad28afb 100644 --- a/src/Plugin/ConfigFilter/SplitFilter.php +++ b/src/Plugin/ConfigFilter/SplitFilter.php @@ -11,7 +11,7 @@ use Drupal\Core\Config\StorageInterface; use Drupal\Core\Database\Connection; use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Component\PhpStorage\FileStorage as PhpFileStorage; +use Drupal\Component\FileSecurity\FileSecurity; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -410,7 +410,7 @@ class SplitFilter extends ConfigFilterBase implements ContainerFactoryPluginInte if (file_exists($directory) && is_writable($directory)) { $htaccess_path = rtrim($directory, '/\\') . '/.htaccess'; if (!file_exists($htaccess_path)) { - file_put_contents($htaccess_path, PhpFileStorage::htaccessLines(TRUE)); + file_put_contents($htaccess_path, FileSecurity::htaccessLines(TRUE)); @chmod($htaccess_path, 0444); } } diff --git a/tests/src/Kernel/ConfigSplitCliServiceTest.php b/tests/src/Kernel/ConfigSplitCliServiceTest.php index 5fc400a..43aff04 100644 --- a/tests/src/Kernel/ConfigSplitCliServiceTest.php +++ b/tests/src/Kernel/ConfigSplitCliServiceTest.php @@ -68,12 +68,7 @@ class ConfigSplitCliServiceTest extends KernelTestBase { $archive_data = $file->fread($file->getSize()); // Save the tar file to unpack and read it. // See \Drupal\config\Tests\ConfigExportUITest::testExport() - try { - $uri = \Drupal::service('file_system')->saveData($archive_data, 'temporary://config.tar.gz'); - } - catch (FileException $e) { - $uri = FALSE; - } + $uri = \Drupal::service('file_system')->saveData($archive_data, 'temporary://config.tar.gz'); $temp_folder = \Drupal::service('file_system')->getTempDirectory(); $file_target = StreamWrapperManager::getTarget($uri); $file_path = $temp_folder . '/' . $file_target;