Skip to content
This repository was archived by the owner on Oct 26, 2023. It is now read-only.

Commit de79a3a

Browse files
mdiomdio
committed
Add PHP 8.0 support, raise min to PHP 7.3
Upgrade to PHPUnit 9.5 for that.
1 parent 0364835 commit de79a3a

18 files changed

+63
-43
lines changed

‎.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
tests:
1111
strategy:
1212
matrix:
13-
php-versions: ['7.2', '7.3', '7.4']
13+
php-versions: ['7.3', '7.4', '8.0', '8.1']
1414

1515
runs-on: ubuntu-latest
1616

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
vendor/
2+
.phpunit.result.cache
23
composer.lock
34
!bin/php
45
!build/.gitkeep

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ARG PHP_VERSION=7.1
1+
ARG PHP_VERSION=8.0
22

33
FROM php:${PHP_VERSION}-cli-alpine
44

5-
ARG XDEBUG_VERSION=2.7.0RC1
5+
ARG XDEBUG_VERSION=3.1.5
66

77
RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
88
&& apk add --no-cache --virtual .runtime-deps git libzip-dev \

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ MAKEFLAGS =+ -rR --warn-undefined-variables
44
.PHONY: composer-install composer-update examples docker run
55

66
COMPOSER ?= bin/composer.phar
7-
COMPOSER_VERSION ?= 1.8.3
7+
COMPOSER_VERSION ?= 2.3.8
88
PHP ?= bin/php
9-
PHP_VERSION ?= 7.2
10-
XDEBUG_VERSION ?= 2.7.0RC1
9+
PHP_VERSION ?= 8.0
10+
XDEBUG_VERSION ?= 3.1.5
1111

