Commit 71cf4f3e authored by Conrad Lara's avatar Conrad Lara
Browse files

Issue #3289442 by n4r3n, cmlara, Project Update Bot: Automated Drupal 10 compatibility fixes

parent d3b66f97

s3fs.info.yml

+1 −1
Changes for s3fs.info.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
name: S3 File System

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^8.8 || ^9 || ^10

description: Adds an Amazon Simple Storage Service-based remote file system to Drupal.

type: module

configure: s3fs.admin_settings

src/Asset/S3fsCssOptimizer.php

+2 −0
Changes for src/Asset/S3fsCssOptimizer.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ class S3fsCssOptimizer extends CssOptimizer { 
      $url = $this->fileUrlGenerator->generateAbsoluteString($path);

    }

    else {

      // @todo remove when D9.3 is minimal supported version.

      // @phpstan-ignore-next-line

      $url = file_create_url($path);

    }

src/S3fsFileService.php

+1 −1
Changes for src/S3fsFileService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class S3fsFileService implements FileSystemInterface { 
  /**

   * Mime Type Guessing Service.

   *

   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface

   * @var \Symfony\Component\Mime\MimeTypesInterface|\Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface

   */

  protected $mimeGuesser;

src/S3fsService.php

+3 −3
Changes for src/S3fsService.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class S3fsService implements S3fsServiceInterface { 
  /**

   * An object for obtaining the system time.

   *

   * @var \Drupal\Component\DateTime\TimeInterface

   * @var \Drupal\Component\Datetime\TimeInterface

   */

  protected $time;
@@ -70,7 +70,7 @@ class S3fsService implements S3fsServiceInterface { 
   *   The new database connection object.

   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory

   *   The config factory object.

   * @param \Drupal\Component\DateTime\TimeInterface $time

   * @param \Drupal\Component\Datetime\TimeInterface $time

   *   An object to obtain the system time.

   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler

   *   The module handler.
@@ -591,7 +591,7 @@ class S3fsService implements S3fsServiceInterface { 
    // Create the temp table, into which all the refreshed data will be written.

    // After the full refresh is complete, the temp table will be swapped with

    // the real one.

    module_load_install('s3fs');

    $this->moduleHandler->loadInclude('s3fs', 'install');

    $schema = s3fs_schema();

    try {

      \Drupal::database()->schema()->dropTable('s3fs_file_temp');

tests/src/Unit/S3fsCssOptimizerTest.php

+1 −1
Changes for tests/src/Unit/S3fsCssOptimizerTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class S3fsCssOptimizerTest extends UnitTestCase { 
  /**

   * {@inheritdoc}

   */

  public function setUp() {

  public function setUp(): void {

    parent::setUp();



    // D9.3 we need to mock the FileUrlGenerator service.