Add plugins dependency back as fallback

Author: sagikazarmark

DependencyInjection/Configuration.php

@@ -177,25 +177,9 @@ protected function configurePlugins(ArrayNodeDefinition $root)
                     ->end() // End history plugin
 
                     ->arrayNode('logger')
+                    ->canBeDisabled()
                     ->addDefaultsIfNotSet()
                         ->children()
-                            ->enumNode('enabled')
-                                ->beforeNormalization()
-                                    ->ifString()
-                                    ->then(function ($v) {
-                                        switch ($v) {
-                                            case 'true':
-                                                return true;
-                                            case 'false':
-                                                return false;
-                                            default:
-                                                return $v;
-                                        }
-                                    })
-                                ->end()
-                                ->values([true, false, 'auto'])
-                                ->defaultValue('auto')
-                            ->end()
                             ->scalarNode('logger')
                                 ->info('This must be a service id to a service implementing Psr\Log\LoggerInterface')
                                 ->defaultValue('logger')

DependencyInjection/HttplugExtension.php

@@ -142,6 +142,9 @@ private function configurePluginByName($name, Definition $definition, array $con
     {
         switch ($name) {
             case 'cache':
+                if (class_exists('Http\Client\Common\Plugin\CachePlugin')) {
+                    $definition->setClass('Http\Client\Common\Plugin\CachePlugin');
+                }
                 $definition
                     ->replaceArgument(0, new Reference($config['cache_pool']))
                     ->replaceArgument(1, new Reference($config['stream_factory']))
@@ -157,6 +160,9 @@ private function configurePluginByName($name, Definition $definition, array $con
                 $definition->replaceArgument(0, new Reference($config['journal']));
                 break;
             case 'logger':
+                if (class_exists('Http\Client\Common\Plugin\LoggerPlugin')) {
+                    $definition->setClass('Http\Client\Common\Plugin\LoggerPlugin');
+                }
                 $definition->replaceArgument(0, new Reference($config['logger']));
                 if (!empty($config['formatter'])) {
                     $definition->replaceArgument(1, new Reference($config['formatter']));
@@ -171,6 +177,9 @@ private function configurePluginByName($name, Definition $definition, array $con
                 $definition->addArgument($config['retry']);
                 break;
             case 'stopwatch':
+                if (class_exists('Http\Client\Common\Plugin\StopwatchPlugin')) {
+                    $definition->setClass('Http\Client\Common\Plugin\StopwatchPlugin');
+                }
                 $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\Common\Plugin\CachePlugin" public="false">
+        <service id="httplug.plugin.cache" class="Http\Client\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\Common\Plugin\LoggerPlugin" public="false">
+        <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\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\Common\Plugin\StopwatchPlugin" public="false">
+        <service id="httplug.plugin.stopwatch" class="Http\Client\Plugin\StopwatchPlugin" public="false">
             <argument />
         </service>
     </services>

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -62,7 +62,7 @@ public function testEmptyConfiguration()
                     'enabled' => false,
                 ],
                 'logger' => [
-                    'enabled' => 'auto',
+                    'enabled' => true,
                     'logger' => 'logger',
                     'formatter' => null,
                 ],

composer.json

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