Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3eb8279
Drop Psalm support in favor of PhpStan
tyrsson Sep 25, 2025
3d9a72a
Merge branch '0.2.x' into pr/tyrsson/33
tyrsson Sep 25, 2025
0e70953
Exclude PHPUnit from the 8.1 run
tyrsson Sep 25, 2025
a76f50b
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Sep 25, 2025
8c27b20
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Sep 25, 2025
75c288e
bump phpdb version
tyrsson Sep 25, 2025
961c682
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Sep 25, 2025
67c5b98
Phpstan baselined at level 5 - All level 5 erros will be fixed prior …
tyrsson Sep 25, 2025
f34beee
Remove the PHPUnit exclude from .laminas-ci.json
tyrsson Sep 25, 2025
fe1301b
Update test dbname to phpdb_test
tyrsson Oct 7, 2025
23f7c09
Bump php-db/phpdb to version 0.2.0
tyrsson Oct 7, 2025
b12449d
Update lock file duh
tyrsson Oct 7, 2025
68ea234
Bump php-db/phpdb to 0.2.1 min
tyrsson Oct 7, 2025
c51eace
update phpunit.xml.dist
tyrsson Oct 7, 2025
0d1403d
Test ci run
tyrsson Oct 7, 2025
049d308
Fix renovate config
tyrsson Oct 7, 2025
c282f19
cause CI failure for test
tyrsson Oct 7, 2025
824f8f1
reset all ci config
tyrsson Oct 7, 2025
1c7781a
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Oct 7, 2025
40118fe
test not using .laminas-ci directory
tyrsson Oct 7, 2025
6538aa6
test ci run without compose.yml
tyrsson Oct 7, 2025
7a44f47
test changing mysql ci version
tyrsson Oct 7, 2025
2d45173
remove unused directories/files
tyrsson Oct 7, 2025
bb341d3
setup pre-run to grant correct mysql permissions
tyrsson Oct 7, 2025
daec3f5
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Oct 7, 2025
c68b7f3
testing ci run
tyrsson Oct 8, 2025
71c17d1
test empty password
tyrsson Oct 8, 2025
eab840e
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Oct 8, 2025
d52185d
update compose.yml
tyrsson Oct 8, 2025
ff4eb24
Simplify phpunit.xml.dist
tyrsson Oct 11, 2025
84dc35d
Bump deps
tyrsson Oct 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .ci/mysql_fixtures.sh

This file was deleted.

8 changes: 3 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ jobs:
job: ${{ matrix.job }}
services:
mysql:
image: mysql:5.7
image: mysql:8.0
env:
MYSQL_ROOT_PASSWORD: 'password'
MYSQL_ROOT_HOST: '%'
MYSQL_USER: 'gha'
MYSQL_PASSWORD: 'password'
MYSQL_DATABASE: 'laminasdb_test'
MYSQL_DATABASE: 'phpdb_test'
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
options: >-
--health-cmd="mysqladmin ping"
--health-interval 10s
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/.phpcs-cache
/.phpstan-cache
/phpstan.neon
/.phpunit.cache
/.phpunit.result.cache
/phpunit.xml
Expand Down
18 changes: 7 additions & 11 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{
"ignore_php_platform_requirements": {
"8.4": true
},
"exclude": [
"additional_checks": [
{
"name": "PHPUnit",
"php": "8.1"
},
{
"name": "PHPUnit",
"php": "8.4",
"dependencies": "lowest"
"name": "PhpStan",
"job": {
"php": "8.2",
"dependencies": "latest",
"command": "composer require --dev phpstan/phpstan && vendor/bin/phpstan analyse"
}
}
]
}
3 changes: 0 additions & 3 deletions .laminas-ci/mysql_permissions.sql

This file was deleted.

29 changes: 0 additions & 29 deletions .laminas-ci/phpunit.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .laminas-ci/pre-install.sh

This file was deleted.

22 changes: 0 additions & 22 deletions .laminas-ci/pre-run.sh

This file was deleted.

6 changes: 2 additions & 4 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ services:
ports:
- "3306:3306"
environment:
- MYSQL_DATABASE=${MYSQL_DATABASE:-laminasdb_test}
- MYSQL_USER=${MYSQL_USER:-user}
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
- MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD:-yes}
- MYSQL_DATABASE=${MYSQL_DATABASE:-phpdb_test}
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
volumes:
- ./test/integration/TestFixtures/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql
healthcheck:
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
},
"require": {
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"php-db/phpdb": "^0.1.1"
"php-db/phpdb": "^0.2.1"
},
"require-dev": {
"ext-mysqli": "*",
"ext-pdo_mysql": "*",
"laminas/laminas-coding-standard": "^3.0.1",
"phpunit/phpunit": "^11.5.15",
"psalm/plugin-phpunit": "^0.19.2",
"vimeo/psalm": "^6.8.8"
"phpstan/phpstan": "^2.1",
"phpstan/phpstan-phpunit": "^2.0",
"phpunit/phpunit": "^11.5.42"
},
"suggest": {
"ext-mysqli": "Required for MySQLi support",
Expand Down Expand Up @@ -71,9 +71,8 @@
"test": "phpunit --colors=always --testsuite \"unit test\"",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"test-integration": "phpunit --colors=always --testsuite \"integration test\"",
"static-analysis": "psalm --shepherd --stats",
"sa-set-baseline": "psalm --set-baseline",
"sa-no-baseline": "psalm --shepherd --stats --ignore-baseline",
"static-analysis": "vendor/bin/phpstan analyse --memory-limit=256M",
"sa-generate-baseline": "vendor/bin/phpstan analyse --memory-limit=256M --generate-baseline",
"upload-coverage": "coveralls -v"
}
}
Loading