bugfix: update deprecated command methods (#2938)

aws · Jun 6, 2024 · af1f00d · af1f00d
1 parent 3e1cc8f
commit af1f00d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.changes/nextrelease/multi-auth-update.json b/.changes/nextrelease/multi-auth-update.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "bugfix",
+    "category": "",
+    "description": "Updates error level on deprecated `Command` methods.  Removes suppressed call to deprecated method."
+  }
+]
diff --git a/src/Command.php b/src/Command.php
@@ -78,7 +78,7 @@ public function setAuthSchemes(array $authSchemes)
         trigger_error(__METHOD__ . ' is deprecated.  Auth schemes '
             . 'resolved using the service `auth` trait or via endpoint resolution '
             . 'are now set in the command `@context` property.`'
-            , E_USER_DEPRECATED
+            , E_USER_WARNING
         );
 
         $this->authSchemes = $authSchemes;
@@ -99,7 +99,7 @@ public function getAuthSchemes()
         trigger_error(__METHOD__ . ' is deprecated.  Auth schemes '
         . 'resolved using the service `auth` trait or via endpoint resolution '
         . 'can now be found in the command `@context` property.`'
-        , E_USER_DEPRECATED
+        , E_USER_WARNING
         );
 
         return $this->authSchemes ?: [];

diff --git a/src/EndpointV2/EndpointV2Middleware.php b/src/EndpointV2/EndpointV2Middleware.php
@@ -231,7 +231,6 @@ private function applyAuthScheme(
     ): void
     {
         $authScheme = $this->resolveAuthScheme($authSchemes);
-        @$command->setAuthSchemes($authScheme);
 
         $command['@context']['signature_version'] = $authScheme['version'];
 

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -86,10 +86,10 @@ public function testCanAccessLikeArray()
         $this->assertNull($c['boo']);
     }
 
-    public function testGetAuthSchemesEmitsDeprecationNotice()
+    public function testGetAuthSchemesEmitsWarning()
     {
-        $this->expectDeprecation(E_USER_DEPRECATED);
-        $this->expectDeprecationMessage(
+        $this->expectWarning();
+        $this->expectWarningMessage(
             'Aws\Command::getAuthSchemes is deprecated.  Auth schemes resolved using the service'
         .' `auth` trait or via endpoint resolution can now be found in the command `@context` property.'
         );
@@ -98,10 +98,10 @@ public function testGetAuthSchemesEmitsDeprecationNotice()
         $c->getAuthSchemes();
     }
 
-    public function testSetAuthSchemesEmitsDeprecationNotice()
+    public function testSetAuthSchemesEmitsWarning()
     {
-        $this->expectDeprecation(E_USER_DEPRECATED);
-        $this->expectDeprecationMessage(
+        $this->expectWarning();
+        $this->expectWarningMessage(
             'Aws\Command::setAuthSchemes is deprecated.  Auth schemes resolved using the service'
             .' `auth` trait or via endpoint resolution are now set in the command `@context` property.'
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,7 +231,6 @@ private function applyAuthScheme( @@
         ): void
         {
             $authScheme = $this->resolveAuthScheme($authSchemes);
-            @$command->setAuthSchemes($authScheme);
             $command['@context']['signature_version'] = $authScheme['version'];
@@ Expand Down @@