Merge pull request #563 from netglue/1.13.x-merge-up-into-2.0.x_Xwwv3GI3

Merge release 1.13.0 into 2.0.x

Author: gsteel

.gitattributes

@@ -1,6 +1,12 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.github export-ignore
+/.laminas-ci.json export-ignore
 /composer.lock export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml export-ignore
+/psalm-baseline.xml export-ignore
 /test/ export-ignore
+/Makefile export-ignore
+/renovate.json export-ignore

.github/workflows/continuous-integration.yml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
-      - uses: shivammathur/setup-php@2.31.1
+      - uses: shivammathur/setup-php@2.32.0
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: pcov
           coverage: pcov
           ini-values: pcov.enabled=1
@@ -39,9 +39,9 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
-      - uses: shivammathur/setup-php@2.31.1
+      - uses: shivammathur/setup-php@2.32.0
         with:
-          php-version: 8.1
+          php-version: 8.2
       - uses: "ramsey/[email protected]"
         with:
           dependency-versions: "highest"

.gitignore

@@ -4,3 +4,4 @@ phpunit.xml
 .phpunit.cache
 .phpunit.result.cache
 .php_cs.cache
+rector.php

Makefile

@@ -0,0 +1,54 @@
+# 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 .phpunit.cache
+	rm -f .php_cs-cache
+	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

composer.json

@@ -19,7 +19,7 @@
             "php-http/discovery": false
         },
         "platform": {
-            "php": "8.1.99"
+            "php": "8.2.99"
         }
     },
     "autoload": {
@@ -35,7 +35,7 @@
         }
     },
     "require": {
-        "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
+        "php": "~8.2 || ~8.3 || ~8.4",
         "ext-json": "*",
         "laminas/laminas-escaper": "^2.9",
         "php-http/discovery": "^1.18.0",
@@ -52,11 +52,11 @@
         "php-http/cache-plugin": "^2.0.1",
         "php-http/curl-client": "^2.3.3",
         "php-http/mock-client": "^1.6.1",
-        "phpunit/phpunit": "^10.5.38",
-        "psalm/plugin-phpunit": "^0.19.0",
+        "phpunit/phpunit": "^11.5.4",
+        "psalm/plugin-phpunit": "^0.19.2",
         "roave/security-advisories": "dev-latest",
-        "symfony/cache": "^6.4.13 || ^7.0",
-        "vimeo/psalm": "^5.26.1"
+        "symfony/cache": "^6.4.13 || ^7.2.3",
+        "vimeo/psalm": "^6.0.0"
     },
     "conflict": {
         "php-http/httplug": "<2.4.1",