Skip to content

Commit 8a14a38

Browse files
authored
Merge pull request #30 from donquixote/issue-28-phpunit-9
Issue #28: PhpUnit 9, and Php 8.2 and 8.3.
2 parents 3ab5fab + 16f3c59 commit 8a14a38

File tree

8 files changed

+24
-17
lines changed

8 files changed

+24
-17
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
php: [7.4]
14+
php: [7.4, 8.1, 8.2, 8.3]
1515

1616
steps:
1717
- uses: actions/checkout@v4
@@ -25,4 +25,8 @@ jobs:
2525

2626
- run: composer install --no-interaction
2727

28-
- run: vendor/bin/phpunit
28+
- name: PhpUnit
29+
run: |
30+
set -x
31+
php --version
32+
vendor/bin/phpunit

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"psr-4": { "Donquixote\\Cellbrush\\": "src/" }
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^5"
17+
"phpunit/phpunit": "^9.6"
1818
}
1919
}

phpunit.xml.dist

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
54
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false"
5+
convertDeprecationsToExceptions="true"
6+
failOnIncomplete="true"
7+
failOnRisky="true"
8+
failOnSkipped="true"
9+
failOnWarning="true"
1210
bootstrap="vendor/autoload.php"
1311
>
1412
<testsuites>

tests/src/AttributesMapTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace Donquixote\Cellbrush\Tests;
44

55
use Donquixote\Cellbrush\Html\Multiple\StaticAttributesMap;
6+
use PHPUnit\Framework\TestCase;
67

7-
class AttributesMapTest extends \PHPUnit_Framework_TestCase {
8+
class AttributesMapTest extends TestCase {
89

910
function testMerge() {
1011
$a = StaticAttributesMap::create(

tests/src/CellMatrixTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use Donquixote\Cellbrush\Cell\Cell;
66
use Donquixote\Cellbrush\Matrix\CellMatrix;
7+
use PHPUnit\Framework\TestCase;
78

8-
class CellMatrixTest extends \PHPUnit_Framework_TestCase {
9+
class CellMatrixTest extends TestCase {
910

1011
function testRowspanSimple() {
1112
$cellMatrix = CellMatrix::create(2, 1);

tests/src/CellbrushTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace Donquixote\Cellbrush\Tests;
44

55
use Donquixote\Cellbrush\Table\Table;
6+
use PHPUnit\Framework\TestCase;
67

7-
class CellbrushTest extends \PHPUnit_Framework_TestCase {
8+
class CellbrushTest extends TestCase {
89

910
function testRegularTable() {
1011

tests/src/HierarchyTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace Donquixote\Cellbrush\Tests;
44

55
use Donquixote\Cellbrush\Axis\DynamicAxis;
6+
use PHPUnit\Framework\TestCase;
67

7-
class HierarchyTest extends \PHPUnit_Framework_TestCase {
8+
class HierarchyTest extends TestCase {
89

910
function testFlat() {
1011
$hierarchy = new DynamicAxis();

tests/src/TableSectionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
use Donquixote\Cellbrush\Axis\DynamicAxis;
66
use Donquixote\Cellbrush\Html\Multiple\StaticAttributesMap;
77
use Donquixote\Cellbrush\TSection\TableSection;
8+
use PHPUnit\Framework\TestCase;
89

9-
class TableSectionTest extends \PHPUnit_Framework_TestCase {
10+
class TableSectionTest extends TestCase {
1011

1112
function testRegularTable() {
1213
$columns = new DynamicAxis();

0 commit comments

Comments
 (0)