Automated Drupal 10 compatibility fixes

Changed variable declaration from Protected to Public in /tests/src/Functional/ModuleInstallUninstallWebTest.php file due to Fatal Error encountered in job: https://www.drupal.org/pift-ci-job/2457239.

Also, added D10 in core requirement.

Please Review.

Added D10 in Drupal/core version of composer.json file.

Please review.

I rerolled the patch to add a couple of other fixes to @mnk-0210 's work.

This should apply cleanly. I Hope.

hello @edmund.dunn!

I noticed that in your patch you have included changes to fix these deprecation warnings in the php-aws library:

Call to deprecated method doesObjectExist() of class Aws\S3\S3ClientInterface: Use doesObjectExistV2() instead

and
Call to deprecated method doesBucketExist() of class Aws\S3\S3Client: Use doesBucketExistV2() instead

I think there are two problems with this:

1. the new method `doesObjectExistV2` has a new parameter that we should include, so just changing the name of the function won't work.
2. The parameter has to do with "delete markers" https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeleteMarker.html . Supporting this could be a good improvement for the module, but we should make a separate issue for it, so we don't introduce more changes in this one, which is about having the module support drupal 10.

For these reasons, I am including a patch that leaves the deprecated methods in place, but adds your other changes.

update drupal/flysystem dependency

