Skip to content

Commit c3a3ad0

Browse files
committed
Test are running. Both in docker and locally (had to change the credentials though)
Fixes all but 1 of the reported errors in the current integration test. The psalm fixes are sloppy at the moment. Don't kill me. Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 9589c25 commit c3a3ad0

23 files changed

+524
-558
lines changed

.laminas-ci/phpunit.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
55
bootstrap="vendor/autoload.php"
6+
requireCoverageMetadata="true"
67
colors="true">
78

89
<extensions>
910
<bootstrap class="LaminasIntegrationTest\Db\Mysql\Extension\ListenerExtension" />
1011
</extensions>
11-
1212
<testsuites>
1313
<testsuite name="unit test">
1414
<directory>./test/unit</directory>
@@ -17,10 +17,9 @@
1717
<directory>./test/integration</directory>
1818
</testsuite>
1919
</testsuites>
20-
2120
<php>
2221
<!-- Integration Test Variables -->
23-
<env name="TESTS_LAMINAS_DB_MYSQL_ADAPTER" value="true" />
22+
<env name="TESTS_LAMINAS_DB_MYSQL_ADAPTER" value="true" /><!-- todo: remove this env variable as its no longer needed-->
2423
<env name="TESTS_LAMINAS_DB_MYSQL_ADAPTER_HOSTNAME" value="mysql" />
2524
<env name="TESTS_LAMINAS_DB_MYSQL_ADAPTER_USERNAME" value="gha" />
2625
<env name="TESTS_LAMINAS_DB_MYSQL_ADAPTER_PASSWORD" value="password" />

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
"require-dev": {
4545
"ext-mysqli": "*",
4646
"ext-pdo_mysql": "*",
47-
"laminas/laminas-db": "dev-phpunit-test",
4847
"laminas/laminas-coding-standard": "^3.0.1",
48+
"laminas/laminas-db": "dev-phpunit-test",
4949
"laminas/laminas-eventmanager": "^3.6.0",
5050
"laminas/laminas-hydrator": "^4.7",
5151
"laminas/laminas-servicemanager": "^3.19.0",
52-
"phpunit/phpunit": "^9.5.25",
52+
"phpunit/phpunit": "^11.5.15",
5353
"psalm/plugin-phpunit": "^0.19.2",
5454
"vimeo/psalm": "^6.8.8"
5555
},

0 commit comments

Comments
 (0)