Skip to content

Commit d069d3d

Browse files
morozovmorozov
authored
Merge pull request #6065 from morozov/phpunit-10
Update PHPUnit to 10
2 parents c2ec5e1 + c23f2ac commit d069d3d

33 files changed

+196
-105
lines changed

‎ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</testsuite>
2222
</testsuites>
2323

24-
<coverage>
24+
<source>
2525
<include>
26-
<directory suffix=".php">../../src</directory>
26+
<directory>../../src</directory>
2727
</include>
28-
</coverage>
28+
</source>
2929
</phpunit>

‎ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</testsuite>
2222
</testsuites>
2323

24-
<coverage>
24+
<source>
2525
<include>
26-
<directory suffix=".php">../../src</directory>
26+
<directory>../../src</directory>
2727
</include>
28-
</coverage>
28+
</source>
2929
</phpunit>

‎ci/github/phpunit/ibm_db2.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -30,9 +29,9 @@
3029
</testsuite>
3130
</testsuites>
3231

33-
<coverage>
32+
<source>
3433
<include>
35-
<directory suffix=".php">../../../src</directory>
34+
<directory>../../../src</directory>
3635
</include>
37-
</coverage>
36+
</source>
3837
</phpunit>

‎ci/github/phpunit/mysqli-tls.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -33,9 +32,9 @@
3332
</testsuite>
3433
</testsuites>
3534

36-
<coverage>
35+
<source>
3736
<include>
38-
<directory suffix=".php">../../../src</directory>
37+
<directory>../../../src</directory>
3938
</include>
40-
</coverage>
39+
</source>
4140
</phpunit>

‎ci/github/phpunit/mysqli.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -25,9 +24,9 @@
2524
</testsuite>
2625
</testsuites>
2726

28-
<coverage>
27+
<source>
2928
<include>
30-
<directory suffix=".php">../../../src</directory>
29+
<directory>../../../src</directory>
3130
</include>
32-
</coverage>
31+
</source>
3332
</phpunit>

‎ci/github/phpunit/oci8.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -31,9 +30,9 @@
3130
</testsuite>
3231
</testsuites>
3332

34-
<coverage>
33+
<source>
3534
<include>
36-
<directory suffix=".php">../../../src</directory>
35+
<directory>../../../src</directory>
3736
</include>
38-
</coverage>
37+
</source>
3938
</phpunit>

‎ci/github/phpunit/pdo_mysql.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -25,9 +24,9 @@
2524
</testsuite>
2625
</testsuites>
2726

28-
<coverage>
27+
<source>
2928
<include>
30-
<directory suffix=".php">../../../src</directory>
29+
<directory>../../../src</directory>
3130
</include>
32-
</coverage>
31+
</source>
3332
</phpunit>

‎ci/github/phpunit/pdo_oci.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -31,9 +30,9 @@
3130
</testsuite>
3231
</testsuites>
3332

34-
<coverage>
33+
<source>
3534
<include>
36-
<directory suffix=".php">../../../src</directory>
35+
<directory>../../../src</directory>
3736
</include>
38-
</coverage>
37+
</source>
3938
</phpunit>

‎ci/github/phpunit/pdo_pgsql.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
2423
</testsuite>
2524
</testsuites>
2625

27-
<coverage>
26+
<source>
2827
<include>
29-
<directory suffix=".php">../../../src</directory>
28+
<directory>../../../src</directory>
3029
</include>
31-
</coverage>
30+
</source>
3231
</phpunit>

‎ci/github/phpunit/pdo_sqlite.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -21,9 +20,9 @@
2120
</testsuite>
2221
</testsuites>
2322

24-
<coverage>
23+
<source>
2524
<include>
26-
<directory suffix=".php">../../../src</directory>
25+
<directory>../../../src</directory>
2726
</include>
28-
</coverage>
27+
</source>
2928
</phpunit>

‎ci/github/phpunit/pdo_sqlsrv.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
2423
</testsuite>
2524
</testsuites>
2625

27-
<coverage>
26+
<source>
2827
<include>
29-
<directory suffix=".php">../../../src</directory>
28+
<directory>../../../src</directory>
3029
</include>
31-
</coverage>
30+
</source>
3231
</phpunit>

‎ci/github/phpunit/pgsql.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
2423
</testsuite>
2524
</testsuites>
2625