_method: (OBSOLETE as of Symfony 3 see https://www.drupal.org/docs/drupal-apis/routing-system/structure-of-routes)

typo

Hello, I see that there have been recent patches. I would like to know how far away is the Drupal 10 compatibility upgrade from being released. My organization has an upgrade project and the last module we need is flysystem s3. Is there any assistance that is needed?

EDITED TO UPDATE: Thanks @Eli-T for your response. I found Patching info files with Composer which gave the tip to use the --prefer-source flag on the composer require command, which then doesn't change the info file and thus allows this patch to be applied.

Could the composer failures be caused by these lines? I'm on Drupal 9.5.10 and when I run composer require 'drupal/flysystem_s3:^2.0@RC' my flysystem_s3.info.yml doesn't look like the one I get when I git clone the module.

# version: 8.0-dev

# Information added by Drupal.org packaging script on 2022-03-25
version: '2.0.0-rc5'
project: 'flysystem_s3'
datestamp: 1648207248

@Kasey_MK it shouldn't do - those lines are added to the package when a release is created from the source code.

So of the test runs failing in #3297257-15: Automated Drupal 10 compatibility fixes

PHP 8.1 & MySQL 5.7, D9.5 run-tests.sh fatal error

Not sure what's going on here; at face value, the tests don't run because the module isn't in the directory it's expected?

PHP Fatal error:  Uncaught Drupal\Core\File\Exception\NotRegularDirectoryException: /var/www/html/modules/contrib/flysystem_s3 is not a directory. in /var/www/html/core/lib/Drupal/Core/File/FileSystem.php:664
Stack trace:
#0 /var/www/html/core/scripts/run-tests.sh(1106): Drupal\Core\File\FileSystem->scanDirectory('/var/www/html/m...', '/\\.php$/', Array)
#1 /var/www/html/core/scripts/run-tests.sh(161): simpletest_script_get_test_list()
#2 {main}
  thrown in /var/www/html/core/lib/Drupal/Core/File/FileSystem.php on line 664

PHP 8.0 & MySQL 5.7, D9.5 Composer require failure (and the following two)

These tests are configured to use PHP 8.0, but presumably since these tests were configured, flysystem has bumped its minimum version of PHP to 8.1 - see https://git.drupalcode.org/project/flysystem/-/blame/2.0.x/composer.json#L8 introduced during #3361958: Drupal 9.3+ compatibility.

Rerunning against PHP 8.1 now produces the

PHP Fatal error: Uncaught Drupal\Core\File\Exception\NotRegularDirectoryException: /var/www/html/modules/contrib/flysystem_s3 is not a directory. in /var/www/html/core/lib/Drupal/Core/File/FileSystem.php:664

So I think this is the only test issue we need to fix, so long as we remember not to run tests on PHP < 8.1.

It's also worth noting that if this module wants to continue to support PHP < 8.1 on Drupal 9 going forward, we will need to fork the module and pin a dependency on flysystem 2.0.0-beta2, because the mandating of PHP 8.1 in flysystem happened on the 2.0.x branch rather than the 2.1.x branch.

Tests do work run and pass locally - this is run on ddev against 2.0.x with the patch in #3297257-15: Automated Drupal 10 compatibility fixes.

So something is confusing on the D.O test runner.

elliot.ward@d9test-web:/var/www/html/web/core$ ../../vendor/bin/phpunit ../modules/contrib/flysystem_s3
PHPUnit 9.6.10 by Sebastian Bergmann and contributors.

Warning:       Your XML configuration validates against a deprecated schema.
Suggestion:    Migrate your XML configuration using "--migrate-configuration"!

Testing /var/www/html/web/modules/contrib/flysystem_s3
..........                                                        10 / 10 (100%)

Time: 00:06.724, Memory: 14.00 MB

OK (10 tests, 27 assertions)
elliot.ward@d9test-web:/var/www/html/web/core$ drush st | grep version
Drupal version : 9.5.10
PHP version    : 8.1.16
Drush version  : 11.6.0

I tried to raise run the tests in the Gitlab runner (#3377065: Convert to GitlabCI) to see if they failed the same way; alas they aren't running at all for some reason; I don't know if CI is somehow disabled on Gitlab for this project, and would need a maintainer to check.

We need to include the work done in #3372575: Can't see upload progress in Drupal 10 to replace jQuery once with the Drupal once library.

See change record https://www.drupal.org/node/3158256

As that was also only introduced into Drupal 9 at 9.2.0, we also need to bump the minimum version of Drupal 9 we support.

Have done some initial testing on Drupal 9 to make sure nothing has broken with the changes made so far, and all looks promising.

However on a standard install of Drupal after enabling the module and adding the requisite configuration to settings.php, the following error occurs on rebuilding cache:

❰elliot.ward❙~/code/d10test/recommended-project❱✘≻ ddev drush si standard
 You are about to:
 * DROP all tables in your 'db' database.

 Do you want to continue? (yes/no) [yes]:
 > yes

 [notice] Starting Drupal installation. This takes a while.
 [notice] Performed install task: install_select_language
 [notice] Performed install task: install_select_profile
 [notice] Performed install task: install_load_profile
 [notice] Performed install task: install_verify_requirements
 [notice] Performed install task: install_verify_database_ready
 [notice] Performed install task: install_base_system
 [notice] Performed install task: install_bootstrap_full
 [notice] Performed install task: install_profile_modules
 [notice] Performed install task: install_profile_themes
 [notice] Performed install task: install_install_profile
 [notice] Performed install task: install_configure_form
 [notice] Performed install task: install_finished
 [success] Installation complete.  User name: admin  User password: xxxxxxxx
❰elliot.ward❙~/code/d10test/recommended-project❱✔≻ ddev drush cr
 [notice] The file assets://css was not deleted because it does not exist.
 [success] Cache rebuild complete.
❰elliot.ward❙~/code/d10test/recommended-project❱✔≻ ddev drush cr
 [notice] The file assets://css was not deleted because it does not exist.
 [notice] The file assets://js was not deleted because it does not exist.
 [success] Cache rebuild complete.
❰elliot.ward❙~/code/d10test/recommended-project❱✔≻ ddev drush en flysystem_s3
The following module(s) will be enabled: flysystem_s3, flysystem

 Do you want to continue? (yes/no) [yes]:
 > yes

 [error]  The Flysystem driver is missing.
 [error]  The Flysystem driver is missing.
 [success] Successfully enabled: flysystem_s3, flysystem
❰elliot.ward❙~/code/d10test/recommended-project❱✔≻ ddev drush cr
 [error]  TypeError: Drupal\Core\Asset\JsCollectionOptimizer::__construct(): Argument #3 ($dumper) must be of type Drupal\Core\Asset\AssetDumperInterface, Drupal\Core\Theme\ThemeManager given, called in /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php on line 259 in Drupal\Core\Asset\JsCollectionOptimizer->__construct() (line 69 of /var/www/html/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php) #0 /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php(259): Drupal\Core\Asset\JsCollectionOptimizer->__construct(Object(Drupal\Core\Asset\JsCollectionGrouper), Object(Drupal\Core\Asset\JsOptimizer), Object(Drupal\Core\Theme\ThemeManager), Object(Drupal\Core\Asset\LibraryDependencyResolver), Object(Symfony\Component\HttpFoundation\RequestStack), Object(Drupal\flysystem_s3\File\FlysystemS3FileSystem), Object(Drupal\Core\Config\ConfigFactory), Object(Drupal\Core\File\FileUrlGenerator), Object(Drupal\Component\Datetime\Time), Object(Drupal\Core\Language\LanguageManager), Object(Drupal\Core\State\State))
#1 /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php(177): Drupal\Component\DependencyInjection\Container->createService(Array, 'asset.js.collec...')
#2 /var/www/html/vendor/drush/drush/src/Commands/core/CacheCommands.php(61): Drupal\Component\DependencyInjection\Container->get('asset.js.collec...')
#3 /var/www/html/vendor/drush/drush/src/Runtime/ServiceManager.php(321): Drush\Commands\core\CacheCommands::create(Object(Drupal\Core\DependencyInjection\Container), Object(League\Container\Container))
#4 /var/www/html/vendor/drush/drush/src/Boot/DrupalBoot8.php(310): Drush\Runtime\ServiceManager->instantiateServices(Array, Object(League\Container\Container), Object(Drupal\Core\DependencyInjection\Container))
#5 /var/www/html/vendor/drush/drush/src/Boot/DrupalBoot8.php(238): Drush\Boot\DrupalBoot8->addDrupalModuleDrushCommands(Object(Drush\Boot\BootstrapManager))
#6 /var/www/html/vendor/drush/drush/src/Boot/BootstrapManager.php(236): Drush\Boot\DrupalBoot8->bootstrapDrupalFull(Object(Drush\Boot\BootstrapManager), NULL)
#7 /var/www/html/vendor/drush/drush/src/Boot/BootstrapManager.php(422): Drush\Boot\BootstrapManager->doBootstrap(5, 6, NULL)
#8 /var/www/html/vendor/drush/drush/src/Application.php(228): Drush\Boot\BootstrapManager->bootstrapMax()
#9 /var/www/html/vendor/drush/drush/src/Application.php(194): Drush\Application->bootstrapAndFind('cr')
#10 /var/www/html/vendor/symfony/console/Application.php(262): Drush\Application->find('cr')
#11 /var/www/html/vendor/symfony/console/Application.php(174): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#12 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(110): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#13 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(40): Drush\Runtime\Runtime->doRun(Array, Object(Symfony\Component\Console\Output\ConsoleOutput))
#14 /var/www/html/vendor/drush/drush/drush.php(139): Drush\Runtime\Runtime->run(Array)
#15 /var/www/html/vendor/drush/drush/drush(4): require('/var/www/html/v...')
#16 /var/www/html/vendor/bin/drush(120): include('/var/www/html/v...')
#17 {main}.
TypeError: Drupal\Core\Asset\JsCollectionOptimizer::__construct(): Argument #3 ($dumper) must be of type Drupal\Core\Asset\AssetDumperInterface, Drupal\Core\Theme\ThemeManager given, called in /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php on line 259 in /var/www/html/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php on line 69 #0 /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php(259): Drupal\Core\Asset\JsCollectionOptimizer->__construct(Object(Drupal\Core\Asset\JsCollectionGrouper), Object(Drupal\Core\Asset\JsOptimizer), Object(Drupal\Core\Theme\ThemeManager), Object(Drupal\Core\Asset\LibraryDependencyResolver), Object(Symfony\Component\HttpFoundation\RequestStack), Object(Drupal\flysystem_s3\File\FlysystemS3FileSystem), Object(Drupal\Core\Config\ConfigFactory), Object(Drupal\Core\File\FileUrlGenerator), Object(Drupal\Component\Datetime\Time), Object(Drupal\Core\Language\LanguageManager), Object(Drupal\Core\State\State))
#1 /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php(177): Drupal\Component\DependencyInjection\Container->createService(Array, 'asset.js.collec...')
#2 /var/www/html/vendor/drush/drush/src/Commands/core/CacheCommands.php(61): Drupal\Component\DependencyInjection\Container->get('asset.js.collec...')
#3 /var/www/html/vendor/drush/drush/src/Runtime/ServiceManager.php(321): Drush\Commands\core\CacheCommands::create(Object(Drupal\Core\DependencyInjection\Container), Object(League\Container\Container))
#4 /var/www/html/vendor/drush/drush/src/Boot/DrupalBoot8.php(310): Drush\Runtime\ServiceManager->instantiateServices(Array, Object(League\Container\Container), Object(Drupal\Core\DependencyInjection\Container))
#5 /var/www/html/vendor/drush/drush/src/Boot/DrupalBoot8.php(238): Drush\Boot\DrupalBoot8->addDrupalModuleDrushCommands(Object(Drush\Boot\BootstrapManager))
#6 /var/www/html/vendor/drush/drush/src/Boot/BootstrapManager.php(236): Drush\Boot\DrupalBoot8->bootstrapDrupalFull(Object(Drush\Boot\BootstrapManager), NULL)
#7 /var/www/html/vendor/drush/drush/src/Boot/BootstrapManager.php(422): Drush\Boot\BootstrapManager->doBootstrap(5, 6, NULL)
#8 /var/www/html/vendor/drush/drush/src/Application.php(228): Drush\Boot\BootstrapManager->bootstrapMax()
#9 /var/www/html/vendor/drush/drush/src/Application.php(194): Drush\Application->bootstrapAndFind('cr')
#10 /var/www/html/vendor/symfony/console/Application.php(262): Drush\Application->find('cr')
#11 /var/www/html/vendor/symfony/console/Application.php(174): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#12 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(110): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#13 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(40): Drush\Runtime\Runtime->doRun(Array, Object(Symfony\Component\Console\Output\ConsoleOutput))
#14 /var/www/html/vendor/drush/drush/drush.php(139): Drush\Runtime\Runtime->run(Array)
#15 /var/www/html/vendor/drush/drush/drush(4): require('/var/www/html/v...')
#16 /var/www/html/vendor/bin/drush(120): include('/var/www/html/v...')
#17 {main}
TypeError: Drupal\Core\Asset\JsCollectionOptimizer::__construct(): Argument #3 ($dumper) must be of type Drupal\Core\Asset\AssetDumperInterface, Drupal\Core\Theme\ThemeManager given, called in /var/www/html/web/core/lib/Drupal/Component/DependencyInjection/Container.php on line 259 in Drupal\Core\Asset\JsCollectionOptimizer->__construct() (line 69 of /var/www/html/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php).
 [warning] Drush command terminated abnormally.
Failed to run drush cr: exit status 1

Looks like the issue in #3297257-24: Automated Drupal 10 compatibility fixes is due to #3378340: Service Updating for Drupal 10 and #3376399: Support new lazy asset collection optimizers & deprecate the serve_* options.

This happens on Drupal 10.1.1

This does not happen on Drupal 10.0.10.

Note the issue is in flysystem rather than flysystem_s3, but if we merged this as stands, then people would be able to install flysystem/flysystem_s3 on Drupal 10.1.x which would then break.

I have tested the current state of the MR against Drupal 10.0.10 and have not found any issues.

I would very much like others to test this branch before merging it and producing a Drupal 10 compatible release.

If you are going to test it, please test against Drupal 10.0.x, not 10.1.x as we know that will not work.

I was testing this merge request in my project and was trying to update Drupal 9 to Drupal 10.

I needed to use a fork to get the support for composer install and I bumped into an old issue https://www.drupal.org/project/flysystem_s3/issues/2910164. The fork installed fine but all the AWS packages were missing.

This might be how composer installs the fork but probably something people might encounter when trying to upgrade projects to Drupal 10.

I defined the repositories like this in composer.json

{
    "type": "composer",
    "url": "https://packages.drupal.org/8"
},
{
    "type": "package",
    "package": {
        "name": "drupal/flysystem_s3",
        "version": "dev-3297257-automated-drupal-10",
        "type": "drupal-module",
        "source": {
            "type": "git",
            "url": "https://git.drupalcode.org/issue/flysystem_s3-3297257.git",
            "reference": "3297257-automated-drupal-10"
        }
    }
},
...
"drupal/flysystem_s3": "dev-3297257-automated-drupal-10",

It seems like league/flysystem-aws-s3-v3 doesn't get installed and because of that some of the dependencies are missing. The module seemed to update and work fine after I required the missing package to my project composer project.

I also tested the tip from the old issue of removing the package and reinstalling it but that didn't have the desired effect.

@HeikkiY thank you so much for testing.

Sounds like we might need to reopen #2910164: PHP Fatal error: Class 'Aws\Credentials\Credentials' not found and figure out all the ways that can happen.

I normally add the repo of the fork for the merge request to the repositories section of the site's composer rather than add it as a package. I'm not sure if that makes a difference.

EG

"repositories": [
  {
    "type": "vcs
    "url": "https://git.drupalcode.org/issue/flysystem_s3-3297257.git"
  },
  {
    "type": "composer",
    "url": "https://packages.drupal.org/8"
  },
],
"require": {
  drupal/flysystem–s3: "dev-3297257-automated-drupal-10"
},

Hi @eli-t. Thanks a lot for the quick reply.

That did indeed solve my problem. All the packages got installed now. I also tried reverting the change and the packages got uninstalled so there is definitely a difference how it installs the dependencies in how the fork is defined.

I tried the same approach in another project and it didn't install because it couldn't find a composer.json in the project. So my guess is that if the project has a composer.json in it's root, it's best to use the vcs method and if there no composer.json in the module root, then the previous approach works.

The source I used originally was https://www.drupal.org/docs/develop/git/using-gitlab-to-contribute-to-dr....

EDIT: And now that I read the fork guide again really, really slowly, I do notice that it mentions the difference is indeed the existence of composer.json in the project. I think #2910164: PHP Fatal error: Class 'Aws\Credentials\Credentials' not found can remain closed and works as designed.

Tested that I can view images in S3 and also upload new ones.

I tried the same approach in another project and it didn't install because it couldn't find a composer.json in the project. So my guess is that if the project has a composer.json in it's root, it's best to use the vcs method and if there no composer.json in the module root, then the previous approach works.

Yeah, I found out you need the composer.json file in the module to do this recently! My take would be if there no composer.json in the module root, then add one!

Thanks again for testing, let me know how you get on.

@eli-t, testing worked fine. I was also able to do the testing with 10.1.2. I didn't notice any errors in dlog or during my testing. I did only try uploading a couple of images and also selecting an existing image. For example image styles seemed to work fine.

There was a PHP error about #lazy_builder but that only happened before all the composer and database updates were done. So at least for me I didn't yet encounter any show stoppers regarding #3376399: Support new lazy asset collection optimizers & deprecate the serve_* options.

Are there any specific tasks or features you would like to be tested?

That's interesting - are you using S3 for css and js aggregation? If not, that could be why you're not seeing any errors on 10.1.

No, we are not. We are only using S3 as media file system to share files between two Drupal installations. And yes, that explains it.

Hey I had issues applying the patch. There are some minor differences between drupal.org version and git version. I made version that works on drupal.org version but for some reason I am not able to attach it. The issue seemed to be info files comments added in drupal.org.

diff --git a/composer.json b/composer.json
index 20f49c5..b0268ff 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
   "name": "drupal/flysystem_s3",
   "require": {
-    "drupal/flysystem": "^2.0",
+    "drupal/flysystem": "^2.1@rc",
     "league/flysystem": "^1.0.20",
     "league/flysystem-aws-s3-v3": "^1.0, !=1.0.12, !=1.0.13",
-    "drupal/core": "^9.0"
+    "drupal/core": "^9 || ^10"
   }
 }
diff --git a/flysystem_s3.info.yml b/flysystem_s3.info.yml
index ba73fc3..4f38efc 100644
--- a/flysystem_s3.info.yml
+++ b/flysystem_s3.info.yml
@@ -1,11 +1,11 @@
 name: Flysystem Amazon S3
 description: 'Provides an Amazon S3 plugin for Flysystem.'
 type: module
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10.0
 # version: 8.0-dev
 package: Flysystem
 dependencies:
- - flysystem:flysystem
+  - flysystem:flysystem
 
 # Information added by Drupal.org packaging script on 2022-03-25
 version: '2.0.0-rc5'
diff --git a/flysystem_s3.routing.yml b/flysystem_s3.routing.yml
index 0bc1cb8..2d271a2 100644
--- a/flysystem_s3.routing.yml
+++ b/flysystem_s3.routing.yml
@@ -4,11 +4,11 @@ flysystem_s3.cors_sign:
     _controller: 'Drupal\flysystem_s3\Controller\S3CorsUploadAjaxController::signRequest'
   requirements:
     _permission: 'use S3 CORS upload'
-    _method: 'POST'
+  methods: [POST]
 flysystem_s3.cors_save:
   path: '/flysystem-s3/cors-upload-save'
   defaults:
     _controller: 'Drupal\flysystem_s3\Controller\S3CorsUploadAjaxController::saveFile'
   requirements:
     _permission: 'use S3 CORS upload'
-    _method: 'POST'
+  methods: [POST]
diff --git a/flysystem_s3.services.yml b/flysystem_s3.services.yml
index e36dc60..f209a3f 100644
--- a/flysystem_s3.services.yml
+++ b/flysystem_s3.services.yml
@@ -1,6 +1,6 @@
 services:
   flysystem_s3.file_system:
     public: false
-    class: \Drupal\flysystem_s3\File\FlysystemS3FileSystem
+    class: Drupal\flysystem_s3\File\FlysystemS3FileSystem
     decorates: file_system
     arguments: ['@stream_wrapper_manager', '@settings', '@logger.channel.file']
diff --git a/tests/src/Functional/ModuleInstallUninstallWebTest.php b/tests/src/Functional/ModuleInstallUninstallWebTest.php
index b33704d..755b9a4 100644
--- a/tests/src/Functional/ModuleInstallUninstallWebTest.php
+++ b/tests/src/Functional/ModuleInstallUninstallWebTest.php
@@ -14,6 +14,6 @@ class ModuleInstallUninstallWebTest extends Base {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['flysystem_s3'];
+  protected static $modules = ['flysystem_s3'];
 
 }
diff --git a/tests/src/Unit/Flysystem/S3Test.php b/tests/src/Unit/Flysystem/S3Test.php
index c574a71..b772102 100644
--- a/tests/src/Unit/Flysystem/S3Test.php
+++ b/tests/src/Unit/Flysystem/S3Test.php
@@ -13,6 +13,7 @@ use Drupal\flysystem_s3\Flysystem\S3;
 use League\Flysystem\AdapterInterface;
 use League\Flysystem\Config;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -23,6 +24,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
  */
 class S3Test extends UnitTestCase {
 
+  use ProphecyTrait;
   /**
    * @covers ::__construct
    * @covers ::getExternalUrl

Hi @Sceefo!

Which patch are you trying to use, and what exact version are you trying to apply it to? I recommend using the branch in the MR. If you can't work with a branch, you can get the patch from the MR by just adding .patch onto the URL of the MR.

EG https://git.drupalcode.org/project/flysystem_s3/-/merge_requests/9.patch

@Eli-T

I was trying to add https://www.drupal.org/files/issues/2023-06-01/flysystem_s3-d10compatibi... which is uploaded in this thread to drupal/flysystem_s3 loaded with composer.

The patch you linked looks quite a different. Will get back to this one.

I'd suggest trying to apply against the latest head on the 2.0.x branch. There are a lot of changes in the most recent commit to do with getting gitlab CI to run tests cleanly that aren't in the latest release

I've tested the patch successfully on 9.5 but haven't tried 10 yet

Thanks @polynya! Good to know.

I've tested this out against D10, and it seems to work.

Procedure employed:

1. Up'd base D10 ddev env using instructions: https://ddev.readthedocs.io/en/latest/users/quickstart/#drupal
2. Change minimum-stability to dev
   • prefer-stable is left as true
3. Added adjusted repo entries more or less according to #3297257-28: Automated Drupal 10 compatibility fixes, but with canonical to false on each entry
4. ddev composer require "drupal/flysystem_s3:dev-3297257-automated-drupal-10 as 2.x-dev"
5. configured $settings['flysystem'] in web/sites/default/settings.php (with the test-thing scheme)
   • made use of a key/secret ("borrowed" from an existing env)

   •     $settings['flysystem'] = [
           'test-thing' => [
             'driver' => 's3',
             'config' => [
               [... snipped key, secret, region, bucket, public and prefix values ...]
             ],
             'cache' => TRUE,
           ],
         ];
         

6. ddev drush en flysystem_s3
7. ddev drush cr ('cause paranoia)
8. ddev drush php-eval "var_dump(file_put_contents('test-thing://some-dir/file.txt', 'what'));"
   Output: int(4)
9. ddev drush php-eval "var_dump(file_get_contents('test-thing://some-dir/file.txt'));"
   Output: string(4) "what"

So, the write and read via PHP appears to work. Also, checked the S3 console to confirm that the file was created where it was expected, and it was. Tempted to flip this over to RTBC; however, I didn't verify the CORS functionality, so will let somebody else make the call. That said, the core read/write seems functional in D10.

Thanks @adam-vessey 💙

I think we have enough to proceed with a release now.

Setting to RTBC and adding credit