Another "incompatible declaration" error was silently breaking s3 on PHP7.

Author: cdujeu

core/src/plugins/access.s3/S3AccessWrapper.php

@@ -106,8 +106,8 @@ protected static function getClientForContext(ContextInterface $ctx, $registerSt
                 $config["endpoint"] = $baseURL;
             }
             require_once("S3Client.php");
-            $s3Client = new S3Client($config);
-            $s3Client->registerStreamWrapper($repoObject->getId());
+            $s3Client = new S3Client($config, $repoObject->getId());
+            $s3Client->registerStreamWrapper();
             self::$clients[$repoObject->getId()] = $s3Client;
         }
         return self::$clients[$repoObject->getId()];

core/src/plugins/access.s3/S3Client.php

@@ -32,13 +32,25 @@
  */
 class S3Client extends AwsS3Client
 {
+    private $repositoryId;
+
+    /**
+     * S3Client constructor.
+     * @param array $args
+     * @param $repositoryId
+     */
+    public function __construct(array $args, $repositoryId)
+    {
+        $this->repositoryId = $repositoryId;
+        parent::__construct($args);
+    }
+
     /**
      * Register a new stream wrapper who overwrite the Amazon S3 stream wrapper with this client instance.
-     * @param string $repositoryId
-     * @return $this|void
+     * @return void
      */
-    public function registerStreamWrapper($repositoryId)
+    public function registerStreamWrapper()
     {
-        StreamWrapper::register($this, "s3.".$repositoryId, new S3CacheService());
+        StreamWrapper::register($this, "s3.".$this->repositoryId, new S3CacheService());
     }
 }