27-
<coverage>
26+
<source>
2827
<include>
29-
<directory suffix=".php">../../../src</directory>
28+
<directory>../../../src</directory>
3029
</include>
31-
</coverage>
30+
</source>
3231
</phpunit>

‎ci/github/phpunit/sqlite3.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -21,9 +20,9 @@
2120
</testsuite>
2221
</testsuites>
2322

24-
<coverage>
23+
<source>
2524
<include>
26-
<directory suffix=".php">../../../src</directory>
25+
<directory>../../../src</directory>
2726
</include>
28-
</coverage>
27+
</source>
2928
</phpunit>

‎ci/github/phpunit/sqlsrv.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
beStrictAboutTodoAnnotatedTests="true"
77
failOnRisky="true"
88
failOnWarning="true"
9-
convertDeprecationsToExceptions="true"
109
>
1110
<php>
1211
<ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
2423
</testsuite>
2524
</testsuites>
2625

27-
<coverage>
26+
<source>
2827
<include>
29-
<directory suffix=".php">../../../src</directory>
28+
<directory>../../../src</directory>
3029
</include>
31-
</coverage>
30+
</source>
3231
</phpunit>

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"phpstan/phpstan": "1.10.14",
4545
"phpstan/phpstan-phpunit": "1.3.11",
4646
"phpstan/phpstan-strict-rules": "^1.5",
47-
"phpunit/phpunit": "9.6.7",
47+
"phpunit/phpunit": "10.2.2",
4848
"psalm/plugin-phpunit": "0.18.4",
4949
"squizlabs/php_codesniffer": "3.7.2",
5050
"symfony/cache": "^5.4|^6.0",

‎phpunit.xml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
</testsuite>
4949
</testsuites>
5050

51-
<coverage>
51+
<source>
5252
<include>
53-
<directory suffix=".php">src</directory>
53+
<directory>src</directory>
5454
</include>
55-
</coverage>
55+
</source>
5656
</phpunit>

‎tests/Driver/IBMDB2/DriverTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\DBAL\Tests\Driver\IBMDB2;
6+
7+
use Doctrine\DBAL\Driver as DriverInterface;
8+
use Doctrine\DBAL\Driver\IBMDB2\Driver;
9+
use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTestCase;
10+
11+
class DriverTest extends AbstractDB2DriverTestCase
12+
{
13+
protected function createDriver(): DriverInterface
14+
{
15+
return new Driver();
16+
}
17+
}

‎tests/Driver/Mysqli/DriverTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\DBAL\Tests\Driver\Mysqli;
6+
7+
use Doctrine\DBAL\Driver as DriverInterface;
8+
use Doctrine\DBAL\Driver\Mysqli\Driver;
9+
use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
10+
11+
class DriverTest extends AbstractMySQLDriverTestCase
12+
{
13+
protected function createDriver(): DriverInterface
14+
{
15+
return new Driver();
16+
}
17+
}

‎tests/Driver/OCI8/DriverTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\DBAL\Tests\Driver\OCI8;
6+
7+
use Doctrine\DBAL\Driver as DriverInterface;
8+
use Doctrine\DBAL\Driver\OCI8\Driver;
9+
use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
10+
11+
class DriverTest extends AbstractOracleDriverTestCase
12+
{
13+
protected function createDriver(): DriverInterface
14+
{
15+
return new Driver();
16+
}
17+
}

‎tests/Driver/PDO/MySQL/DriverTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\DBAL\Tests\Driver\PDO\MySQL;
6+
7+
use Doctrine\DBAL\Driver as DriverInterface;
8+
use Doctrine\DBAL\Driver\PDO\MySQL\Driver;
9+
use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
10+
11+
class DriverTest extends AbstractMySQLDriverTestCase
12+
{
13+
protected function createDriver(): DriverInterface
14+
{
15+
return new Driver();
16+
}
17+
}

‎tests/Driver/PDO/OCI/DriverTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\DBAL\Tests\Driver\PDO\OCI;
6+
7+
use Doctrine\DBAL\Driver as DriverInterface;
8+
use Doctrine\DBAL\Driver\PDO\OCI\Driver;
9+
use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
10+
11+
class DriverTest extends AbstractOracleDriverTestCase
12+
{
13+
protected function createDriver(): DriverInterface
14+
{
15+
return new Driver();
16+
}
17+
}

0 commit comments

Comments
 (0)