From a66124bdac5d00d698f2ca2e65ac0df7a3a340b8 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Fri, 24 Jan 2025 13:20:47 -0500 Subject: [PATCH 1/2] add psr/log 3, phpstan, drop unsupported PHP --- composer.json | 12 +++++++++--- phpstan.neon.dist | 2 -- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 29a1cf5..bec5e24 100644 --- a/composer.json +++ b/composer.json @@ -9,18 +9,19 @@ } ], "require": { - "php": "^7.2 || ^8.0", + "php": "^8.3", "php-http/httplug": "^1.0 || ^2.0", "php-http/client-implementation": "^1.0", "php-http/discovery": "^1.7", - "psr/log": "~1.0" + "psr/log": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "phpunit/phpunit": "^8.4", "nyholm/nsa": "^1.1", "php-http/curl-client": "^1.0 || ^2.0", "php-http/message": "^1.8", - "nyholm/psr7": "^1.2" + "nyholm/psr7": "^1.2", + "phpstan/phpstan": "^2.1" }, "autoload": { "psr-4": { @@ -35,5 +36,10 @@ "scripts": { "test": "vendor/bin/phpunit", "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" + }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } } } diff --git a/phpstan.neon.dist b/phpstan.neon.dist index d84c68a..888f305 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -5,5 +5,3 @@ parameters: level: 3 paths: - src - excludes_analyse: - - vendor From 9b4db82999ef0f97ef32441e06e14460b3622408 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Tue, 4 Feb 2025 10:02:04 -0500 Subject: [PATCH 2/2] remove phpstan, allow php ^8.1 --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index bec5e24..afeb5a2 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.1", "php-http/httplug": "^1.0 || ^2.0", "php-http/client-implementation": "^1.0", "php-http/discovery": "^1.7", @@ -20,8 +20,7 @@ "nyholm/nsa": "^1.1", "php-http/curl-client": "^1.0 || ^2.0", "php-http/message": "^1.8", - "nyholm/psr7": "^1.2", - "phpstan/phpstan": "^2.1" + "nyholm/psr7": "^1.2" }, "autoload": { "psr-4": {