1212
export
1313

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A library for using [Avro](http://avro.apache.org/) with PHP.
77

88
Requirements
99
============
10-
* PHP >= 7.1
10+
* PHP >= 7.3
1111
* On 32-bit platforms, the [GMP PHP extension](http://php.net/gmp)
1212
* For testing, [PHPUnit](http://www.phpunit.de/)
1313

‎bin/php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ command -v docker >/dev/null 2>&1 || { echo "docker is required to run this bina
77
USER=${USER:-$( id -un )}
88
GROUP=${GROUP:-$( id -gn )}
99
COMPOSER_HOME=${COMPOSER_HOME:-${HOME}/.composer}
10-
PHP_VERSION=${PHP_VERSION:-7.1}
10+
PHP_VERSION=${PHP_VERSION:-8.0}
1111
DOCKER_OPTS=${DOCKER_OPTS:-'-it'}
1212

1313
exec docker run ${DOCKER_OPTS} --rm \

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "Composer packaging for vanilla Apache Avro, with fixes",
44
"license": "Apache-2.0",
55
"require": {
6-
"php": ">=7.1"
6+
"php": ">=7.3"
77
},
88
"require-dev": {
9-
"phpunit/phpunit": "^5.0"
9+
"phpunit/phpunit": "^9.5"
1010
},
1111
"suggest": {
1212
"ext-gmp": "Large integer support for 32-bit platforms."

‎test/DataFileTest.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
2325
* Class DataFileTest
2426
*/
25-
class DataFileTest extends PHPUnit_Framework_TestCase
27+
class DataFileTest extends TestCase
2628
{
2729
private $data_files;
2830
const REMOVE_DATA_FILES = true;
@@ -62,13 +64,13 @@ protected function remove_data_files()
6264
$this->remove_data_file($data_file);
6365
}
6466

65-
protected function setUp()
67+
protected function setUp(): void
6668
{
6769
if (!file_exists(TEST_TEMP_DIR))
6870
mkdir(TEST_TEMP_DIR);
6971
$this->remove_data_files();
7072
}
71-
protected function tearDown()
73+
protected function tearDown(): void
7274
{
7375
$this->remove_data_files();
7476
}

‎test/DatumIOTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
2325
* Class DatumIOTest
2426
*/
25-
class DatumIOTest extends PHPUnit_Framework_TestCase
27+
class DatumIOTest extends TestCase
2628
{
2729
/**
2830
* @dataProvider data_provider

‎test/FileIOTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
2325
* Tests against a preexisting file created by a different library
2426
*/
25-
class FileIOTest extends PHPUnit_Framework_TestCase
27+
class FileIOTest extends TestCase
2628
{
27-
protected function tearDown()
29+
protected function tearDown(): void
2830
{
2931
$file = $this->getTmpFile();
3032
if (file_exists($file))

‎test/FloatIntEncodingTest.php

+16-14
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19+
use PHPUnit\Framework\TestCase;
20+
1921
require_once('test_helper.php');
2022

2123
/**
2224
* Class FloatIntEncodingTest
2325
*/
24-
class FloatIntEncodingTest extends PHPUnit_Framework_TestCase
26+
class FloatIntEncodingTest extends TestCase
2527
{
2628
const FLOAT_TYPE = 'float';
2729
const DOUBLE_TYPE = 'double';
@@ -57,12 +59,12 @@ static function make_special_vals()
5759
self::$INT_BITS_NEG_INF = strrev(pack('H*', 'ff800000'));
5860
}
5961

60-
function setUp()
62+
public function setUp(): void
6163
{
6264
self::make_special_vals();
6365
}
6466

65-
function test_special_values()
67+
public function test_special_values()
6668
{
6769
$this->assertTrue(is_float(self::$FLOAT_NAN), 'float NaN is a float');
6870
$this->assertTrue(is_nan(self::$FLOAT_NAN), 'float NaN is NaN');
@@ -97,7 +99,7 @@ function test_special_values()
9799
/**
98100
* @return array
99101
*/
100-
function special_vals_provider()
102+
public function special_vals_provider()
101103
{
102104
self::make_special_vals();
103105
return array(array(self::DOUBLE_TYPE, self::$DOUBLE_POS_INF, self::$LONG_BITS_POS_INF),
@@ -112,15 +114,15 @@ function special_vals_provider()
112114
* @param $val
113115
* @param $bits
114116
*/
115-
function test_encoding_special_values($type, $val, $bits)
117+
public function test_encoding_special_values($type, $val, $bits)
116118
{
117119
$this->assert_encode_values($type, $val, $bits);
118120
}
119121

120122
/**
121123
* @return array
122124
*/
123-
function nan_vals_provider()
125+
public function nan_vals_provider()
124126
{
125127
self::make_special_vals();
126128
return array(array(self::DOUBLE_TYPE, self::$DOUBLE_NAN, self::$LONG_BITS_NAN),
@@ -133,15 +135,15 @@ function nan_vals_provider()
133135
* @param $val
134136
* @param $bits
135137
*/
136-
function test_encoding_nan_values($type, $val, $bits)
138+
public function test_encoding_nan_values($type, $val, $bits)
137139
{
138140
$this->assert_encode_nan_values($type, $val, $bits);
139141
}
140142

141143
/**
142144
* @return array
143145
*/
144-
function normal_vals_provider()
146+
public function normal_vals_provider()
145147
{
146148
return array(
147149
array(self::DOUBLE_TYPE, (double) -10, "\000\000\000\000\000\000$\300", '000000000000420c'),
@@ -197,7 +199,7 @@ function normal_vals_provider()
197199
/**
198200
* @return array
199201
*/
200-
function float_vals_provider()
202+
public function float_vals_provider()
201203
{
202204
$ary = array();
203205

@@ -211,7 +213,7 @@ function float_vals_provider()
211213
/**
212214
* @return array
213215
*/
214-
function double_vals_provider()
216+
public function double_vals_provider()
215217
{
216218
$ary = array();
217219

@@ -229,7 +231,7 @@ function double_vals_provider()
229231
* @param $val
230232
* @param $bits
231233
*/
232-
function test_encoding_float_values($type, $val, $bits)
234+
public function test_encoding_float_values($type, $val, $bits)
233235
{
234236
$this->assert_encode_values($type, $val, $bits);
235237
}
@@ -240,7 +242,7 @@ function test_encoding_float_values($type, $val, $bits)
240242
* @param $val
241243
* @param $bits
242244
*/
243-
function test_encoding_double_values($type, $val, $bits)
245+
public function test_encoding_double_values($type, $val, $bits)
244246
{
245247
$this->assert_encode_values($type, $val, $bits);
246248
}
@@ -250,7 +252,7 @@ function test_encoding_double_values($type, $val, $bits)
250252
* @param $val
251253
* @param $bits
252254
*/
253-
function assert_encode_values($type, $val, $bits)
255+
public function assert_encode_values($type, $val, $bits)
254256
{
255257
if (self::FLOAT_TYPE == $type)
256258
{
@@ -286,7 +288,7 @@ function assert_encode_values($type, $val, $bits)
286288
* @param $val
287289
* @param $bits
288290
*/
289-
function assert_encode_nan_values($type, $val, $bits)
291+
public function assert_encode_nan_values($type, $val, $bits)
290292
{
291293
if (self::FLOAT_TYPE == $type)
292294
{

‎test/IODatumReaderTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
2325
* Class IODatumReaderTest
2426
*/
25-
class IODatumReaderTest extends PHPUnit_Framework_TestCase
27+
class IODatumReaderTest extends TestCase
2628
{
2729

2830
public function testSchemaMatching()

‎test/InterOpTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,19 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
2325
* Class InterOpTest
2426
*/
25-
class InterOpTest extends PHPUnit_Framework_TestCase
27+
class InterOpTest extends TestCase
2628
{
2729
var $projection_json;
2830
var $projection;
2931

30-
public function setUp()
32+
protected function setUp(): void
3133
{
3234
$interop_schema_file_name = AVRO_INTEROP_SCHEMA;
3335
$this->projection_json = file_get_contents($interop_schema_file_name);

‎test/LongEncodingTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19+
use PHPUnit\Framework\TestCase;
20+
1921
require_once('test_helper.php');
2022

2123
/**
2224
* Class LongEncodingTest
2325
*/
24-
class LongEncodingTest extends PHPUnit_Framework_TestCase
26+
class LongEncodingTest extends TestCase
2527
{
2628

27-
function setUp()
29+
protected function setUp(): void
2830
{
2931
Avro::check_platform();
3032
}

‎test/NameTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
@@ -60,7 +62,7 @@ function __toString()
6062
/**
6163
* Class NameTest
6264
*/
63-
class NameTest extends PHPUnit_Framework_TestCase
65+
class NameTest extends TestCase
6466
{
6567

6668
/**
@@ -128,6 +130,6 @@ function name_provider()
128130
*/
129131
function test_name($name, $is_well_formed)
130132
{
131-
$this->assertEquals(AvroName::is_well_formed_name($name), $is_well_formed, $name);
133+
$this->assertEquals(AvroName::is_well_formed_name($name), $is_well_formed);
132134
}
133135
}

‎test/ProtocolFileTest.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
// near-verbatim port of test_protocol.py
2325
/**
2426
* Class ProtocolFileTest
2527
*/
26-
class ProtocolFileTest extends PHPUnit_Framework_TestCase
28+
class ProtocolFileTest extends TestCase
2729
{
28-
protected function setUp() {
29-
}
30-
3130
public function testParsing() {
3231
$cnt=count($this->prot_parseable);
3332
for ($i=0; $i<$cnt; $i++) {

‎test/SchemaTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* limitations under the License.
1818
*/
1919

20+
use PHPUnit\Framework\TestCase;
21+
2022
require_once('test_helper.php');
2123

2224
/**
@@ -53,7 +55,7 @@ function __construct($schema_string, $is_valid, $normalized_schema_string=null,
5355
/**
5456
* Class SchemaTest
5557
*/
56-
class SchemaTest extends PHPUnit_Framework_TestCase
58+
class SchemaTest extends TestCase
5759
{
5860
static $examples = array();
5961
static $valid_examples = array();

0 commit comments

Comments
 (0)