Skip to content

Commit 9314fb8

Browse files
janatjakjanatjak
committedSep 12, 2022
php 8 + github actions
·
5.0.04.0.0
1 parent e7eb619 commit 9314fb8

30 files changed

+105
-215
lines changed
 

‎.coveralls.yml

-4
This file was deleted.

‎.gitattributes

-6
This file was deleted.

‎.github/workflows/test.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Tests
2+
3+
on: [ push, pull_request ]
4+
5+
jobs:
6+
tests:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout code
10+
uses: actions/checkout@v3
11+
12+
- name: Setup PHP
13+
uses: shivammathur/setup-php@v2
14+
with:
15+
php-version: 8.1
16+
coverage: pcov
17+
18+
- name: Composer install
19+
run: composer install --dev --no-progress
20+
21+
- name: Check coding standard
22+
run: vendor/bin/phpcs --standard=PSR12 ./src ./tests
23+
24+
- name: Check phpstan
25+
run: vendor/bin/phpstan
26+
27+
- name: Check tests
28+
run: vendor/bin/tester tests -C --coverage coverage.xml --coverage-src ./src
29+
30+
- name: Upload coverage
31+
env:
32+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
run: |
34+
composer global require php-coveralls/php-coveralls
35+
php-coveralls --coverage_clover=coverage.xml --json_path=upload.json

‎.travis.yml

-25
This file was deleted.

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test:
22
rm -rf tests/tmp/cache
3-
php vendor/bin/phpstan analyse ./src ./tests --level max
3+
php vendor/bin/phpstan
44
php vendor/bin/phpcs --standard=PSR12 ./src ./tests
55
php vendor/bin/tester ./tests

