[CI] Fix test runner and update PHPUnit version

tPl0ch · tPl0ch · commit b38f5a9eac19 · 2022-03-06T17:06:30.000Z
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.lock
 bin/composer.phar
 !bin/php
 !build/.gitkeep
+.phpunit.result.cache
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,19 @@
-ARG PHP_VERSION=7.1
+ARG PHP_VERSION=8.0
 
 FROM php:${PHP_VERSION}-cli-alpine
 
-ARG XDEBUG_VERSION=2.7.0RC1
+ARG XDEBUG_VERSION=3.1.3
 
 RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
     && apk add --no-cache --virtual .runtime-deps git libzip-dev gmp-dev \
     && docker-php-ext-install zip gmp \
     && pecl install xdebug-$XDEBUG_VERSION \
     && docker-php-ext-enable xdebug \
     && echo "xdebug.max_nesting_level=15000" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
-    && echo "xdebug.remote_enable=true" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
     && echo "xdebug.remote_host=localhost" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
     && echo "xdebug.idekey=PHPSTORM" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
     && echo "xdebug.remote_handler=dbgp" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
-    && echo "xdebug.remote_autostart=1" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
-    && echo "xdebug.remote_connect_back=0" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
+    && echo "xdebug.mode=develop" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \
     && git clone --recursive --depth=1 https://github.com/kjdev/php-ext-snappy.git \
     && cd php-ext-snappy \
     && phpize \
diff --git a/Makefile b/Makefile
@@ -4,10 +4,10 @@ MAKEFLAGS =+ -rR --warn-undefined-variables
 .PHONY: composer-install composer-update examples docker run
 
 COMPOSER ?= bin/composer.phar
-COMPOSER_VERSION ?= 1.8.3
+COMPOSER_VERSION ?= 2.2.7
 PHP ?= bin/php
-PHP_VERSION ?= 7.2
-XDEBUG_VERSION ?= 2.7.0RC1
+PHP_VERSION ?= 8.0
+XDEBUG_VERSION ?= 3.1.3
 
 export
 
