Skip to content

Commit

Permalink
Merge pull request #106 from netglue/major-dev-deps
Browse files Browse the repository at this point in the history
Drop support for PHP 8.1, add support for PHP 8.4
  • Loading branch information
gsteel authored Jan 29, 2025
2 parents be63f51 + 551ecfa commit 6cb57bf
Show file tree
Hide file tree
Showing 11 changed files with 1,230 additions and 658 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
/phpunit.xml.dist export-ignore
/tests/ export-ignore
/.psr-container.php.stub export-ignore
/renovate.json export-ignore
/.markdownlint.json export-ignore
/Makefile export-ignore
49 changes: 49 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Run `make` (no arguments) to get a short description of what is available
# within this `Makefile`.

help: ## shows this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_\-\.]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
.PHONY: help

qa: cs sa test deps ## Run all QA checks

test: ## Run tests
time -p php -d xdebug.mode=off ./vendor/bin/phpunit
.PHONY: test

get-require-checker: ## Download a Phar of composer-require-checker
ifeq (,$(wildcard ./vendor/bin/composer-require-checker))
curl -LsS https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar -o vendor/bin/composer-require-checker
chmod +x vendor/bin/composer-require-checker
endif
.PHONY: get-require-checker

deps: get-require-checker ## Check for un-declared dependencies
php -d xdebug.mode=off -f vendor/bin/composer-require-checker -- check
.PHONY: deps

bump: ## Bump Composer deps
composer update
composer bump --dev-only
composer update
.PHONY: bump

sa: ## Run static analysis
php -d xdebug.mode=off vendor/bin/psalm --no-cache
.PHONY: sa

update-baseline: ## Update SA Baseline removing fixed issues
php -d xdebug.mode=off vendor/bin/psalm --no-cache --update-baseline
.PHONY: update-baseline

set-baseline: ## Baseline outstanding SA Issues
php -d xdebug.mode=off vendor/bin/psalm --no-cache --set-baseline=psalm-baseline.xml
.PHONY: set-baseline

cs: ## Verify coding standards
php -d xdebug.mode=off vendor/bin/phpcs
.PHONY: cs

csfix: ## Auto-fix coding standard rules, where possible
php -d xdebug.mode=off vendor/bin/phpcbf
.PHONY: csfix
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
"php": "8.1.99"
"php": "8.2.99"
}
},
"require": {
"php": "~8.1 || ~8.2 || ~8.3",
"wildbit/postmark-php": "^2.9||^3.0||^4.0 || ^6.0",
"php": "~8.2 || ~8.3 || ~8.4",
"wildbit/postmark-php": "^2.9||^3.0||^4.0||^6.0",
"psr/container": "^1.0.0 || ^2.0.0"
},
"autoload": {
Expand All @@ -35,11 +35,11 @@
},
"require-dev": {
"doctrine/coding-standard": "^12.0",
"laminas/laminas-servicemanager": "^3.22.1",
"phpunit/phpunit": "^10.5.9",
"psalm/plugin-phpunit": "^0.19.0",
"laminas/laminas-servicemanager": "^3.23.0 || ^4.3.0",
"phpunit/phpunit": "^11.5.5",
"psalm/plugin-phpunit": "^0.19.2",
"roave/security-advisories": "dev-latest",
"vimeo/psalm": "^5.20.0"
"vimeo/psalm": "^6.0.0"
},
"scripts": {
"check": [
Expand Down
Loading

0 comments on commit 6cb57bf

Please sign in to comment.