Use new packages, remove php-http/plugins

Author: sagikazarmark

CHANGELOG.md

@@ -12,7 +12,7 @@
   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
+- Plugins are loaded from their new packages
 
 
 ### Fixed

DependencyInjection/HttplugExtension.php

@@ -3,9 +3,6 @@
 namespace Http\HttplugBundle\DependencyInjection;
 
 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;
@@ -141,10 +138,6 @@ 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']))
@@ -160,10 +153,6 @@ 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']));
@@ -178,10 +167,6 @@ 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/plugins.xml

@@ -4,7 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="httplug.plugin.cache" class="Http\Client\Plugin\CachePlugin" public="false">
+        <service id="httplug.plugin.cache" class="Http\Client\Common\Plugin\CachePlugin" public="false">
             <argument />
             <argument />
             <argument />
@@ -18,13 +18,13 @@
         <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">
+        <service id="httplug.plugin.logger" class="Http\Client\Common\Plugin\LoggerPlugin" public="false">
             <argument />
             <argument>null</argument>
         </service>
         <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">
+        <service id="httplug.plugin.stopwatch" class="Http\Client\Common\Plugin\StopwatchPlugin" public="false">
             <argument />
         </service>
     </services>

composer.json

@@ -20,7 +20,9 @@
         "php-http/client-implementation": "^1.0",
         "php-http/message-factory": "^1.0.2",
         "php-http/client-common": "^1.1",
-        "php-http/plugins": "^1.1",
+        "php-http/cache-plugin": "^1.0",
+        "php-http/logger-plugin": "^1.0",
+        "php-http/stopwatch-plugin": "^1.0",
         "symfony/options-resolver": "^2.7|^3.0",
         "symfony/framework-bundle": "^2.7|^3.0"
     },