Skip to content

Commit cbd81df

Browse files
authored
Merge pull request #447 from netglue/major-dev-deps
Upgrade Psalm to v6 and PHPUnit to v11
2 parents 86ec8b2 + 61a3ba9 commit cbd81df

18 files changed

+854
-377
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
/.github export-ignore
12
/.gitattributes export-ignore
23
/.gitignore export-ignore
4+
/.laminas-ci.json export-ignore
35
/composer.lock export-ignore
6+
/renovate.json export-ignore
47
/phpcs.xml export-ignore
58
/phpunit.xml.dist export-ignore
69
/psalm.xml export-ignore
10+
/psalm-baseline.xml export-ignore
711
/test/ export-ignore
812
.psr-container.php.stub export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ phpunit.xml
55
!/example/dist/.gitkeep
66
/example/slices/dist/*
77
!/example/slices/dist/.gitkeep
8+
rector.php

Makefile

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Run `make` (no arguments) to get a short description of what is available
2+
# within this `Makefile`.
3+
4+
help: ## shows this help
5+
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_\-\.]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
6+
.PHONY: help
7+
8+
install: ## Install PHP dependencies
9+
composer install
10+
.PHONY: install
11+
12+
update: ## Update PHP dependencies
13+
composer update
14+
.PHONY: update
15+
16+
bump: ## Update PHP dependencies
17+
composer update
18+
composer bump -D
19+
composer update
20+
.PHONY: update
21+
22+
clean: ## Clear out caches
23+
rm -rf .phpunit.cache
24+
rm -f .php_cs-cache
25+
vendor/bin/psalm --clear-cache
26+
27+
sa: ## Run static analysis checks
28+
vendor/bin/psalm --no-cache --threads=1
29+
.PHONY: sa
30+
31+
cs: ## Run coding standards checks
32+
vendor/bin/phpcs
33+
.PHONY: cs
34+
35+
test: ## Run unit tests
36+
vendor/bin/phpunit
37+
.PHONY: test
38+
39+
qa: cs sa test ## Run all QA Checks
40+
.PHONY: check
41+
42+
get-rector: ## Install rector as a dev dependency
43+
ifeq (,$(wildcard ./vendor/bin/rector))
44+
composer require --dev rector/rector
45+
endif
46+
.PHONY: get-rector
47+
48+
remove-rector: ## Remove rector dependency
49+
composer remove --dev rector/rector
50+
.PHONY: remove-rector
51+
52+
rector: get-rector ## Run Rector
53+
vendor/bin/rector
54+
.PHONY: rector

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@
5050
"require-dev": {
5151
"ext-curl": "*",
5252
"doctrine/coding-standard": "^12.0",
53-
"laminas/laminas-config-aggregator": "^1.15",
53+
"laminas/laminas-config-aggregator": "^1.17",
5454
"laminas/laminas-diactoros": "^3.5.0",
55-
"laminas/laminas-servicemanager": "^4.0.0",
56-
"php-http/curl-client": "^2.3.2",
57-
"phpunit/phpunit": "^10.5.38",
58-
"psalm/plugin-phpunit": "^0.19.0",
55+
"laminas/laminas-servicemanager": "^4.3.0",
56+
"php-http/curl-client": "^2.3.3",
57+
"phpunit/phpunit": "^11.5.4",
58+
"psalm/plugin-phpunit": "^0.19.2",
5959
"roave/security-advisories": "dev-master",
60-
"vimeo/psalm": "^5.26.1"
60+
"vimeo/psalm": "^6.0.0"
6161
},
6262
"extra": {
6363
"laminas": {

0 commit comments

Comments
 (0)