Replace plugins package with client-common

Applied fixes from StyleCI

Add plugins dependency back as fallback

Remove auto (default) config from plugins

Update changelog

Make sure to use a plugin version with correct interface

Author: sagikazarmark

CHANGELOG.md

@@ -11,6 +11,8 @@
 - Guzzle 6 client is now created according to the Httplug specifications with automated minimal behaviour.
   Make sure you configure the Httplug plugins as needed,
   for example if you want to get exceptions for failure HTTP status codes.
+- **[BC] PluginClientFactory returns an instance of `Http\Client\Common\PluginClient`** (see [php-http/client-common#14](https://github.com/php-http/client-common/pull/14))
+- Plugins are loaded from their new packages, fall back to `php-http/plugins` if necessary
 
 
 ### Fixed

ClientFactory/PluginClientFactory.php

@@ -2,8 +2,8 @@
 
 namespace Http\HttplugBundle\ClientFactory;
 
-use Http\Client\Plugin\Plugin;
-use Http\Client\Plugin\PluginClient;
+use Http\Client\Common\Plugin;
+use Http\Client\Common\PluginClient;
 
 /**
  * This factory creates a PluginClient.

Collector/MessageJournal.php

@@ -3,7 +3,7 @@
 namespace Http\HttplugBundle\Collector;
 
 use Http\Client\Exception;
-use Http\Client\Plugin\Journal;
+use Http\Client\Common\Plugin\Journal;
 use Http\Message\Formatter;
 use Http\Message\Formatter\SimpleFormatter;
 use Psr\Http\Message\RequestInterface;

DependencyInjection/HttplugExtension.php

@@ -2,8 +2,11 @@
 
 namespace Http\HttplugBundle\DependencyInjection;
 
-use Http\Client\Plugin\AuthenticationPlugin;
-use Http\Client\Plugin\PluginClient;
+use Http\Client\Common\Plugin\AuthenticationPlugin;
+use Http\Client\Common\Plugin\CachePlugin;
+use Http\Client\Common\Plugin\LoggerPlugin;
+use Http\Client\Common\Plugin\StopwatchPlugin;
+use Http\Client\Common\PluginClient;
 use Http\HttplugBundle\ClientFactory\DummyClient;
 use Http\Message\Authentication\BasicAuth;
 use Http\Message\Authentication\Bearer;
@@ -119,6 +122,7 @@ private function configurePlugins(ContainerBuilder $container, array $config)
 
         foreach ($config as $name => $pluginConfig) {
             $pluginId = 'httplug.plugin.'.$name;
+
             if ($pluginConfig['enabled']) {
                 $def = $container->getDefinition($pluginId);
                 $this->configurePluginByName($name, $def, $pluginConfig);
@@ -137,6 +141,10 @@ private function configurePluginByName($name, Definition $definition, array $con
     {
         switch ($name) {
             case 'cache':
+                // To preserve BC, we check the existence of the new plugin class and use it if available
+                if (class_exists(CachePlugin::class)) {
+                    $definition->setClass(CachePlugin::class);
+                }
                 $definition
                     ->replaceArgument(0, new Reference($config['cache_pool']))
                     ->replaceArgument(1, new Reference($config['stream_factory']))
@@ -152,6 +160,10 @@ private function configurePluginByName($name, Definition $definition, array $con
                 $definition->replaceArgument(0, new Reference($config['journal']));
                 break;
             case 'logger':
+                // To preserve BC, we check the existence of the new plugin class and use it if available
+                if (class_exists(LoggerPlugin::class)) {
+                    $definition->setClass(LoggerPlugin::class);
+                }
                 $definition->replaceArgument(0, new Reference($config['logger']));
                 if (!empty($config['formatter'])) {
                     $definition->replaceArgument(1, new Reference($config['formatter']));
@@ -166,6 +178,10 @@ private function configurePluginByName($name, Definition $definition, array $con
                 $definition->addArgument($config['retry']);
                 break;
             case 'stopwatch':
+                // To preserve BC, we check the existence of the new plugin class and use it if available
+                if (class_exists(StopwatchPlugin::class)) {
+                    $definition->setClass(StopwatchPlugin::class);
+                }
                 $definition->replaceArgument(0, new Reference($config['stopwatch']));
                 break;
         }

Resources/config/data-collector.xml

@@ -10,7 +10,7 @@
             <argument>null</argument>
         </service>
 
-        <service id="httplug.collector.history_plugin" class="Http\Client\Plugin\HistoryPlugin" public="false">
+        <service id="httplug.collector.history_plugin" class="Http\Client\Common\Plugin\HistoryPlugin" public="false">
             <argument type="service" id="httplug.collector.message_journal"/>
         </service>
     </services>

Resources/config/plugins.xml

@@ -9,21 +9,21 @@
             <argument />
             <argument />
         </service>
-        <service id="httplug.plugin.content_length" class="Http\Client\Plugin\ContentLengthPlugin" public="false" />
-        <service id="httplug.plugin.cookie" class="Http\Client\Plugin\CookiePlugin" public="false">
+        <service id="httplug.plugin.content_length" class="Http\Client\Common\Plugin\ContentLengthPlugin" public="false" />
+        <service id="httplug.plugin.cookie" class="Http\Client\Common\Plugin\CookiePlugin" public="false">
             <argument />
         </service>
-        <service id="httplug.plugin.decoder" class="Http\Client\Plugin\DecoderPlugin" public="false" />
-        <service id="httplug.plugin.error" class="Http\Client\Plugin\ErrorPlugin" public="false" />
-        <service id="httplug.plugin.history" class="Http\Client\Plugin\HistoryPlugin" public="false">
+        <service id="httplug.plugin.decoder" class="Http\Client\Common\Plugin\DecoderPlugin" public="false" />
+        <service id="httplug.plugin.error" class="Http\Client\Common\Plugin\ErrorPlugin" public="false" />
+        <service id="httplug.plugin.history" class="Http\Client\Common\Plugin\HistoryPlugin" public="false">
             <argument />
         </service>
         <service id="httplug.plugin.logger" class="Http\Client\Plugin\LoggerPlugin" public="false">
             <argument />
             <argument>null</argument>
         </service>
-        <service id="httplug.plugin.redirect" class="Http\Client\Plugin\RedirectPlugin" public="false" />
-        <service id="httplug.plugin.retry" class="Http\Client\Plugin\RetryPlugin" public="false" />
+        <service id="httplug.plugin.redirect" class="Http\Client\Common\Plugin\RedirectPlugin" public="false" />
+        <service id="httplug.plugin.retry" class="Http\Client\Common\Plugin\RetryPlugin" public="false" />
         <service id="httplug.plugin.stopwatch" class="Http\Client\Plugin\StopwatchPlugin" public="false">
             <argument />
         </service>

composer.json

@@ -19,7 +19,8 @@
         "php": ">=5.5",
         "php-http/client-implementation": "^1.0",
         "php-http/message-factory": "^1.0.2",
-        "php-http/plugins": "^1.0",
+        "php-http/client-common": "^1.1",
+        "php-http/plugins": "^1.1",
         "symfony/options-resolver": "^2.7|^3.0",
         "symfony/framework-bundle": "^2.7|^3.0"
     },