php 8 + github actions

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: Tests
+
+on: [ push, pull_request ]
+
+jobs:
+    tests:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v3
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.1
+                    coverage: pcov
+
+            -   name: Composer install
+                run: composer install --dev --no-progress
+
+            -   name: Check coding standard
+                run: vendor/bin/phpcs --standard=PSR12 ./src ./tests
+
+            -   name: Check phpstan
+                run: vendor/bin/phpstan
+
+            -   name: Check tests
+                run: vendor/bin/tester tests -C --coverage coverage.xml --coverage-src ./src
+
+            -   name: Upload coverage
+                env:
+                    COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                run: |
+                    composer global require php-coveralls/php-coveralls
+                    php-coveralls --coverage_clover=coverage.xml --json_path=upload.json

Makefile

@@ -1,5 +1,5 @@
 test:
 	rm -rf tests/tmp/cache
-	php vendor/bin/phpstan analyse ./src ./tests --level max
+	php vendor/bin/phpstan
 	php vendor/bin/phpcs --standard=PSR12 ./src ./tests
 	php vendor/bin/tester ./tests

composer.json

@@ -16,7 +16,7 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^8.0",
     "ext-json": "*",
     "nette/di": "^3.0",
     "php-http/client-common": "^2.0",
@@ -26,7 +26,7 @@
     "php-http/message-factory": "^1.0"
   },
   "require-dev": {
-    "freezy-bee/nette-caching-psr6": "^1.1",
+    "freezy-bee/nette-caching-psr6": "^2.0",
     "mockery/mockery": "^1.1",
     "nette/application": "^3.0",
     "nette/bootstrap": "^3.0",
@@ -36,9 +36,9 @@
     "php-http/curl-client": "^2.0",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/logger-plugin": "^1.0",
-    "phpstan/phpstan": "^0.12",
+    "phpstan/phpstan": "^1.8",
     "squizlabs/php_codesniffer": "^3.0",
-    "symfony/cache": "^4.0 || ^5.0",
+    "symfony/cache": "^6.0",
     "tracy/tracy": "^2.6"
   },
   "autoload": {

phpstan.neon

@@ -1,2 +1,7 @@
 parameters:
-    checkMissingIterableValueType: false
+    level: 8
+    paths:
+        - src
+        - tests
+
+    checkUninitializedProperties: true

src/ClientFactory/ClientFactory.php

@@ -12,9 +12,7 @@
 interface ClientFactory
 {
     /**
-     * Input an array of configuration to be able to create a HttpClient.
-     * @param array $config
-     * @return HttpClient
+     * @param array<mixed> $config
      */
     public function createClient(array $config = []): HttpClient;
 }

src/ClientFactory/CurlFactory.php

@@ -13,10 +13,6 @@
  */
 class CurlFactory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     * @throws \LogicException
-     */
     public function createClient(array $config = []): HttpClient
     {
         if (!class_exists(Client::class)) {

src/ClientFactory/Guzzle7Factory.php

@@ -13,10 +13,6 @@
  */
 class Guzzle7Factory implements ClientFactory
 {
-    /**
-     * {@inheritdoc}
-     * @throws LogicException
-     */
     public function createClient(array $config = []): HttpClient
     {
         if (!class_exists(Client::class)) {

src/ClientFactory/PluginClientFactory.php

@@ -17,10 +17,8 @@ class PluginClientFactory
 {
     /**
      * @param Plugin[] $plugins
-     * @param ClientFactory $factory
-     * @param array $config config to the client factory
-     * @param array $pluginClientOptions config forwarded to the PluginClient
-     * @param bool $debugMode
+     * @param array<mixed> $config config to the client factory
+     * @param array<mixed> $pluginClientOptions config forwarded to the PluginClient
      * @return PluginClientDecorator|PluginClient
      */
     public static function createPluginClient(

src/DI/HttplugExtension.php

@@ -20,6 +20,7 @@
 use InvalidArgumentException;
 use Nette\DI\CompilerExtension;
 use Nette\DI\ContainerBuilder;
+use Nette\DI\Definitions\Definition;
 use Nette\DI\Definitions\ServiceDefinition;
 use Nette\DI\Definitions\Statement;
 use Nette\DI\Helpers;
@@ -29,11 +30,10 @@
  */
 class HttplugExtension extends CompilerExtension
 {
-    /** @var bool */
-    private $debugMode = false;
+    private bool $debugMode = false;
 
-    /** @var array */
-    private static $defaults = [
+    /** @var array<string, mixed> */
+    private static array $defaults = [
         # uses discovery if not specified
         'classes' => [
             'client' => null,
@@ -54,16 +54,16 @@ class HttplugExtension extends CompilerExtension
         ]
     ];
 
-    /** @var array */
-    private $classes = [
+    /** @var array<string, string> */
+    private array $classes = [
         'client' => HttpClient::class,
         'messageFactory' => MessageFactory::class,
         'uriFactory' => UriFactory::class,
         'streamFactory' => StreamFactory::class,
     ];
 
-    /** @var array */
-    private $factoryClasses = [
+    /** @var array<string, mixed> */
+    private array $factoryClasses = [
         'client' => [HttpClientDiscovery::class, 'find'],
         'messageFactory' => [MessageFactoryDiscovery::class, 'find'],
         'uriFactory' => [UriFactoryDiscovery::class, 'find'],
@@ -116,7 +116,7 @@ public function loadConfiguration(): void
     /**
      * @param ContainerBuilder $containerBuilder
      * @param string $clientName
-     * @param array[] $clientConfig
+     * @param array<mixed> $clientConfig
      */
     private function configureClient(ContainerBuilder $containerBuilder, string $clientName, array $clientConfig): void
     {
@@ -152,18 +152,14 @@ private function configureClient(ContainerBuilder $containerBuilder, string $cli
     }
 
     /**
-     * @param ContainerBuilder $containerBuilder
-     * @param string $pluginName
-     * @param string $clientName
-     * @param array $pluginConfig
-     * @return ServiceDefinition
+     * @param array<mixed> $pluginConfig
      */
     private function configurePlugin(
         ContainerBuilder $containerBuilder,
         string $pluginName,
         string $clientName,
         array $pluginConfig
-    ): ServiceDefinition {
+    ): Definition {
 
         $creator = 'FreezyBee\Httplug\DI\Plugin\\' . ucfirst($pluginName);
 

src/DI/IClientProvider.php

@@ -16,7 +16,7 @@ interface IClientProvider
      *      plugins:
      *          ...
 
-     * @return array
+     * @return array<mixed>
      */
     public function getClientConfigs(): array;
 }

src/DI/Plugin/AddHost.php

@@ -6,7 +6,7 @@
 
 use Http\Client\Common\Plugin\AddHostPlugin;
 use Nette\DI\ContainerBuilder;
-use Nette\DI\ServiceDefinition;
+use Nette\DI\Definitions\Definition;
 use Nette\StaticClass;
 use Psr\Http\Message\UriInterface;
 
@@ -17,19 +17,12 @@ class AddHost implements IPluginServiceDefinitonCreator
 {
     use StaticClass;
 
-    /**
-     * @param ContainerBuilder $containerBuilder
-     * @param string $extensionName
-     * @param string $clientName
-     * @param array $pluginConfig
-     * @return ServiceDefinition
-     */
     public static function createPluginServiceDefinition(
         ContainerBuilder $containerBuilder,
         string $extensionName,
         string $clientName,
         array $pluginConfig
-    ): ServiceDefinition {
+    ): Definition {
 
         $uriServiceDef = $containerBuilder
             ->addDefinition("$extensionName.client.$clientName.plugin.addHost.uri")

src/DI/Plugin/Authentication.php

@@ -10,7 +10,7 @@
 use Http\Message\Authentication\Wsse;
 use InvalidArgumentException;
 use Nette\DI\ContainerBuilder;
-use Nette\DI\ServiceDefinition;
+use Nette\DI\Definitions\Definition;
 use Nette\StaticClass;
 
 /**
@@ -20,20 +20,12 @@ class Authentication implements IPluginServiceDefinitonCreator
 {
     use StaticClass;
 
-    /**
-     * @param ContainerBuilder $containerBuilder
-     * @param string $extensionName
-     * @param string $clientName
-     * @param array $pluginConfig
-     * @return ServiceDefinition
-     * @throws InvalidArgumentException
-     */
     public static function createPluginServiceDefinition(
         ContainerBuilder $containerBuilder,
         string $extensionName,
         string $clientName,
         array $pluginConfig
-    ): ServiceDefinition {
+    ): Definition {
         $type = $pluginConfig['type'] ?? null;
 
         if ($type === null) {

src/DI/Plugin/Cache.php

@@ -6,8 +6,9 @@
 
 use Http\Client\Common\Plugin\CachePlugin;
 use Nette\DI\ContainerBuilder;
-use Nette\DI\ServiceDefinition;
+use Nette\DI\Definitions\Definition;
 use Nette\StaticClass;
+use Nette\Utils\Strings;
 
 /**
  * @author Jakub Janata <[email protected]>
@@ -16,19 +17,12 @@ class Cache implements IPluginServiceDefinitonCreator
 {
     use StaticClass;
 
-    /**
-     * @param ContainerBuilder $containerBuilder
-     * @param string $extensionName
-     * @param string $clientName
-     * @param array[] $pluginConfig
-     * @return ServiceDefinition
-     */
     public static function createPluginServiceDefinition(
         ContainerBuilder $containerBuilder,
         string $extensionName,
         string $clientName,
         array $pluginConfig
-    ): ServiceDefinition {
+    ): Definition {
 
         $args = [];
 
@@ -44,7 +38,8 @@ public static function createPluginServiceDefinition(
 
         $config = [];
         foreach ($pluginConfig['config'] as $key => $value) {
-            $config[strtolower(preg_replace('#(.)(?=[A-Z])#', '$1_', $key) ?: '')] = $value;
+            $newKey = Strings::replace($key, '#(.)(?=[A-Z])#', '$1_');
+            $config[strtolower($newKey)] = $value;
         }
         $args['config'] = $config;
 

src/DI/Plugin/Cookie.php

@@ -7,7 +7,7 @@
 use Http\Client\Common\Plugin\CookiePlugin;
 use Http\Message\CookieJar;
 use Nette\DI\ContainerBuilder;
-use Nette\DI\ServiceDefinition;
+use Nette\DI\Definitions\Definition;
 use Nette\StaticClass;
 
 /**
@@ -17,19 +17,12 @@ class Cookie implements IPluginServiceDefinitonCreator
 {
     use StaticClass;
 
-    /**
-     * @param ContainerBuilder $containerBuilder
-     * @param string $extensionName
-     * @param string $clientName
-     * @param array $pluginConfig
-     * @return ServiceDefinition
-     */
     public static function createPluginServiceDefinition(
         ContainerBuilder $containerBuilder,
         string $extensionName,
         string $clientName,
         array $pluginConfig
-    ): ServiceDefinition {
+    ): Definition {
 
         $cookieJar = $pluginConfig['cookieJar'] ?? new CookieJar();