Issue #3421274 by joshua1234511, trrroy, mohd-sahzad: TypeError: Argument #3 ($file_system) must be of type Drupal\Core\File\FileSystem, Drupal\s3fs\S3fsFileService given (#1240)

Co-authored-by: Joshua Fernandes <“[email protected]”>

Author: joshua-salsadigital

web/themes/contrib/civictheme/src/CivicthemeColorManager.php

@@ -521,7 +521,7 @@ protected function saveMatrixToConfig(): static {
    * @SuppressWarnings(MissingImport)
    */
   protected static function validateMatrixStructure(array $matrix): void {
-    if (!is_array($matrix) || count($matrix) != 2) {
+    if (count($matrix) != 2) {
       throw new \Exception(sprintf('Invalid color matrix structure: should be an array with exactly 2 elements keyed by "%s" and "%s"', self::COLOR_TYPE_BRAND, self::COLOR_TYPE_PALETTE));
     }
 

web/themes/contrib/civictheme/src/CivicthemeStylesheetGenerator.php

@@ -5,7 +5,6 @@
 namespace Drupal\civictheme;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\File\FileSystem;
 use Drupal\Core\File\FileSystemInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -34,10 +33,10 @@ final class CivicthemeStylesheetGenerator implements ContainerInjectionInterface
   /**
    * Constructor.
    *
-   * @param \Drupal\Core\File\FileSystem $fileSystem
+   * @param \Drupal\Core\File\FileSystemInterface $fileSystem
    *   File system discovery service.
    */
-  public function __construct(protected FileSystem $fileSystem) {
+  public function __construct(protected FileSystemInterface $fileSystem) {
     $this->setStylesheetUriSuffix('default');
   }
 

web/themes/contrib/civictheme/src/Settings/CivicthemeSettingsFormSectionBase.php

@@ -9,7 +9,6 @@
 use Drupal\Core\Config\ConfigManager;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Extension\ThemeExtensionList;
-use Drupal\Core\File\FileSystem;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\File\FileUrlGenerator;
 use Drupal\Core\Form\FormStateInterface;
@@ -38,7 +37,7 @@ abstract class CivicthemeSettingsFormSectionBase implements ContainerInjectionIn
    *   Theme manager service.
    * @param \Drupal\Core\Extension\ThemeExtensionList $themeExtensionList
    *   Theme extension list service.
-   * @param \Drupal\Core\File\FileSystem $fileSystem
+   * @param \Drupal\Core\File\FileSystemInterface $fileSystem
    *   File system service.
    * @param \Drupal\Core\File\FileUrlGenerator $fileUrlgenerator
    *   File URL generator.
@@ -51,7 +50,7 @@ abstract class CivicthemeSettingsFormSectionBase implements ContainerInjectionIn
    * @param \Drupal\Core\Image\ImageFactory $imageFactory
    *   The image factory.
    */
-  public function __construct(protected ThemeManager $themeManager, protected ThemeExtensionList $themeExtensionList, protected FileSystem $fileSystem, protected FileUrlGenerator $fileUrlgenerator, protected Messenger $messenger, protected ConfigManager $configManager, protected CivicthemeConfigManager $themeConfigManager, protected ImageFactory $imageFactory) {
+  public function __construct(protected ThemeManager $themeManager, protected ThemeExtensionList $themeExtensionList, protected FileSystemInterface $fileSystem, protected FileUrlGenerator $fileUrlgenerator, protected Messenger $messenger, protected ConfigManager $configManager, protected CivicthemeConfigManager $themeConfigManager, protected ImageFactory $imageFactory) {
   }
 
   /**