Merge branch 'develop' into 1.17.x

JediKev · Nov 9, 2022 · 2271e01 · 2271e01
2 parents adfef05 + ac2576a
commit 2271e01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/auth-oauth2/oauth2.php b/auth-oauth2/oauth2.php
@@ -646,7 +646,6 @@ class MicrosoftEmailOauth2Provider extends GenericEmailOauth2Provider {
     static $urlOptions = [
         'tenant' => 'common',
         'accessType' => 'offline_access',
-        'prompt' => 'consent',
         ];
 }
 ?>
diff --git a/storage-s3/plugin.php b/storage-s3/plugin.php
@@ -12,8 +12,7 @@
         "aws/aws-sdk-php" => array(
             'version' => "3.*",
             'map' => array(
-                'aws/aws-sdk-php/src/{Api*,Arn*,ClientSideMonitoring*,Credentials*,DefaultsMode*,Endpoint*,Exception*,Handler*,Retry*,S3*,Signature*,*.php}' => 'lib/Aws',
-                'aws/aws-sdk-php/src/data' => 'lib/Aws',
+                'aws/aws-sdk-php/src' => 'lib/Aws',
                 'guzzlehttp/guzzle/src' => 'lib/GuzzleHttp',
                 'guzzlehttp/promises/src' => 'lib/GuzzleHttp/Promise',
                 'guzzlehttp/psr7/src/' => 'lib/GuzzleHttp/Psr7',
@@ -24,6 +23,12 @@
             ),
         ),
     ),
+    'scripts' =>  array(
+        'pre-autoload-dump' => 'Aws\\Script\\Composer\\Composer::removeUnusedServices',
+    ),
+    'extra' => array(
+        'aws/aws-sdk-php' => 'S3',
+    ),
     'plugin' =>         'storage.php:S3StoragePlugin'
 );