Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop PHP 8.1, Upgrade Psalm to v6 and PHPUnit to v11 #151

Merged
merged 2 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ phpunit.xml.dist export-ignore
psalm.xml export-ignore
psalm-baseline.xml export-ignore
renovate.json export-ignore
Makefile export-ignore
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
tags:

env:
default_php: "8.1"
default_php: "8.2"
php_extensions: ""

jobs:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/.cache/
!/.cache/.gitkeep
phpunit.xml
rector.php
61 changes: 61 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# 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

install: ## Install PHP dependencies
composer install
.PHONY: install

update: ## Update PHP dependencies
composer update
.PHONY: update

bump: ## Update PHP dependencies
composer update
composer bump -D
composer update
.PHONY: update

clean: ## Clear out caches
rm -rf .cache/code-coverage
rm -rf .cache/phpunit
rm -f .cache/phpcs.cache
rm -f .cache/test-results
rm -rf build
vendor/bin/psalm --clear-cache

sa: ## Run static analysis checks
vendor/bin/psalm --no-cache --threads=1
.PHONY: sa

cs: ## Run coding standards checks
vendor/bin/phpcs
.PHONY: cs

test: ## Run unit tests
vendor/bin/phpunit
.PHONY: test

qa: cs sa test ## Run all QA Checks
.PHONY: check

get-rector: ## Install rector as a dev dependency
ifeq (,$(wildcard ./vendor/bin/rector))
composer require --dev rector/rector
endif
.PHONY: get-rector

remove-rector: ## Remove rector dependency
composer remove --dev rector/rector
.PHONY: remove-rector

rector: get-rector ## Run Rector
vendor/bin/rector
.PHONY: rector

mutants: test ## Run mutation tests
vendor/bin/infection --configuration=infection-custom.json
.PHONY: mutants
25 changes: 14 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "~8.1 || ~8.2.0 || ~8.3 || ~8.4",
"php": "~8.2.0 || ~8.3 || ~8.4",
"ext-json": "*",
"php-http/discovery": "^1.14.1",
"psr/http-client": "^1.0",
Expand All @@ -25,19 +25,22 @@
"require-dev": {
"ext-curl": "*",
"doctrine/coding-standard": "^12.0",
"infection/infection": "^0.27.11",
"infection/infection": "^0.29.10",
"laminas/laminas-diactoros": "^3.5.0",
"php-http/curl-client": "^2.3.2",
"phpunit/phpunit": "^10.5.38",
"psalm/plugin-phpunit": "^0.19.0",
"react/child-process": "^0.6.5",
"react/http": "^1.10",
"php-http/curl-client": "^2.3.3",
"phpunit/phpunit": "^11.5.4",
"psalm/plugin-phpunit": "^0.19.2",
"react/child-process": "^0.6.6",
"react/http": "^1.11",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.10.3",
"vimeo/psalm": "^5.26.1"
"squizlabs/php_codesniffer": "^3.11.3",
"vimeo/psalm": "^6.0.0"
},
"conflict": {
"php-http/httplug": "<2.4.1"
"php-http/httplug": "<2.4.1",
"shish/safe": "<2.6.4",
"sanmai/pipeline": "<6.12",
"symfony/options-resolver": "<7.2"
},
"config": {
"sort-packages": true,
Expand All @@ -48,7 +51,7 @@
"php-http/discovery": true
},
"platform": {
"php": "8.1.99"
"php": "8.2.99"
}
},
"extra": {
Expand Down
Loading
Loading