diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0da09ce..b87015a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: # Docs: setup: [basic, lowest] laravel: [default] coverage: [yes] - php: ['8.2', '8.3'] + php: ['8.2', '8.3', '8.4'] include: - php: '8.2' setup: [ basic, lowest ] diff --git a/CHANGELOG.md b/CHANGELOG.md index bc1b295..c97335f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## Unreleased + +### Changed + +- Minimal `guzzlehttp/guzzle` version now is `7,10` +- Minimal `phpstan/phpstan` version now is `1.12.27` + +### Fixed + +- Deprecated implicit marking of parameter as nullable + ## v2.8.0 ### Added diff --git a/composer.json b/composer.json index cf52b70..701f0ac 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "php": "^8.2", "ext-json": "*", "ext-mbstring": "*", - "guzzlehttp/guzzle": "^7.7", + "guzzlehttp/guzzle": "^7.10", "illuminate/contracts": "~10.0 || ~11.0 || ~12.0", "illuminate/support": "~10.0 || ~11.0 || ~12.0", "illuminate/config": "~10.0 || ~11.0 || ~12.0", @@ -26,7 +26,7 @@ }, "require-dev": { "laravel/laravel": "~10.0 || ~11.0 || ~12.0", - "phpstan/phpstan": "^1.10", + "phpstan/phpstan": "^1.12.27", "phpunit/phpunit": "^10.5" }, "autoload": { diff --git a/src/Client.php b/src/Client.php index 0e31798..bb90851 100644 --- a/src/Client.php +++ b/src/Client.php @@ -57,7 +57,7 @@ public static function version(bool $without_hash = true): string /** * {@inheritdoc} */ - public function healthcheck(string $node_name = null): bool + public function healthcheck(?string $node_name = null): bool { $url = '/api/healthchecks/node' . ($node_name === null ? '' diff --git a/src/ClientInterface.php b/src/ClientInterface.php index fb1655d..e0a98b0 100644 --- a/src/ClientInterface.php +++ b/src/ClientInterface.php @@ -27,7 +27,7 @@ public static function version(bool $without_hash = true): string; * * @return bool */ - public function healthcheck(string $node_name = null): bool; + public function healthcheck(?string $node_name = null): bool; /** * Get queue info by name (and vhost). diff --git a/src/ConnectionSettings.php b/src/ConnectionSettings.php index ed39bed..f3ce106 100644 --- a/src/ConnectionSettings.php +++ b/src/ConnectionSettings.php @@ -44,7 +44,7 @@ public function __construct(string $entry_point, string $login = 'guest', string $password = 'guest', int $timeout = 5, - string $user_agent = null) + ?string $user_agent = null) { $this->entry_point = \rtrim($entry_point, ' \\/'); $this->login = $login; diff --git a/src/Frameworks/Illuminate/ClientFactory.php b/src/Frameworks/Illuminate/ClientFactory.php index 84064c3..a4de5ad 100644 --- a/src/Frameworks/Illuminate/ClientFactory.php +++ b/src/Frameworks/Illuminate/ClientFactory.php @@ -56,7 +56,7 @@ public function defaultConnectionName(): string /** * {@inheritdoc} */ - public function make(string $connection_name = null, array $options = null): ClientInterface + public function make(?string $connection_name = null, ?array $options = null): ClientInterface { $connection_name = $connection_name ?? $this->defaultConnectionName(); diff --git a/src/Frameworks/Illuminate/ClientFactoryInterface.php b/src/Frameworks/Illuminate/ClientFactoryInterface.php index 9455223..205b1ca 100644 --- a/src/Frameworks/Illuminate/ClientFactoryInterface.php +++ b/src/Frameworks/Illuminate/ClientFactoryInterface.php @@ -31,5 +31,5 @@ public function defaultConnectionName(): string; * * @return ClientInterface */ - public function make(string $connection_name = null, array $options = null): ClientInterface; + public function make(?string $connection_name = null, ?array $options = null): ClientInterface; }