Fit code to eightpoints/guzzle-bundle:~8.0 (#2)

Co-authored-by: Minatulaev Roman Olegovich <[email protected]>

Author: covobo

README.md

@@ -11,15 +11,6 @@ This plugin integrates a generic way to include all middleware.
 ### Installation
 Using [composer][2]:
 
-##### composer.json
-``` json
-{
-    "require": {
-        "wizbit/guzzle-bundle-middleware-plugin": "^1.0"
-    }
-}
-```
-
 ##### command line
 ``` bash
 $ composer require wizbit/guzzle-bundle-middleware-plugin

composer.json

@@ -18,28 +18,17 @@
     ],
 
     "require": {
-        "php":                              "^7.0",
-        "guzzlehttp/guzzle":                "^6.0",
-        "eightpoints/guzzle-bundle":        "~7.0",
-        "symfony/http-kernel":              "~2.7|~3.0|~4.0",
-        "symfony/config":                   "~2.7|~3.0|~4.0",
-        "symfony/dependency-injection":     "~2.7|~3.0|~4.0",
-        "symfony/expression-language":      "~2.7|~3.0|~4.0"
-    },
-
-    "require-dev": {
-        "phpunit/phpunit":          "~6.1"
+        "php":                              ">=7.1",
+        "eightpoints/guzzle-bundle":        "~8.0",
+        "symfony/http-kernel":              "~4.0|~5.0",
+        "symfony/config":                   "~4.0|~5.0",
+        "symfony/dependency-injection":     "~4.0|~5.0",
+        "symfony/expression-language":      "~4.0|~5.0"
     },
 
     "autoload": {
         "psr-4": {
             "Wizbit\\Bundle\\GuzzleBundleMiddlewarePlugin\\": "src"
         }
-    },
-
-    "autoload-dev": {
-        "psr-4": {
-            "Wizbit\\Bundle\\GuzzleBundleMiddlewarePlugin\\Tests\\": "tests"
-        }
     }
 }

src/GuzzleBundleMiddlewarePlugin.php

@@ -2,38 +2,28 @@
 
 namespace Wizbit\Bundle\GuzzleBundleMiddlewarePlugin;
 
-use EightPoints\Bundle\GuzzleBundle\EightPointsGuzzleBundlePlugin;
+use EightPoints\Bundle\GuzzleBundle\PluginInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class GuzzleBundleMiddlewarePlugin extends Bundle implements EightPointsGuzzleBundlePlugin
+final class GuzzleBundleMiddlewarePlugin extends Bundle implements PluginInterface
 {
-    /**
-     * The name of this plugin. It will be used as the configuration key.
-     *
-     * @return string
-     */
     public function getPluginName(): string
     {
         return 'middleware';
     }
 
-    /**
-     * @param \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition $pluginNode
-     *
-     * @return void
-     */
-    public function addConfiguration(ArrayNodeDefinition $pluginNode)
+    public function addConfiguration(ArrayNodeDefinition $pluginNode): void
     {
         $pluginNode
             ->beforeNormalization()
             ->ifNotInArray(['enabled'])
-                ->then(function($value) {
-                    return array('middleware' => $value);
+                ->then(static function($value) {
+                    return ['middleware' => $value];
                 })
             ->end()
             ->canBeEnabled()
@@ -54,29 +44,11 @@ public function addConfiguration(ArrayNodeDefinition $pluginNode)
         ;
     }
 
-    /**
-     * Load this plugin: define services, load service definition files, etc.
-     *
-     * @param array                                                   $configs
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     *
-     * @return void
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container) : void
     {
     }
 
-    /**
-     * Add configuration nodes for this plugin to the provided node.
-     *
-     * @param array                                                   $config
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     * @param string                                                  $clientName
-     * @param \Symfony\Component\DependencyInjection\Definition       $handler
-     *
-     * @return void
-     */
-    public function loadForClient(array $config, ContainerBuilder $container, string $clientName, Definition $handler)
+    public function loadForClient(array $config, ContainerBuilder $container, string $clientName, Definition $handler) : void
     {
         if (true === $config['enabled']) {
             foreach ($config['middleware'] as $middleware) {
@@ -85,13 +57,6 @@ public function loadForClient(array $config, ContainerBuilder $container, string
         }
     }
 
-    /**
-     * Parses a callable.
-     *
-     * @param string|array $callable A callable
-     *
-     * @return string|array A parsed callable
-     */
     private function parseCallable($callable)
     {
         if (is_string($callable)) {