Skip to content

Commit cb553d6

Browse files
baszbasz
authored
Merge pull request #258 from unixslayer/phpunit-runner-compatibility
PHPUnit compatibility
2 parents 31625e2 + d847d95 commit cb553d6

File tree

79 files changed

+881
-1619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+881
-1619
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"require": {
1919
"php": "^8.1",
2020
"ext-pdo": "*",
21-
"prooph/event-store": "^v7.12.2"
21+
"prooph/event-store": "^v7.12.3"
2222
},
2323
"require-dev": {
2424
"ext-pcntl": "*",
2525
"sandrokeil/interop-config": "^2.0.1",
2626
"phpunit/php-invoker": "^3.1 || ^4.0 || ^5.0 || ^6.0",
27-
"phpunit/phpunit": "^9.6 || ^10.0",
27+
"phpunit/phpunit": "^10.0",
2828
"phpspec/prophecy": "^1.9",
2929
"phpspec/prophecy-phpunit": "^2.0",
3030
"prooph/bookdown-template": "^0.2.3",

‎phpunit.mariadb.xml‎

Lines changed: 31 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
44
backupGlobals="false"
5-
backupStaticAttributes="false"
5+
backupStaticProperties="false"
66
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
107
processIsolation="false"
118
stopOnFailure="false"
129
bootstrap="vendor/autoload.php"
13-
timeoutForSmallTests="2"
14-
enforceTimeLimit="true"
1510
failOnWarning="true"
1611
failOnRisky="true"
1712
>
18-
<coverage>
19-
<include>
20-
<directory>./src/</directory>
21-
</include>
22-
<exclude>
23-
<file>./src/Container/MySqlEventStoreFactory.php</file>
24-
<file>./src/Container/MySqlProjectionManagerFactory.php</file>
25-
<file>./src/PersistenceStrategy/MySqlAggregateStreamStrategy.php</file>
26-
<file>./src/PersistenceStrategy/MySqlSimpleStreamStrategy.php</file>
27-
<file>./src/PersistenceStrategy/MySqlSingleStreamStrategy.php</file>
28-
<file>./src/Projection/MySqlProjectionManager.php</file>
29-
<file>./src/MySqlEventStore.php</file>
30-
<file>./src/Container/PostgresEventStoreFactory.php</file>
31-
<file>./src/Container/PostgresProjectionManagerFactory.php</file>
32-
<file>./src/PersistenceStrategy/PostgresAggregateStreamStrategy.php</file>
33-
<file>./src/PersistenceStrategy/PostgresSimpleStreamStrategy.php</file>
34-
<file>./src/PersistenceStrategy/PostgresSingleStreamStrategy.php</file>
35-
<file>./src/Projection/PostgresProjectionManager.php</file>
36-
<file>./src/PostgresEventStore.php</file>
37-
</exclude>
38-
</coverage>
39-
<testsuite name="Prooph PDO EventStore Test Suite">
13+
<testsuite name="Prooph PDO EventStore Test Suite">
4014
<directory>./tests/</directory>
41-
</testsuite>
42-
<groups>
15+
</testsuite>
16+
<groups>
4317
<exclude>
44-
<group>mysql</group>
45-
<group>postgres</group>
18+
<group>mysql</group>
19+
<group>postgres</group>
4620
</exclude>
47-
</groups>
48-
<php>
21+
</groups>
22+
<php>
4923
<env name="DB" value="mariadb"/>
5024
<env name="DB_DRIVER" value="pdo_mysql"/>
5125
<env name="DB_HOST" value="127.0.0.1"/>
@@ -56,5 +30,26 @@
5630
<env name="DB_CHARSET" value="utf8"/>
5731
<!-- \PDO::ERRMODE_SILENT -->
5832
<env name="DB_ATTR_ERRMODE" value="0"/>
59-
</php>
33+
</php>
34+
<source>
35+
<include>
36+
<directory>./src/</directory>
37+
</include>
38+
<exclude>
39+
<file>./src/Container/MySqlEventStoreFactory.php</file>
40+
<file>./src/Container/MySqlProjectionManagerFactory.php</file>
41+
<file>./src/PersistenceStrategy/MySqlAggregateStreamStrategy.php</file>
42+
<file>./src/PersistenceStrategy/MySqlSimpleStreamStrategy.php</file>
43+
<file>./src/PersistenceStrategy/MySqlSingleStreamStrategy.php</file>
44+
<file>./src/Projection/MySqlProjectionManager.php</file>
45+
<file>./src/MySqlEventStore.php</file>
46+
<file>./src/Container/PostgresEventStoreFactory.php</file>
47+
<file>./src/Container/PostgresProjectionManagerFactory.php</file>
48+
<file>./src/PersistenceStrategy/PostgresAggregateStreamStrategy.php</file>
49+
<file>./src/PersistenceStrategy/PostgresSimpleStreamStrategy.php</file>
50+
<file>./src/PersistenceStrategy/PostgresSingleStreamStrategy.php</file>
51+
<file>./src/Projection/PostgresProjectionManager.php</file>
52+
<file>./src/PostgresEventStore.php</file>
53+
</exclude>
54+
</source>
6055
</phpunit>

‎phpunit.mysql.xml‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
44
backupGlobals="false"
5-
backupStaticAttributes="false"
5+
backupStaticProperties="false"
66
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
107
processIsolation="false"
118
stopOnFailure="false"
129
bootstrap="vendor/autoload.php"
13-
timeoutForSmallTests="2"
14-
enforceTimeLimit="true"
1510
failOnWarning="true"
1611
failOnRisky="true"
1712
>
18-
<coverage>
19-
<include>
20-
<directory>./src/</directory>
21-
</include>
22-
<exclude>
23-
<file>./src/Container/MariaDbEventStoreFactory.php</file>
24-
<file>./src/Container/MariaDbProjectionManagerFactory.php</file>
25-
<file>./src/PersistenceStrategy/MariaDbAggregateStreamStrategy.php</file>
26-
<file>./src/PersistenceStrategy/MariaDbSimpleStreamStrategy.php</file>
27-
<file>./src/PersistenceStrategy/MariaDbSingleStreamStrategy.php</file>
28-
<file>./src/Projection/MariaDbProjectionManager.php</file>
29-
<file>./src/MariaDbEventStore.php</file>
30-
<file>./src/Container/PostgresEventStoreFactory.php</file>
31-
<file>./src/Container/PostgresProjectionManagerFactory.php</file>
32-
<file>./src/PersistenceStrategy/PostgresAggregateStreamStrategy.php</file>
33-
<file>./src/PersistenceStrategy/PostgresSimpleStreamStrategy.php</file>
34-
<file>./src/PersistenceStrategy/PostgresSingleStreamStrategy.php</file>
35-
<file>./src/Projection/PostgresProjectionManager.php</file>
36-
<file>./src/PostgresEventStore.php</file>
37-
</exclude>
38-
</coverage>
3913
<testsuite name="Prooph PDO EventStore Test Suite">
4014
<directory>./tests/</directory>
4115
</testsuite>
@@ -57,4 +31,25 @@
5731
<!-- \PDO::ERRMODE_SILENT -->
5832
<env name="DB_ATTR_ERRMODE" value="0"/>
5933
</php>
34+
<source>
35+
<include>
36+
<directory>./src/</directory>
37+
</include>
38+
<exclude>
39+
<file>./src/Container/MariaDbEventStoreFactory.php</file>
40+
<file>./src/Container/MariaDbProjectionManagerFactory.php</file>
41+
<file>./src/PersistenceStrategy/MariaDbAggregateStreamStrategy.php</file>
42+
<file>./src/PersistenceStrategy/MariaDbSimpleStreamStrategy.php</file>
43+
<file>./src/PersistenceStrategy/MariaDbSingleStreamStrategy.php</file>
44+
<file>./src/Projection/MariaDbProjectionManager.php</file>
45+
<file>./src/MariaDbEventStore.php</file>
46+
<file>./src/Container/PostgresEventStoreFactory.php</file>
47+
<file>./src/Container/PostgresProjectionManagerFactory.php</file>
48+
<file>./src/PersistenceStrategy/PostgresAggregateStreamStrategy.php</file>
49+
<file>./src/PersistenceStrategy/PostgresSimpleStreamStrategy.php</file>
50+
<file>./src/PersistenceStrategy/PostgresSingleStreamStrategy.php</file>
51+
<file>./src/Projection/PostgresProjectionManager.php</file>
52+
<file>./src/PostgresEventStore.php</file>
53+
</exclude>
54+
</source>
6055
</phpunit>

‎phpunit.postgres.xml‎

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,54 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
4-
backupGlobals="false"
5-
backupStaticAttributes="false"
6-
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
backupGlobals="false" colors="true"
5+
backupStaticProperties="false"
106
processIsolation="false"
117
stopOnFailure="false"
128
bootstrap="vendor/autoload.php"
13-
timeoutForSmallTests="2"
14-
enforceTimeLimit="true"
159
failOnWarning="true"
1610
failOnRisky="true"
1711
>
18-
<coverage>
19-
<include>
20-
<directory>./src/</directory>
21-
</include>
22-
<exclude>
23-
<file>./src/Container/MariaDbEventStoreFactory.php</file>
24-
<file>./src/Container/MariaDbProjectionManagerFactory.php</file>
25-
<file>./src/PersistenceStrategy/MariaDbAggregateStreamStrategy.php</file>
26-
<file>./src/PersistenceStrategy/MariaDbSimpleStreamStrategy.php</file>
27-
<file>./src/PersistenceStrategy/MariaDbSingleStreamStrategy.php</file>
28-
<file>./src/Projection/MariaDbProjectionManager.php</file>
29-
<file>./src/MariaDbEventStore.php</file>
30-
<file>./src/Container/MySqlEventStoreFactory.php</file>
31-
<file>./src/Container/MySqlProjectionManagerFactory.php</file>
32-
<file>./src/PersistenceStrategy/MySqlAggregateStreamStrategy.php</file>
33-
<file>./src/PersistenceStrategy/MySqlSimpleStreamStrategy.php</file>
34-
<file>./src/PersistenceStrategy/MySqlSingleStreamStrategy.php</file>
35-
<file>./src/Projection/MySqlProjectionManager.php</file>
36-
<file>./src/MySqlEventStore.php</file>
37-
</exclude>
38-
</coverage>
39-
<testsuite name="Prooph PDO EventStore Test Suite">
40-
<directory>./tests/</directory>
41-
</testsuite>
42-
<groups>
43-
<exclude>
44-
<group>mariadb</group>
45-
<group>mysql</group>
46-
</exclude>
47-
</groups>
48-
<php>
49-
<env name="DB" value="postgres"/>
50-
<env name="DB_DRIVER" value="pdo_pgsql"/>
51-
<env name="DB_HOST" value="127.0.0.1"/>
52-
<env name="DB_USERNAME" value="postgres"/>
53-
<env name="DB_PASSWORD" value="password"/>
54-
<env name="DB_NAME" value="event_store_tests"/>
55-
<env name="DB_PORT" value="5432"/>
56-
<env name="DB_CHARSET" value="utf8"/>
57-
<!-- \PDO::ERRMODE_SILENT -->
58-
<env name="DB_ATTR_ERRMODE" value="0"/>
59-
</php>
12+
<testsuite name="Prooph PDO EventStore Test Suite">
13+
<directory>./tests/</directory>
14+
</testsuite>
15+
<groups>
16+
<exclude>
17+
<group>mariadb</group>
18+
<group>mysql</group>
19+
</exclude>
20+
</groups>
21+
<php>
22+
<env name="DB" value="postgres"/>
23+
<env name="DB_DRIVER" value="pdo_pgsql"/>
24+
<env name="DB_HOST" value="127.0.0.1"/>
25+
<env name="DB_USERNAME" value="postgres"/>
26+
<env name="DB_PASSWORD" value="password"/>
27+
<env name="DB_NAME" value="event_store_tests"/>
28+
<env name="DB_PORT" value="5432"/>
29+
<env name="DB_CHARSET" value="utf8"/>
30+
<!-- \PDO::ERRMODE_SILENT -->
31+
<env name="DB_ATTR_ERRMODE" value="0"/>
32+
</php>
33+
<source>
34+
<include>
35+
<directory>./src/</directory>
36+
</include>
37+
<exclude>
38+
<file>./src/Container/MariaDbEventStoreFactory.php</file>
39+
<file>./src/Container/MariaDbProjectionManagerFactory.php</file>
40+
<file>./src/PersistenceStrategy/MariaDbAggregateStreamStrategy.php</file>
41+
<file>./src/PersistenceStrategy/MariaDbSimpleStreamStrategy.php</file>
42+
<file>./src/PersistenceStrategy/MariaDbSingleStreamStrategy.php</file>
43+
<file>./src/Projection/MariaDbProjectionManager.php</file>
44+
<file>./src/MariaDbEventStore.php</file>
45+
<file>./src/Container/MySqlEventStoreFactory.php</file>
46+
<file>./src/Container/MySqlProjectionManagerFactory.php</file>
47+
<file>./src/PersistenceStrategy/MySqlAggregateStreamStrategy.php</file>
48+
<file>./src/PersistenceStrategy/MySqlSimpleStreamStrategy.php</file>
49+
<file>./src/PersistenceStrategy/MySqlSingleStreamStrategy.php</file>
50+
<file>./src/Projection/MySqlProjectionManager.php</file>
51+
<file>./src/MySqlEventStore.php</file>
52+
</exclude>
53+
</source>
6054
</phpunit>

0 commit comments

Comments
 (0)