‎composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.1",
19+
"php": "^8.0",
2020
"ext-json": "*",
2121
"nette/di": "^3.0",
2222
"php-http/client-common": "^2.0",
@@ -26,7 +26,7 @@
2626
"php-http/message-factory": "^1.0"
2727
},
2828
"require-dev": {
29-
"freezy-bee/nette-caching-psr6": "^1.1",
29+
"freezy-bee/nette-caching-psr6": "^2.0",
3030
"mockery/mockery": "^1.1",
3131
"nette/application": "^3.0",
3232
"nette/bootstrap": "^3.0",
@@ -36,9 +36,9 @@
3636
"php-http/curl-client": "^2.0",
3737
"php-http/guzzle7-adapter": "^1.0",
3838
"php-http/logger-plugin": "^1.0",
39-
"phpstan/phpstan": "^0.12",
39+
"phpstan/phpstan": "^1.8",
4040
"squizlabs/php_codesniffer": "^3.0",
41-
"symfony/cache": "^4.0 || ^5.0",
41+
"symfony/cache": "^6.0",
4242
"tracy/tracy": "^2.6"
4343
},
4444
"autoload": {

‎phpstan.neon

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
parameters:
2-
checkMissingIterableValueType: false
2+
level: 8
3+
paths:
4+
- src
5+
- tests
6+
7+
checkUninitializedProperties: true

‎src/ClientFactory/ClientFactory.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
interface ClientFactory
1313
{
1414
/**
15-
* Input an array of configuration to be able to create a HttpClient.
16-
* @param array $config
17-
* @return HttpClient
15+
* @param array<mixed> $config
1816
*/
1917
public function createClient(array $config = []): HttpClient;
2018
}

‎src/ClientFactory/CurlFactory.php

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
*/
1414
class CurlFactory implements ClientFactory
1515
{
16-
/**
17-
* {@inheritdoc}
18-
* @throws \LogicException
19-
*/
2016
public function createClient(array $config = []): HttpClient
2117
{
2218
if (!class_exists(Client::class)) {

‎src/ClientFactory/Guzzle7Factory.php

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
*/
1414
class Guzzle7Factory implements ClientFactory
1515
{
16-
/**
17-
* {@inheritdoc}
18-
* @throws LogicException
19-
*/
2016
public function createClient(array $config = []): HttpClient
2117
{
2218
if (!class_exists(Client::class)) {

‎src/ClientFactory/PluginClientFactory.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ class PluginClientFactory
1717
{
1818
/**
1919
* @param Plugin[] $plugins
20-
* @param ClientFactory $factory
21-
* @param array $config config to the client factory
22-
* @param array $pluginClientOptions config forwarded to the PluginClient
23-
* @param bool $debugMode
20+
* @param array<mixed> $config config to the client factory
21+
* @param array<mixed> $pluginClientOptions config forwarded to the PluginClient
2422
* @return PluginClientDecorator|PluginClient
2523
*/
2624
public static function createPluginClient(

‎src/DI/HttplugExtension.php

+11-15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use InvalidArgumentException;
2121
use Nette\DI\CompilerExtension;
2222
use Nette\DI\ContainerBuilder;
23+
use Nette\DI\Definitions\Definition;
2324
use Nette\DI\Definitions\ServiceDefinition;
2425
use Nette\DI\Definitions\Statement;
2526
use Nette\DI\Helpers;
@@ -29,11 +30,10 @@
2930
*/
3031
class HttplugExtension extends CompilerExtension
3132
{
32-
/** @var bool */
33-
private $debugMode = false;
33+
private bool $debugMode = false;
3434

35-
/** @var array */
36-
private static $defaults = [
35+
/** @var array<string, mixed> */
36+
private static array $defaults = [
3737
# uses discovery if not specified
3838
'classes' => [
3939
'client' => null,
@@ -54,16 +54,16 @@ class HttplugExtension extends CompilerExtension
5454
]
5555
];
5656

57-
/** @var array */
58-
private $classes = [
57+
/** @var array<string, string> */
58+
private array $classes = [
5959
'client' => HttpClient::class,
6060
'messageFactory' => MessageFactory::class,
6161
'uriFactory' => UriFactory::class,
6262
'streamFactory' => StreamFactory::class,
6363
];
6464

65-
/** @var array */
66-
private $factoryClasses = [
65+
/** @var array<string, mixed> */
66+
private array $factoryClasses = [
6767
'client' => [HttpClientDiscovery::class, 'find'],
6868
'messageFactory' => [MessageFactoryDiscovery::class, 'find'],
6969
'uriFactory' => [UriFactoryDiscovery::class, 'find'],
@@ -116,7 +116,7 @@ public function loadConfiguration(): void
116116
/**
117117
* @param ContainerBuilder $containerBuilder
118118
* @param string $clientName
119-
* @param array[] $clientConfig
119+
* @param array<mixed> $clientConfig
120120
*/
121121
private function configureClient(ContainerBuilder $containerBuilder, string $clientName, array $clientConfig): void
122122
{
@@ -152,18 +152,14 @@ private function configureClient(ContainerBuilder $containerBuilder, string $cli
152152
}
153153

154154
/**
155-
* @param ContainerBuilder $containerBuilder
156-
* @param string $pluginName
157-
* @param string $clientName
158-
* @param array $pluginConfig
159-
* @return ServiceDefinition
155+
* @param array<mixed> $pluginConfig
160156
*/
161157
private function configurePlugin(
162158
ContainerBuilder $containerBuilder,
163159
string $pluginName,
164160
string $clientName,
165161
array $pluginConfig
166-
): ServiceDefinition {
162+
): Definition {
167163

168164
$creator = 'FreezyBee\Httplug\DI\Plugin\\' . ucfirst($pluginName);
169165

‎src/DI/IClientProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface IClientProvider
1616
* plugins:
1717
* ...
1818
19-
* @return array
19+
* @return array<mixed>
2020
*/
2121
public function getClientConfigs(): array;
2222
}

‎src/DI/Plugin/AddHost.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\AddHostPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111
use Psr\Http\Message\UriInterface;
1212

@@ -17,19 +17,12 @@ class AddHost implements IPluginServiceDefinitonCreator
1717
{
1818
use StaticClass;
1919

20-
/**
21-
* @param ContainerBuilder $containerBuilder
22-
* @param string $extensionName
23-
* @param string $clientName
24-
* @param array $pluginConfig
25-
* @return ServiceDefinition
26-
*/
2720
public static function createPluginServiceDefinition(
2821
ContainerBuilder $containerBuilder,
2922
string $extensionName,
3023
string $clientName,
3124
array $pluginConfig
32-
): ServiceDefinition {
25+
): Definition {
3326

3427
$uriServiceDef = $containerBuilder
3528
->addDefinition("$extensionName.client.$clientName.plugin.addHost.uri")

‎src/DI/Plugin/Authentication.php

+2-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Http\Message\Authentication\Wsse;
1111
use InvalidArgumentException;
1212
use Nette\DI\ContainerBuilder;
13-
use Nette\DI\ServiceDefinition;
13+
use Nette\DI\Definitions\Definition;
1414
use Nette\StaticClass;
1515

1616
/**
@@ -20,20 +20,12 @@ class Authentication implements IPluginServiceDefinitonCreator
2020
{
2121
use StaticClass;
2222

23-
/**
24-
* @param ContainerBuilder $containerBuilder
25-
* @param string $extensionName
26-
* @param string $clientName
27-
* @param array $pluginConfig
28-
* @return ServiceDefinition
29-
* @throws InvalidArgumentException
30-
*/
3123
public static function createPluginServiceDefinition(
3224
ContainerBuilder $containerBuilder,
3325
string $extensionName,
3426
string $clientName,
3527
array $pluginConfig
36-
): ServiceDefinition {
28+
): Definition {
3729
$type = $pluginConfig['type'] ?? null;
3830

3931
if ($type === null) {

‎src/DI/Plugin/Cache.php

+5-10
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
use Http\Client\Common\Plugin\CachePlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
11+
use Nette\Utils\Strings;
1112

1213
/**
1314
* @author Jakub Janata <jakubjanata@gmail.com>
@@ -16,19 +17,12 @@ class Cache implements IPluginServiceDefinitonCreator
1617
{
1718
use StaticClass;
1819

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array[] $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2620
public static function createPluginServiceDefinition(
2721
ContainerBuilder $containerBuilder,
2822
string $extensionName,
2923
string $clientName,
3024
array $pluginConfig
31-
): ServiceDefinition {
25+
): Definition {
3226

3327
$args = [];
3428

@@ -44,7 +38,8 @@ public static function createPluginServiceDefinition(
4438

4539
$config = [];
4640
foreach ($pluginConfig['config'] as $key => $value) {
47-
$config[strtolower(preg_replace('#(.)(?=[A-Z])#', '$1_', $key) ?: '')] = $value;
41+
$newKey = Strings::replace($key, '#(.)(?=[A-Z])#', '$1_');
42+
$config[strtolower($newKey)] = $value;
4843
}
4944
$args['config'] = $config;
5045

‎src/DI/Plugin/Cookie.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Http\Client\Common\Plugin\CookiePlugin;
88
use Http\Message\CookieJar;
99
use Nette\DI\ContainerBuilder;
10-
use Nette\DI\ServiceDefinition;
10+
use Nette\DI\Definitions\Definition;
1111
use Nette\StaticClass;
1212

1313
/**
@@ -17,19 +17,12 @@ class Cookie implements IPluginServiceDefinitonCreator
1717
{
1818
use StaticClass;
1919

20-
/**
21-
* @param ContainerBuilder $containerBuilder
22-
* @param string $extensionName
23-
* @param string $clientName
24-
* @param array $pluginConfig
25-
* @return ServiceDefinition
26-
*/
2720
public static function createPluginServiceDefinition(
2821
ContainerBuilder $containerBuilder,
2922
string $extensionName,
3023
string $clientName,
3124
array $pluginConfig
32-
): ServiceDefinition {
25+
): Definition {
3326

3427
$cookieJar = $pluginConfig['cookieJar'] ?? new CookieJar();
3528

‎src/DI/Plugin/Decoder.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\DecoderPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class Decoder implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder->addDefinition("$extensionName.client.$clientName.plugin.decoder")
3427
->setType(DecoderPlugin::class)

‎src/DI/Plugin/HeaderAppend.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\HeaderAppendPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class HeaderAppend implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder
3427
->addDefinition("$extensionName.client.$clientName.plugin.headerAppend")

‎src/DI/Plugin/HeaderDefaults.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\HeaderDefaultsPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class HeaderDefaults implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder
3427
->addDefinition("$extensionName.client.$clientName.plugin.headerDefaults")

‎src/DI/Plugin/HeaderRemove.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\HeaderRemovePlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class HeaderRemove implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder
3427
->addDefinition("$extensionName.client.$clientName.plugin.headerRemove")

‎src/DI/Plugin/HeaderSet.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\HeaderSetPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class HeaderSet implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder
3427
->addDefinition("$extensionName.client.$clientName.plugin.headerSet")

‎src/DI/Plugin/IPluginServiceDefinitonCreator.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,20 @@
55
namespace FreezyBee\Httplug\DI\Plugin;
66

77
use Nette\DI\ContainerBuilder;
8-
use Nette\DI\ServiceDefinition;
8+
use Nette\DI\Definitions\Definition;
99

1010
/**
1111
* @author Jakub Janata <jakubjanata@gmail.com>
1212
*/
1313
interface IPluginServiceDefinitonCreator
1414
{
1515
/**
16-
* @param ContainerBuilder $containerBuilder
17-
* @param string $extensionName
18-
* @param string $clientName
19-
* @param array $pluginConfig
20-
* @return ServiceDefinition
16+
* @param array<mixed> $pluginConfig
2117
*/
2218
public static function createPluginServiceDefinition(
2319
ContainerBuilder $containerBuilder,
2420
string $extensionName,
2521
string $clientName,
2622
array $pluginConfig
27-
): ServiceDefinition;
23+
): Definition;
2824
}

‎src/DI/Plugin/Logger.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\LoggerPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class Logger implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
$args = ['formatter' => $pluginConfig['formatter'] ?? null];
3427

‎src/DI/Plugin/Redirect.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\RedirectPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class Redirect implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
$config = [];
3427
foreach ($pluginConfig as $key => $value) {

‎src/DI/Plugin/Retry.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Http\Client\Common\Plugin\RetryPlugin;
88
use Nette\DI\ContainerBuilder;
9-
use Nette\DI\ServiceDefinition;
9+
use Nette\DI\Definitions\Definition;
1010
use Nette\StaticClass;
1111

1212
/**
@@ -16,19 +16,12 @@ class Retry implements IPluginServiceDefinitonCreator
1616
{
1717
use StaticClass;
1818

19-
/**
20-
* @param ContainerBuilder $containerBuilder
21-
* @param string $extensionName
22-
* @param string $clientName
23-
* @param array $pluginConfig
24-
* @return ServiceDefinition
25-
*/
2619
public static function createPluginServiceDefinition(
2720
ContainerBuilder $containerBuilder,
2821
string $extensionName,
2922
string $clientName,
3023
array $pluginConfig
31-
): ServiceDefinition {
24+
): Definition {
3225

3326
return $containerBuilder->addDefinition("$extensionName.client.$clientName.plugin.retry")
3427
->setType(RetryPlugin::class)

‎src/Tracy/MessageCollector.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ class MessageCollector
1515
{
1616
use StaticClass;
1717

18-
/** @var array */
19-
public static $messages = [];
20-
21-
/** @var float */
22-
public static $totalTime;
18+
/** @var array<mixed> */
19+
public static array $messages = [];
20+
public static float $totalTime = 0.0;
2321

2422
/**
2523
* @param RequestInterface $request

‎src/Tracy/PluginClientDecorator.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@ class PluginClientDecorator implements HttpClient, HttpAsyncClient
1919
{
2020
use SmartObject;
2121

22-
/** @var PluginClient */
23-
private $pluginClient;
24-
25-
/** @var TracyPlugin */
26-
private $tracyPlugin;
22+
private PluginClient $pluginClient;
23+
private TracyPlugin $tracyPlugin;
2724

2825
/**
2926
* PluginClientDecorator constructor.
3027
* @param HttpClient|HttpAsyncClient $client
31-
* @param array $plugins
32-
* @param array $options
28+
* @param array<mixed> $plugins
29+
* @param array<mixed> $options
3330
*/
3431
public function __construct($client, array $plugins = [], array $options = [])
3532
{

‎tests/Utils/RouterFactory.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace FreezyBee\Httplug\Tests\Utils;
66

7-
use Nette\Application\IRouter;
87
use Nette\Application\Routers\Route;
8+
use Nette\Routing\Router;
99
use Nette\StaticClass;
1010

1111
/**
@@ -15,10 +15,7 @@ class RouterFactory
1515
{
1616
use StaticClass;
1717

18-
/**
19-
* @return IRouter
20-
*/
21-
public static function createRouter(): IRouter
18+
public static function createRouter(): Router
2219
{
2320
return new Route('', 'Test:');
2421
}

‎tests/Utils/TestPlugin.php

+5-9
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@
1313
*/
1414
class TestPlugin implements Plugin
1515
{
16-
/** @var array */
17-
private $config;
18-
19-
/** @var mixed */
20-
private $service;
16+
/** @var array<mixed> */
17+
public array $config;
18+
public object $service;
2119

2220
/**
23-
* TestPlugin constructor.
24-
* @param array $config
25-
* @param mixed $service
21+
* @param array<mixed> $config
2622
*/
27-
public function __construct(array $config, $service)
23+
public function __construct(array $config, object $service)
2824
{
2925
$this->config = $config;
3026
$this->service = $service;

0 commit comments

Comments
 (0)
Please sign in to comment.