fix: deprecation message in PsrLogger on PHP 8.1 (#5006)

googleapis · Feb 10, 2022 · 58ff66a · 58ff66a
1 parent f4da571
commit 58ff66a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/Logging/src/PsrLogger.php b/Logging/src/PsrLogger.php
@@ -430,6 +430,22 @@ public function getMetadataProvider()
      * @access private
      */
     public function serialize()
+    {
+        return serialize($this->__serialize());
+    }
+
+    /**
+     * Unserializes data.
+     *
+     * @param string
+     * @access private
+     */
+    public function unserialize($data)
+    {
+        $this->__unserialize(unserialize($data));
+    }
+
+    public function __serialize()
     {
         $debugOutputResource = null;
         if (is_resource($this->debugOutputResource)) {
@@ -440,7 +456,7 @@ public function serialize()
             ];
         }
 
-        return serialize([
+        return [
             $this->messageKey,
             $this->batchEnabled,
             $this->metadataProvider,
@@ -449,16 +465,10 @@ public function serialize()
             $this->batchMethod,
             $this->logName,
             $debugOutputResource
-        ]);
+        ];
     }
 
-    /**
-     * Unserializes data.
-     *
-     * @param string
-     * @access private
-     */
-    public function unserialize($data)
+    public function __unserialize(array $data)
     {
         list(
             $this->messageKey,
@@ -469,7 +479,7 @@ public function unserialize($data)
             $this->batchMethod,
             $this->logName,
             $debugOutputResource
-        ) = unserialize($data);
+        ) = $data;
 
         if (is_array($debugOutputResource)) {
             $this->debugOutputResource = fopen(

diff --git a/Logging/tests/Unit/PsrLoggerTest.php b/Logging/tests/Unit/PsrLoggerTest.php
@@ -277,7 +277,7 @@ public function testSerializesCorrectly()
         );
         $this->assertEquals(
             PHPUnit_Framework_Assert::readAttribute($psrLogger, 'logName'),
-            $this->logName
+            $options['logName']
         );
     }