THRIFT-5961: Migrate PHPUnit tests to attributes and upgrade to PHPUnit 10+ (#3438)

Client: php
THRIFT-5962 PHPUnit major upgrade 
THRIFT-5961 attribute syntax migration

Author: sveneld

composer.json

@@ -21,7 +21,7 @@
         "php": "^8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5 || ^11.0 || ^12.0 || ^13.0",
         "squizlabs/php_codesniffer": "^3.10",
         "php-mock/php-mock-phpunit": "^2.10",
         "phpstan/phpstan": "^1.12",

lib/php/lib/Server/TForkingServer.php

@@ -101,6 +101,7 @@ private function handleChild(TTransport $transport)
      */
     private function collectChildren()
     {
+        $status = null;
         foreach ($this->children_ as $pid => $transport) {
             if (pcntl_waitpid($pid, $status, WNOHANG) > 0) {
                 unset($this->children_[$pid]);

lib/php/phpunit.xml

@@ -21,18 +21,15 @@
          bootstrap="test/bootstrap.php"
          cacheResult="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          stopOnWarning="true"
          stopOnFailure="true"
          processIsolation="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
+    <source>
+        <include>
             <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
     <testsuites>
         <testsuite name="Thrift PHP Unit Test Suite">
             <directory>./test/Unit</directory>

…p/test/Integration/BaseValidatorTest.php …ntegration/AbstractValidatorTestCase.phplib/php/test/Integration/BaseValidatorTest.php renamed to lib/php/test/Integration/AbstractValidatorTestCase.php lib/php/test/Integration/BaseValidatorTest.php renamed to lib/php/test/Integration/AbstractValidatorTestCase.php

@@ -26,7 +26,7 @@
 use Thrift\Protocol\TBinaryProtocol;
 use Thrift\Transport\TMemoryBuffer;
 
-abstract class BaseValidatorTest extends TestCase
+abstract class AbstractValidatorTestCase extends TestCase
 {
     abstract public function getNsGlobal();
 

lib/php/test/Integration/Lib/ClassLoader/ThriftClassLoaderTest.php

@@ -23,6 +23,7 @@
 
 use phpmock\phpunit\PHPMock;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Thrift\ClassLoader\ThriftClassLoader;
 
 /***
@@ -33,9 +34,7 @@ class ThriftClassLoaderTest extends TestCase
 {
     use PHPMock;
 
-    /**
-     * @dataProvider registerDefinitionDataProvider
-     */
+    #[DataProvider('registerDefinitionDataProvider')]
     public function testRegisterDefinition(
         $definitions,
         $class,
@@ -67,7 +66,7 @@ public function testRegisterDefinition(
         }
     }
 
-    public function registerDefinitionDataProvider()
+    public static function registerDefinitionDataProvider()
     {
         yield 'loadType' => [
             'definitions' => [

lib/php/test/Integration/Lib/Protocol/TJSONProtocolTest.php

@@ -22,6 +22,7 @@
 namespace Test\Thrift\Integration\Lib\Protocol;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Thrift\Protocol\TJSONProtocol;
 use Thrift\Transport\TMemoryBuffer;
 use Basic\ThriftTest\Insanity;
@@ -64,9 +65,7 @@ public function testMessageReadWrite()
         $this->assertSame('successResponse', $result);
     }
 
-    /**
-     * @dataProvider writeDataProvider
-     */
+    #[DataProvider('writeDataProvider')]
     public function testWrite(
         $argsClassName,
         $argsValues,
@@ -80,7 +79,7 @@ public function testWrite(
         $this->assertEquals($expected, $actual);
     }
 
-    public function writeDataProvider()
+    public static function writeDataProvider()
     {
         if (!is_dir(__DIR__ . '/../../../Resources/packages/php')) {
             throw new \RuntimeException(
@@ -316,9 +315,7 @@ public function writeDataProvider()
         ];
     }
 
-    /**
-     * @dataProvider readDataProvider
-     */
+    #[DataProvider('readDataProvider')]
     public function testRead(
         $buffer,
         $argsClassName,
@@ -343,7 +340,7 @@ public function testRead(
         }
     }
 
-    public function readDataProvider()
+    public static function readDataProvider()
     {
         yield 'void' => [
             'buffer' => '{}',

lib/php/test/Integration/Lib/Protocol/TSimpleJSONProtocolTest.php

@@ -22,6 +22,7 @@
 namespace Test\Thrift\Integration\Lib\Protocol;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Thrift\Protocol\TJSONProtocol;
 use Thrift\Protocol\TSimpleJSONProtocol;
 use Thrift\Transport\TMemoryBuffer;
@@ -64,9 +65,7 @@ public function testMessageWrite()
         $this->assertSame('["testString",1,0,{"thing":"test"}]', $this->protocol->getTransport()->getBuffer());
     }
 
-    /**
-     * @dataProvider writeDataProvider
-     */
+    #[DataProvider('writeDataProvider')]
     public function testWrite(
         $argsClassName,
         $argsValues,
@@ -80,7 +79,7 @@ public function testWrite(
         $this->assertEquals($expected, $actual);
     }
 
-    public function writeDataProvider()
+    public static function writeDataProvider()
     {
         if (!is_dir(__DIR__ . '/../../../Resources/packages/php')) {
             throw new \RuntimeException(

lib/php/test/Integration/ValidatorOopTest.php

@@ -25,7 +25,7 @@
  * This test suite depends on running the compiler against the ./Resources/ThriftTest.thrift file:
  * lib/php/test$ ../../../compiler/cpp/thrift --gen php:validate,oop,nsglobal="ValidateOop" -r --out ./Resources/packages/phpvo ./Resources/ThriftTest.thrift
  */
-class ValidatorOopTest extends BaseValidatorTest
+class ValidatorOopTest extends AbstractValidatorTestCase
 {
     public function getNsGlobal()
     {

lib/php/test/Integration/ValidatorTest.php

@@ -25,7 +25,7 @@
  * This test suite depends on running the compiler against the ./Resources/ThriftTest.thrift file:
  * lib/php/test$ ../../../compiler/cpp/thrift --gen php:validate,nsglobal="Validate" -r  --out ./Resources/packages/phpv ./Resources/ThriftTest.thrift
  */
-class ValidatorTest extends BaseValidatorTest
+class ValidatorTest extends AbstractValidatorTestCase
 {
     public function getNsGlobal()
     {

lib/php/test/Unit/Lib/ClassLoader/ThriftClassLoaderTest.php

@@ -23,15 +23,14 @@
 
 use phpmock\phpunit\PHPMock;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Thrift\ClassLoader\ThriftClassLoader;
 
 class ThriftClassLoaderTest extends TestCase
 {
     use PHPMock;
 
-    /**
-     * @dataProvider registerNamespaceDataProvider
-     */
+    #[DataProvider('registerNamespaceDataProvider')]
     public function testRegisterNamespace(
         $namespaces,
         $class,
@@ -62,7 +61,7 @@ public function testRegisterNamespace(
         }
     }
 
-    public function registerNamespaceDataProvider()
+    public static function registerNamespaceDataProvider()
     {
         yield 'default' => [
             'namespaces' => [