Skip to content

Commit 038b5dd

Browse files
ezimuelezimuel
committed
Usage of PHPUnit 9 only + migrated xml configurations
1 parent b985979 commit 038b5dd

File tree

5 files changed

+83
-119
lines changed

5 files changed

+83
-119
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"doctrine/inflector": "^1.3",
2525
"mockery/mockery": "^1.2",
2626
"phpstan/phpstan": "^0.12",
27-
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
27+
"phpunit/phpunit": "^9.3",
2828
"squizlabs/php_codesniffer": "^3.4",
2929
"symfony/finder": "~4.0",
3030
"symfony/yaml": "~4.0"

‎phpunit-integration-tests.xml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4-
bootstrap="tests/bootstrap.php"
5-
colors="true"
6-
failOnRisky="true"
7-
verbose="true"
8-
beStrictAboutChangesToGlobalState="true"
9-
beStrictAboutOutputDuringTests="true"
10-
beStrictAboutTestsThatDoNotTestAnything="false"
11-
>
12-
<testsuites>
13-
<testsuite name="Integration tests">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<groups>
18-
<include>
19-
<group>Integration</group>
20-
</include>
21-
</groups>
22-
<filter>
23-
<whitelist>
24-
<directory suffix=".php">src</directory>
25-
</whitelist>
26-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" failOnRisky="true" verbose="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="false">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
</coverage>
8+
<testsuites>
9+
<testsuite name="Integration tests">
10+
<directory>tests</directory>
11+
</testsuite>
12+
</testsuites>
13+
<groups>
14+
<include>
15+
<group>Integration</group>
16+
</include>
17+
</groups>
2718
</phpunit>

‎phpunit-yaml-free-tests.xml

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4-
bootstrap="tests/bootstrap.php"
5-
colors="true"
6-
failOnRisky="true"
7-
verbose="true"
8-
beStrictAboutChangesToGlobalState="true"
9-
beStrictAboutOutputDuringTests="true"
10-
beStrictAboutTestsThatDoNotTestAnything="false"
11-
>
12-
<php>
13-
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
14-
<ini name="error_reporting" value="16383"/>
15-
<ini name="memory_limit" value="-1" />
16-
</php>
17-
<testsuites>
18-
<testsuite name="Yaml tests">
19-
<directory>tests/Elasticsearch/Tests/Yaml/Free</directory>
20-
</testsuite>
21-
</testsuites>
22-
<groups>
23-
<include>
24-
<group>free</group>
25-
</include>
26-
</groups>
27-
<filter>
28-
<whitelist>
29-
<directory suffix=".php">src</directory>
30-
</whitelist>
31-
</filter>
32-
<logging>
33-
<log type="junit" target="tests/yaml-test-junit.xml"/>
34-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" failOnRisky="true" verbose="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="false">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
</coverage>
8+
<php>
9+
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
10+
<ini name="error_reporting" value="16383"/>
11+
<ini name="memory_limit" value="-1"/>
12+
</php>
13+
<testsuites>
14+
<testsuite name="Yaml tests">
15+
<directory>tests/Elasticsearch/Tests/Yaml/Free</directory>
16+
</testsuite>
17+
</testsuites>
18+
<groups>
19+
<include>
20+
<group>free</group>
21+
</include>
22+
</groups>
23+
<logging>
24+
<junit outputFile="tests/yaml-test-junit.xml"/>
25+
</logging>
3526
</phpunit>

‎phpunit-yaml-platinum-tests.xml

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4-
bootstrap="tests/bootstrap.php"
5-
colors="true"
6-
failOnRisky="true"
7-
verbose="true"
8-
beStrictAboutChangesToGlobalState="true"
9-
beStrictAboutOutputDuringTests="true"
10-
beStrictAboutTestsThatDoNotTestAnything="false"
11-
>
12-
<php>
13-
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
14-
<ini name="error_reporting" value="16383"/>
15-
<ini name="memory_limit" value="-1" />
16-
</php>
17-
<testsuites>
18-
<testsuite name="Yaml tests">
19-
<directory>tests/Elasticsearch/Tests/Yaml/Platinum</directory>
20-
</testsuite>
21-
</testsuites>
22-
<groups>
23-
<include>
24-
<group>platinum</group>
25-
</include>
26-
</groups>
27-
<filter>
28-
<whitelist>
29-
<directory suffix=".php">src</directory>
30-
</whitelist>
31-
</filter>
32-
<logging>
33-
<log type="junit" target="tests/yaml-test-junit.xml"/>
34-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" failOnRisky="true" verbose="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="false">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
</coverage>
8+
<php>
9+
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
10+
<ini name="error_reporting" value="16383"/>
11+
<ini name="memory_limit" value="-1"/>
12+
</php>
13+
<testsuites>
14+
<testsuite name="Yaml tests">
15+
<directory>tests/Elasticsearch/Tests/Yaml/Platinum</directory>
16+
</testsuite>
17+
</testsuites>
18+
<groups>
19+
<include>
20+
<group>platinum</group>
21+
</include>
22+
</groups>
23+
<logging>
24+
<junit outputFile="tests/yaml-test-junit.xml"/>
25+
</logging>
3526
</phpunit>

‎phpunit.xml.dist

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4-
bootstrap="tests/bootstrap.php"
5-
colors="true"
6-
failOnRisky="true"
7-
verbose="true"
8-
beStrictAboutChangesToGlobalState="true"
9-
beStrictAboutOutputDuringTests="true"
10-
beStrictAboutTestsThatDoNotTestAnything="false"
11-
>
12-
<testsuites>
13-
<testsuite name="Unit tests">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<groups>
18-
<exclude>
19-
<group>Integration</group>
20-
<group>free</group>
21-
<group>platinum</group>
22-
</exclude>
23-
</groups>
24-
<filter>
25-
<whitelist>
26-
<directory suffix=".php">src</directory>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" failOnRisky="true" verbose="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="false">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
</coverage>
8+
<testsuites>
9+
<testsuite name="Unit tests">
10+
<directory>tests</directory>
11+
</testsuite>
12+
</testsuites>
13+
<groups>
14+
<exclude>
15+
<group>Integration</group>
16+
<group>free</group>
17+
<group>platinum</group>
18+
</exclude>
19+
</groups>
2920
</phpunit>

0 commit comments

Comments
 (0)