Merge branch '33.x' into 33.x-202601292048

Author: esrauchg

php/composer.json

@@ -9,7 +9,7 @@
     "php": ">=8.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=5.0.0 <8.5.27"
+    "phpunit/phpunit": ">=10.5.62 <11.0.0"
   },
   "suggest": {
     "ext-bcmath": "Need to support JSON deserialization"

php/composer.json.dist

@@ -9,7 +9,7 @@
     "php": ">=8.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=5.0.0 <8.5.27"
+    "phpunit/phpunit": ">=10.5.62 <11.0.0"
   },
   "suggest": {
     "ext-bcmath": "Need to support JSON deserialization"

php/tests/EncodeDecodeTest.php

@@ -1596,7 +1596,7 @@ public function testWrapperSetUnwrappedJsonEncode(
         $this->assertEquals($defaultValue, $to->getOneofFieldUnwrapped());
     }
 
-    public function wrappersDataProvider()
+    public static function wrappersDataProvider()
     {
         return [
             [TestInt32Value::class, 1, "1", 0, "0"],

php/tests/GeneratedClassTest.php

@@ -1964,15 +1964,15 @@ public function testSpecialCharacters()
         $this->assertEquals('     */', array_pop($commentLines));
         $docComment = implode("\n", $commentLines);
         // test special characters
-        $this->assertContains(";,/?:&=+$-_.!~*'()", $docComment);
+        $this->assertStringContainsString(";,/?:&=+$-_.!~*'()", $docComment);
         // test open doc comment
-        $this->assertContains('/*', $docComment);
+        $this->assertStringContainsString('/*', $docComment);
         // test escaped closed doc comment
-        $this->assertNotContains('*/', $docComment);
-        $this->assertContains('{@*}', $docComment);
+        $this->assertStringNotContainsString('*/', $docComment);
+        $this->assertStringContainsString('{@*}', $docComment);
         // test escaped at-sign
-        $this->assertContains('\@foo', $docComment);
+        $this->assertStringContainsString('\@foo', $docComment);
         // test forwardslash on new line
-        $this->assertContains("* /\n", $docComment);
+        $this->assertStringContainsString("* /\n", $docComment);
     }
 }

php/tests/GeneratedPhpdocTest.php

@@ -18,8 +18,8 @@ public function testPhpDocForConstructor()
     {
         $class = new ReflectionClass('Foo\TestMessage');
         $doc = $class->getMethod('__construct')->getDocComment();
-        $this->assertStringContains('@param array $data', $doc);
-        $this->assertStringContains('@type int $optional_int32', $doc);
+        $this->assertStringContainsString('@param array $data', $doc);
+        $this->assertStringContainsString('@type int $optional_int32', $doc);
     }
 
     /**
@@ -34,7 +34,7 @@ public function testPhpDocForIntGetters($methods, $expectedDoc)
         }
     }
 
-    public function providePhpDocForGettersAndSetters()
+    public static function providePhpDocForGettersAndSetters()
     {
         return [
             [

php/tests/PhpImplementationTest.php

@@ -582,7 +582,7 @@ public function testArrayConstructorWithNullValuesThrowsException($requestData)
         $m = new TestMessage($requestData);
     }
 
-    public function provideArrayConstructorWithNullValuesThrowsException()
+    public static function provideArrayConstructorWithNullValuesThrowsException()
     {
         return [
             [['optional_int32' => null]],

php/tests/PreviouslyGeneratedClassTest.php

@@ -12,13 +12,19 @@ class PreviouslyGeneratedClassTest extends TestBase
     public function testPrefixForReservedWords()
     {
         // In newer versions of PHP, we cannot reference the old class name.
-        if (version_compare(phpversion(), '8.1.0', '>=')) return;
+        if (version_compare(phpversion(), '8.1.0', '>=')) {
+          $this->markTestSkipped('readonly is reserved in PHP >= 8.2');
+        }
 
         // For older versions of PHP, verify that we can reference the
         // original class name.
         eval('
           $m = new \Previous\readonly();
           $this->assertTrue(true);
         ');
+
+        // If execution reaches this line, it means no exception was thrown.
+        // This assertion prevents PHPUnit from marking the test as risky.
+        $this->assertTrue(true);
     }
 }

php/tests/WellKnownTest.php

@@ -441,7 +441,7 @@ public function testEnumNameValueConversion($class)
         }
     }
 
-    public function enumNameValueConversionDataProvider()
+    public static function enumNameValueConversionDataProvider()
     {
         return [
             ['\Google\Protobuf\Field\Cardinality'],
@@ -467,7 +467,7 @@ public function testReflectionProperty($property, $default)
         self::assertNull($reflectionProperty->getValue($testMessage));
     }
 
-    public function optionalFieldsDataProvider()
+    public static function optionalFieldsDataProvider()
     {
         return [
             ['true_optional_int32', 0],

php/tests/WrapperTypeSettersTest.php

@@ -57,7 +57,7 @@ public function testGettersAndSetters(
         }
     }
 
-    public function gettersAndSettersDataProvider()
+    public static function gettersAndSettersDataProvider()
     {
         return [
             [TestWrapperSetters::class, DoubleValue::class, "setDoubleValue", "setDoubleValueUnwrapped", "getDoubleValue", "getDoubleValueUnwrapped", [
@@ -155,7 +155,7 @@ public function testInvalidSetters($class, $setter, $value)
         (new $class())->$setter($value);
     }
 
-    public function invalidSettersDataProvider()
+    public static function invalidSettersDataProvider()
     {
         return [
             [TestWrapperSetters::class, "setDoubleValueUnwrapped", "abc"],
@@ -212,7 +212,7 @@ public function testConstructorWithWrapperType($class, $wrapperClass, $wrapperFi
         $this->assertEquals($expectedInstance->$getter()->getValue(), $actualInstance->$getter()->getValue());
     }
 
-    public function constructorWithWrapperTypeDataProvider()
+    public static function constructorWithWrapperTypeDataProvider()
     {
         return [
             [TestWrapperSetters::class, DoubleValue::class, 'double_value', 'getDoubleValue', 1.1],
@@ -247,7 +247,7 @@ public function testConstructorWithRepeatedWrapperType($wrapperField, $getter, $
         $this->assertTrue(true);
     }
 
-    public function constructorWithRepeatedWrapperTypeDataProvider()
+    public static function constructorWithRepeatedWrapperTypeDataProvider()
     {
         $sv7 = new StringValue(['value' => 'seven']);
         $sv8 = new StringValue(['value' => 'eight']);
@@ -292,7 +292,7 @@ public function testConstructorWithMapWrapperType($wrapperField, $getter, $value
         $this->assertTrue(true);
     }
 
-    public function constructorWithMapWrapperTypeDataProvider()
+    public static function constructorWithMapWrapperTypeDataProvider()
     {
         $sv7 = new StringValue(['value' => 'seven']);
         $sv8 = new StringValue(['value' => 'eight']);