15c15
< index 0dcd141..98904ff 100644
---
> index 0dcd141..6e9c8e8 100644
18c18
< @@ -452,8 +452,9 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
---
> @@ -452,8 +452,8 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
24,26c24,25
< +  $file_system = \Drupal::service('file_system');
< +  $real_source = $file_system->realpath($source) ?: $source;
< +  $real_destination = $file_system->realpath($destination) ?: $destination;
---
> +  $real_source = \Drupal::service('file_system')->realpath($source) ?: $source;
> +  $real_destination = \Drupal::service('file_system')->realpath($destination) ?: $destination;
30,36c29
< @@ -497,12 +498,13 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
<  function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_EXISTS_RENAME) {
<    $original_source = $source;
<    $logger = \Drupal::logger('file');
< +  $file_system = \Drupal::service('file_system');
<  
<    // Assert that the source file actually exists.
---
> @@ -502,7 +502,7 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
41c34
< +    if (($realpath = $file_system->realpath($original_source)) !== FALSE) {
---
> +    if (($realpath = \Drupal::service('file_system')->realpath($original_source)) !== FALSE) {
45c38
< @@ -542,8 +544,8 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
---
> @@ -542,8 +542,8 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
51,52c44,45
< +  $real_source = $file_system->realpath($source);
< +  $real_destination = $file_system->realpath($destination);
---
> +  $real_source = \Drupal::service('file_system')->realpath($source);
> +  $real_destination = \Drupal::service('file_system')->realpath($destination);
56c49
< @@ -643,8 +645,9 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
---
> @@ -643,8 +643,8 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
62,64c55,56
< +  $file_system = \Drupal::service('file_system');
< +  $real_source = $file_system->realpath($source) ?: $source;
< +  $real_destination = $file_system->realpath($destination) ?: $destination;
---
> +  $real_source = \Drupal::service('file_system')->realpath($source) ?: $source;
> +  $real_destination = \Drupal::service('file_system')->realpath($destination) ?: $destination;
69c61
< index 1616f18..42e2c01 100644
---
> index ceb9982..a83d885 100644
726c718
< index 37b5ea1..61a73b6 100644
---
> index 7e9893c..7602e6d 100644
734d725
<  use Drupal\Core\Theme\ThemeManagerInterface;
737c728,729
< @@ -34,6 +35,12 @@ class ThemeSettingsForm extends ConfigFormBase {
---
>   * Displays theme configuration for entire site and individual themes.
> @@ -33,6 +34,12 @@ class ThemeSettingsForm extends ConfigFormBase {
750c742
< @@ -65,14 +72,17 @@ class ThemeSettingsForm extends ConfigFormBase {
---
> @@ -57,13 +64,16 @@ class ThemeSettingsForm extends ConfigFormBase {
757,758c749,750
< -  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, ThemeManagerInterface $theme_manager) {
< +  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, ThemeManagerInterface $theme_manager, FileSystemInterface $file_system) {
---
> -  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser) {
> +  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, FileSystemInterface $file_system) {
764d755
<      $this->themeManager = $theme_manager;
769c760,761
< @@ -84,7 +94,8 @@ public static function create(ContainerInterface $container) {
---
> @@ -74,7 +84,8 @@ public static function create(ContainerInterface $container) {
>        $container->get('config.factory'),
772,774c764,765
<        $container->get('file.mime_type.guesser'),
< -      $container->get('theme.manager')
< +      $container->get('theme.manager'),
---
> -      $container->get('file.mime_type.guesser')
> +      $container->get('file.mime_type.guesser'),
779c770
< @@ -480,7 +491,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
---
> @@ -470,7 +481,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
862c853
< index 667c97a..2d65560 100644
---
> index e01f28a..4973516 100644
884c875
< index cbdafbc..354d537 100644
---
> index cbdafbc..d5a8ee9 100644
887,889c878
< @@ -425,19 +425,20 @@ function system_requirements($phase) {
<      // Try to write the .htaccess files first, to prevent false alarms in case
<      // (for example) the /tmp directory was wiped.
---
> @@ -427,17 +427,17 @@ function system_requirements($phase) {
891d879
< +    $file_system = \Drupal::service('file_system');
895c883
< +      'directory' => $file_system->realpath('public://'),
---
> +      'directory' => \Drupal::service('file_system')->realpath('public://'),
901c889
< +        'directory' => $file_system->realpath('private://'),
---
> +        'directory' => \Drupal::service('file_system')->realpath('private://'),
907c895
< +      'directory' => $file_system->realpath('temporary://'),
---
> +      'directory' => \Drupal::service('file_system')->realpath('temporary://'),