googleapis · bshaffer · Sep 29, 2025 · Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025
@@ -21,7 +21,7 @@
         "phpdocumentor/reflection": "^5.3.3||^6.0",
         "phpdocumentor/reflection-docblock": "^5.3",
         "erusev/parsedown": "^1.6",
-        "opis/closure": "^3",
+        "opis/closure": "^3.7|^4.0",
         "google/cloud-common-protos": "~0.5"
     },
     "suggest": {

@@ -23,6 +23,7 @@
  * A closure serializer utilizing
  * [Opis Closure Library](https://github.com/opis/closure).
  *
+ * @deprecated use OpisClosureSerializerV4
  * @experimental The experimental flag means that while we believe this method
  *      or class is ready for use, it may change before release in backwards-
  *      incompatible ways. Please use with caution, and test thoroughly when

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Core\Batch;
+
+use Opis\Closure;
+
+/**
+ * A closure serializer utilizing
+ * [Opis Closure Library](https://github.com/opis/closure).
+ *
+ * @experimental The experimental flag means that while we believe this method
+ *      or class is ready for use, it may change before release in backwards-
+ *      incompatible ways. Please use with caution, and test thoroughly when
+ *      upgrading.
+ */
+class OpisClosureSerializerV4 implements ClosureSerializerInterface
+{
+    /**
+     * Recursively serializes closures.
+     *
+     * @param mixed $data
+     */
+    public function wrapClosures(&$data)
+    {
+        $data = Closure\serialize($data);
+    }
+
+    /**
+     * Recursively unserializes closures.
+     *
+     * @param mixed $data
+     */
+    public function unwrapClosures(&$data)
+    {
+        $data = Closure\unserialize($data);
+    }
+}
@@ -96,6 +96,9 @@ private function getUnwrappedClientConfig()
      */
     private function getDefaultClosureSerializer()
     {
+        if (function_exists('Opis\Closure\serialize')) {
+            return new OpisClosureSerializerV4();
+        }
         if (class_exists(SerializableClosure::class)) {
             return new OpisClosureSerializer();
         }

@@ -18,6 +18,7 @@
 namespace Google\Cloud\Core\Tests\Unit\Batch;
 
 use Google\Cloud\Core\Batch\OpisClosureSerializer;
+use Google\Cloud\Core\Batch\OpisClosureSerializerV4;
 use Opis\Closure\SerializableClosure;
 use PHPUnit\Framework\TestCase;
 
@@ -27,25 +28,40 @@
  */
 class OpisClosureSerializerTest extends TestCase
 {
-    private $serialzer;
-
-    public function setUp(): void
+    public function testWrapAndUnwrapClosures()
     {
-        $this->serializer = new OpisClosureSerializer();
+        if (!method_exists(SerializableClosure::class, 'enterContext')) {
+            $this->markTestSkipped('Requires ops/serializer:v3');
+        }
+
+        $data['closure'] = function () {
+            return true;
+        };
+
+        $serializer = new OpisClosureSerializer();
+
+        $serializer->wrapClosures($data);
+        $this->assertInstanceOf(SerializableClosure::class, $data['closure']);
+
+        $serializer->unwrapClosures($data);
+        $this->assertTrue($data['closure']());
     }
 
-    public function testWrapAndUnwrapClosures()
+    public function testWrapAndUnwrapClosuresV4()
     {
+        if (!function_exists('Opis\Closure\serialize')) {
+            $this->markTestSkipped('Requires ops/serializer:v3');
+        }
+
         $data['closure'] = function () {
             return true;
         };
 
-        $this->serializer
-            ->wrapClosures($data);
+        $serializer = new OpisClosureSerializerV4();
+        $serializer->wrapClosures($data);
+        $this->assertIsString($data);
 
-        $this->assertInstanceOf(SerializableClosure::class, $data['closure']);
-        $this->serializer
-            ->unwrapClosures($data);
+        $serializer->unwrapClosures($data);
         $this->assertTrue($data['closure']());
     }
 }
@@ -141,6 +141,7 @@ public function testExceptionHandler($exception)
     /**
      * @dataProvider exceptionProvider
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testExceptionHandlerWithHttpContext($exception)
     {

@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Batch\BatchRunner;
 use Google\Cloud\Core\Batch\OpisClosureSerializer;
+use Google\Cloud\Core\Batch\OpisClosureSerializerV4;
 use Google\Cloud\Core\Report\EmptyMetadataProvider;
 use Google\Cloud\Core\Testing\GrpcTestTrait;
 use Google\Cloud\Core\Testing\TestHelpers;
@@ -313,6 +314,7 @@ public function testGetsPsrLogger()
 
     public function testOptionsArePassedToPsrLogger()
     {
+        $opisV4 = class_exists(OpisClosureSerializerV4::class);
         $options = [
             'metadataProvider' => new EmptyMetadataProvider,
             'batchEnabled' => true,
@@ -326,7 +328,7 @@ public function testOptionsArePassedToPsrLogger()
                 'projectId' => 'test'
             ],
             'batchRunner' => new BatchRunner,
-            'closureSerializer' => new OpisClosureSerializer,
+            'closureSerializer' => $opisV4 ? new OpisClosureSerializerV4 : new OpisClosureSerializer,
             'debugOutputResource' => fopen('php://temp', 'wb')
         ];
 
@@ -335,9 +337,8 @@ public function testOptionsArePassedToPsrLogger()
         $reflection = new \ReflectionClass($psrLogger);
         foreach ($options as $name => $value) {
             $attr = $reflection->getProperty($name);
-            $attr->setAccessible(true);
             $this->assertEquals(
-                $value,
+                $name === 'clientConfig' && $opisV4 ? serialize($value) : $value,
                 $attr->getValue($psrLogger),
                 "$name assertion failed."
             );

@@ -17,6 +17,7 @@
 
 namespace Google\Cloud\Logging\Tests\Unit;
 
+use Google\Cloud\Core\Batch\OpisClosureSerializerV4;
 use Google\Cloud\Core\Report\EmptyMetadataProvider;
 use Google\Cloud\Logging\Logger;
 use Google\Cloud\Logging\PsrLogger;
@@ -267,7 +268,9 @@ public function testSerializesCorrectly()
             $attr->setAccessible(true);
             $this->assertEquals(
                 $attr->getValue($psrLogger),
-                $options[$attributeName]
+                $attributeName === 'clientConfig'&& class_exists(OpisClosureSerializerV4::class)
+                    ? serialize($options[$attributeName])
+                    : $options[$attributeName]
             );
         }
     }

@@ -72,7 +72,7 @@
         "erusev/parsedown": "^1.6",
         "phpseclib/phpseclib": "^3.0",
         "google/cloud-tools": "^0.16.0",
-        "opis/closure": "^3.0",
+        "opis/closure": "^3.7||^4.0",
         "flix-tech/avro-php": "^5.0.0",
         "phpspec/prophecy-phpunit": "^2.1",
         "kreait/firebase-php": "^6.9",

@@ -6,6 +6,7 @@ parameters:
         # Ignore deprecated classes
         - Core/src/Lock/SymfonyLockAdapter.php
         - Core/src/PhpArray.php
+        - Core/src/Batch/OpisClosureSerializer.php
         # Ignore Monolog3 for now, as these tests run using Monolog2
         - Logging/src/LogMessageProcessor/MonologV3MessageProcessor.php
         - Logging/src/LogMessageProcessor/MonologV3MessageProcessor.php