Merge pull request #334 from pixelart/fix/content-type-plugin

Remove enabled key from content type plugin options

Author: dbu

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+### Fixed
+
+- Fix to pass only allowed options to the `ContentTypePlugin`. 
+
 ## 1.15.1 - 2019-04-12
 
 ### Fixed

src/DependencyInjection/HttplugExtension.php

@@ -270,7 +270,9 @@ private function configurePluginByName($name, Definition $definition, array $con
                 break;
 
             case 'content_type':
+                unset($config['enabled']);
                 $definition->replaceArgument(0, $config);
+
                 break;
 
             case 'header_append':

tests/Resources/Fixtures/config/full.php

@@ -35,6 +35,11 @@
                         'uri' => 'http://localhost',
                     ],
                 ],
+                [
+                    'content_type' => [
+                        'skip_detection' => true,
+                    ],
+                ],
                 [
                     'header_set' => [
                         'headers' => [

tests/Resources/Fixtures/config/full.xml

@@ -26,6 +26,9 @@
             <plugin>
                 <base-uri uri="http://localhost"/>
             </plugin>
+            <plugin>
+                <content-type skip-detection="true"/>
+            </plugin>
             <plugin>
                 <header-set>
                     <header name="X-FOO">bar</header>

tests/Resources/Fixtures/config/full.yml

@@ -25,6 +25,9 @@ httplug:
                 -
                     base_uri:
                         uri: http://localhost
+                -
+                    content_type:
+                        skip_detection: true
                 -
                     header_set:
                         headers:

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -151,6 +151,12 @@ public function testSupportsAllConfigFormats()
                                 'replace' => false,
                             ],
                         ],
+                        [
+                            'content_type' => [
+                                'enabled' => true,
+                                'skip_detection' => true,
+                            ],
+                        ],
                         [
                             'header_set' => [
                                 'enabled' => true,

tests/Unit/DependencyInjection/HttplugExtensionTest.php

@@ -254,6 +254,32 @@ public function testCachePluginConfigCacheKeyGeneratorReference()
         $this->assertSame('header_cache_key_generator', (string) $config['cache_key_generator']);
     }
 
+    public function testContentTypePluginAllowedOptions()
+    {
+        $this->load([
+            'clients' => [
+                'acme' => [
+                    'plugins' => [
+                        [
+                            'content_type' => [
+                                'skip_detection' => true,
+                                'size_limit' => 200000,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $cachePlugin = $this->container->findDefinition('httplug.client.acme.plugin.content_type');
+
+        $config = $cachePlugin->getArgument(0);
+        $this->assertEquals([
+            'skip_detection' => true,
+            'size_limit' => 200000,
+        ], $config);
+    }
+
     public function testUsingServiceKeyForClients()
     {
         $this->load([