Update deprecation warning (#2640)

aws · Feb 17, 2023 · 5db91ee · rquadling · Aug 1, 2023 · 5db91ee
1 parent ceb929c
commit 5db91ee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/AwsClient.php b/src/AwsClient.php
@@ -596,7 +596,7 @@ public static function emitDeprecationWarning() {
         $phpVersion = PHP_VERSION_ID;
         if ($phpVersion <  70205) {
             $phpVersionString = phpversion();
-            trigger_error(
+            @trigger_error(
                 "This installation of the SDK is using PHP version"
                 .  " {$phpVersionString}, which will be deprecated on August"
                 .  " 15th, 2023.  Please upgrade your PHP version to a minimum of"

diff --git a/tests/AwsClientTest.php b/tests/AwsClientTest.php
@@ -610,15 +610,20 @@ public function testThrowsDeprecationWarning() {
         $expectsDeprecation = PHP_VERSION_ID < 70205;
         if ($expectsDeprecation) {
             try {
-                $this->expectDeprecation();
-                $this->expectDeprecationMessage("This installation of the SDK is using PHP version");
+                set_error_handler(function ($e, $message) {
+                    $this->assertStringContainsString("This installation of the SDK is using PHP version", $message);
+                    $this->assertEquals($e, E_USER_DEPRECATED);
+                    throw new Exception("This test successfully triggered the deprecation");
+                });
                 $client = new StsClient([
                     'region'  => 'us-west-2',
                     'version' => 'latest'
                 ]);
                 $this->fail("This test should have thrown the deprecation");
+            } catch (Exception $exception) {
             } finally {
                 putenv("AWS_SUPPRESS_PHP_DEPRECATION_WARNING={$storeEnvVariable}");
+                restore_error_handler();
             }
         } else {
             $client = new StsClient([
@@ -642,12 +647,17 @@ public function testCanDisableWarningWithClientConfig() {
         $expectsDeprecation = PHP_VERSION_ID < 70205;
         if ($expectsDeprecation) {
             try {
+                set_error_handler(function ($e, $message) {
+                    $this->assertStringNotContainsString("This installation of the SDK is using PHP version", $message);
+                });
                 $client = new StsClient([
                     'region'  => 'us-west-2',
                     'version' => 'latest',
                     'suppress_php_deprecation_warning' => true
                 ]);
+                restore_error_handler();
             } catch (Exception $exception) {
+                restore_error_handler();
                 $this->fail("This test should not have thrown the deprecation");
             }
         } else {
@@ -663,11 +673,17 @@ public function testCanDisableWarningWithEnvVar() {
         $expectsDeprecation = PHP_VERSION_ID < 70205;
         if ($expectsDeprecation) {
             try {
+                set_error_handler(function ($e, $message) {
+                    echo "hi";
+                    $this->assertStringNotContainsString("This installation of the SDK is using PHP version", $message);
+                });
                 $client = new StsClient([
                     'region'  => 'us-west-2',
                     'version' => 'latest'
                 ]);
+                restore_error_handler();
             } catch (Exception $exception) {
+                restore_error_handler();
                 $this->fail("This test should not have thrown the deprecation");
             }
         } else {