Skip to content

Commit

Permalink
Merge pull request #29 from netglue/major-dev-deps
Browse files Browse the repository at this point in the history
Drop PHP 8.1, Upgrade Psalm to v6 & PHPUnit to v11
  • Loading branch information
gsteel authored Jan 29, 2025
2 parents 1ac7436 + b311450 commit 1136591
Show file tree
Hide file tree
Showing 8 changed files with 812 additions and 356 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
tags:

env:
default_php: '7.3'
default_php: '8.2'
php_extensions:

jobs:
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4.2.2
- uses: shivammathur/setup-php@2.32.0
with:
php-version: 8.1
php-version: 8.2
ini-values: memory_limit=-1
- uses: ramsey/composer-install@3.0.0
- run: composer global config bin-dir /usr/local/bin
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/vendor/
phpunit.xml
rector.php
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

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

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
19 changes: 11 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"prefer-stable" : true,
"sort-packages": true,
"platform": {
"php": "8.1.99"
"php": "8.2.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -25,17 +25,20 @@
"bin/rev"
],
"require": {
"php": "~8.1 || ~8.2 || ~8.3",
"ramsey/uuid": "^4",
"symfony/console": "^5 || ^6 || ^7",
"php": "~8.2 || ~8.3 || ~8.4",
"ramsey/uuid": "^4.7.0",
"symfony/console": "^6.4.17 || ^7.2",
"webmozart/assert": "^1.11"
},
"require-dev": {
"doctrine/coding-standard": "^12.0.0",
"phpunit/phpunit": "^10.5.9",
"psalm/plugin-phpunit": "^0.19.0",
"squizlabs/php_codesniffer": "^3.8.1",
"vimeo/psalm": "^5.20"
"phpunit/phpunit": "^11.5.4",
"psalm/plugin-phpunit": "^0.19.2",
"squizlabs/php_codesniffer": "^3.11.3",
"vimeo/psalm": "^6.0.0"
},
"conflict": {
"symfony/string": "<6.4.15 || <7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 1136591

Please sign in to comment.