diff --git a/composer.json b/composer.json
@@ -3,10 +3,10 @@
     "description": "Avro schema encoder/decoder. Fork of rg/avro-php",
     "license": "Apache-2.0",
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.4|>=8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "~8.5"
     },
     "suggest": {
         "ext-gmp": "Large integer support for 32-bit platforms.",
diff --git a/lib/avro/schema.php b/lib/avro/schema.php
@@ -1170,7 +1170,7 @@ public function __construct($name, $doc, $symbols, &$schemata=null, $logical_typ
     foreach ($symbols as $symbol)
       if (!is_string($symbol) || empty($symbol))
         throw new AvroSchemaParseException(
-          sprintf('Enum schema symbol must be a string %',
+          sprintf('Enum schema symbol must be a string %s',
                   print_r($symbol, true)));
 
     parent::__construct(AvroSchema::ENUM_SCHEMA, $name, $doc, $schemata, $logical_type, $extra_attributes);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
         colors="true"
 >
 
@@ -12,4 +12,10 @@
         </whitelist>
     </filter>
 
+    <testsuites>
+        <testsuite name="unit">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+
 </phpunit>
diff --git a/test/AllTests.php b/test/AllTests.php
@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 
+use PHPUnit\Framework\TestSuite;
+
 require_once('DataFileTest.php');
 require_once('SchemaTest.php');
 require_once('NameTest.php');
@@ -35,11 +37,11 @@
 class AllTests
 {
   /**
-   * @return PHPUnit_Framework_TestSuite
+   * @return TestSuite
    */
   public static function suite()
   {
-    $suite = new PHPUnit_Framework_TestSuite('AvroAllTests');
+    $suite = new TestSuite('AvroAllTests');
     $suite->addTestSuite('DataFileTest');
     $suite->addTestSuite('SchemaTest');
     $suite->addTestSuite('NameTest');
diff --git a/test/DataFileTest.php b/test/DataFileTest.php
@@ -22,7 +22,7 @@
 /**
  * Class DataFileTest
  */
-class DataFileTest extends PHPUnit_Framework_TestCase
+class DataFileTest extends \PHPUnit\Framework\TestCase
 {
   private $data_files;
   const REMOVE_DATA_FILES = true;
@@ -62,14 +62,14 @@ protected function remove_data_files()
         $this->remove_data_file($data_file);
   }
 
-  protected function setUp()
+  protected function setUp(): void
   {
     if (!file_exists(TEST_TEMP_DIR))
       mkdir(TEST_TEMP_DIR);
     $this->remove_data_files();
   }
 
-  protected function tearDown()
+  protected function tearDown(): void
   {
     $this->remove_data_files();
   }
diff --git a/test/DatumIOTest.php b/test/DatumIOTest.php
@@ -22,7 +22,7 @@
 /**
  * Class DatumIOTest
  */
-class DatumIOTest extends PHPUnit_Framework_TestCase
+class DatumIOTest extends \PHPUnit\Framework\TestCase
 {
   /**
    * @dataProvider data_provider
diff --git a/test/FileIOTest.php b/test/FileIOTest.php
@@ -22,9 +22,9 @@
 /**
  * Tests against a preexisting file created by a different library
  */
-class FileIOTest extends PHPUnit_Framework_TestCase
+class FileIOTest extends \PHPUnit\Framework\TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $file = $this->getTmpFile();
         if (file_exists($file))
diff --git a/test/FloatIntEncodingTest.php b/test/FloatIntEncodingTest.php
@@ -21,7 +21,7 @@
 /**
  * Class FloatIntEncodingTest
  */
-class FloatIntEncodingTest extends PHPUnit_Framework_TestCase
+class FloatIntEncodingTest extends \PHPUnit\Framework\TestCase
 {
   const FLOAT_TYPE = 'float';
   const DOUBLE_TYPE = 'double';
@@ -57,7 +57,7 @@ static function make_special_vals()
     self::$INT_BITS_NEG_INF  = strrev(pack('H*', 'ff800000'));
   }
 
-  function setUp()
+  function setUp(): void
   {
     self::make_special_vals();
   }
diff --git a/test/IODatumReaderTest.php b/test/IODatumReaderTest.php
@@ -22,7 +22,7 @@
 /**
  * Class IODatumReaderTest
  */
-class IODatumReaderTest extends PHPUnit_Framework_TestCase
+class IODatumReaderTest extends \PHPUnit\Framework\TestCase
 {
 
   public function testSchemaMatching()
diff --git a/test/InterOpTest.php b/test/InterOpTest.php
@@ -22,12 +22,12 @@
 /**
  * Class InterOpTest
  */
-class InterOpTest extends PHPUnit_Framework_TestCase
+class InterOpTest extends \PHPUnit\Framework\TestCase
 {
   var $projection_json;
   var $projection;
 
-  public function setUp()
+  public function setUp(): void
   {
     $interop_schema_file_name = AVRO_INTEROP_SCHEMA;
     $this->projection_json = file_get_contents($interop_schema_file_name);
diff --git a/test/LongEncodingTest.php b/test/LongEncodingTest.php
@@ -21,10 +21,10 @@
 /**
  * Class LongEncodingTest
  */
-class LongEncodingTest extends PHPUnit_Framework_TestCase
+class LongEncodingTest extends \PHPUnit\Framework\TestCase
 {
 
-  function setUp()
+  function setUp(): void
   {
     Avro::check_platform();
   }
diff --git a/test/NameTest.php b/test/NameTest.php
@@ -60,7 +60,7 @@ function __toString()
 /**
  * Class NameTest
  */
-class NameTest extends PHPUnit_Framework_TestCase
+class NameTest extends \PHPUnit\Framework\TestCase
 {
 
   /**
@@ -128,6 +128,6 @@ function name_provider()
    */
   function test_name($name, $is_well_formed)
   {
-    $this->assertEquals(AvroName::is_well_formed_name($name), $is_well_formed, $name);
+    $this->assertEquals(AvroName::is_well_formed_name($name), $is_well_formed, $name ?? "null");
   }
 }
diff --git a/test/ProtocolFileTest.php b/test/ProtocolFileTest.php
@@ -23,9 +23,9 @@
 /**
  * Class ProtocolFileTest
  */
-class ProtocolFileTest extends PHPUnit_Framework_TestCase
+class ProtocolFileTest extends \PHPUnit\Framework\TestCase
 {
-  protected function setUp() {
+  protected function setUp(): void {
   }
 
   public function testParsing() {
diff --git a/test/SchemaTest.php b/test/SchemaTest.php
@@ -53,7 +53,7 @@ function __construct($schema_string, $is_valid, $normalized_schema_string=null,
 /**
  * Class SchemaTest
  */
-class SchemaTest extends PHPUnit_Framework_TestCase
+class SchemaTest extends \PHPUnit\Framework\TestCase
 {
   static $examples = array();
   static $valid_examples = array();
diff --git a/test/StringIOTest.php b/test/StringIOTest.php
@@ -22,7 +22,7 @@
 /**
  * Class StringIOTest
  */
-class StringIOTest extends PHPUnit_Framework_TestCase
+class StringIOTest extends \PHPUnit\Framework\TestCase
 {
 
   public function test_write()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`/**`
`23`	`23`	`* Class DataFileTest`
`24`	`24`	`*/`
`25`		`-class DataFileTest extends PHPUnit_Framework_TestCase`
	`25`	`+class DataFileTest extends \PHPUnit\Framework\TestCase`
`26`	`26`	`{`
`27`	`27`	`private $data_files;`
`28`	`28`	`const REMOVE_DATA_FILES = true;`
`@@ -62,14 +62,14 @@ protected function remove_data_files()`
`62`	`62`	`$this->remove_data_file($data_file);`
`63`	`63`	`}`
`64`	`64`
`65`		`- protected function setUp()`
	`65`	`+ protected function setUp(): void`
`66`	`66`	`{`
`67`	`67`	`if (!file_exists(TEST_TEMP_DIR))`
`68`	`68`	`mkdir(TEST_TEMP_DIR);`
`69`	`69`	`$this->remove_data_files();`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected function tearDown()`
	`72`	`+ protected function tearDown(): void`
`73`	`73`	`{`
`74`	`74`	`$this->remove_data_files();`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@`
`22`	`22`	`/**`
`23`	`23`	`* Tests against a preexisting file created by a different library`
`24`	`24`	`*/`
`25`		`-class FileIOTest extends PHPUnit_Framework_TestCase`
	`25`	`+class FileIOTest extends \PHPUnit\Framework\TestCase`
`26`	`26`	`{`
`27`		`- protected function tearDown()`
	`27`	`+ protected function tearDown(): void`
`28`	`28`	`{`
`29`	`29`	`$file = $this->getTmpFile();`
`30`	`30`	`if (file_exists($file))`