[HttpClient] Simplify xml configuration + buffer info + buffer validation

rjwebdev · rjwebdev · commit 4eabdf40b555 · 2019-08-01T15:19:27.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1394,9 +1394,9 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                     ->info('A list of SSL/TLS ciphers separated by colons, commas or spaces (e.g. "RC3-SHA:TLS13-AES-128-GCM-SHA256"...)')
                                 ->end()
                                 ->scalarNode('buffer')
-                                    ->info('Response content should be buffered or not')
+                                    ->info('Whether the response content should be buffered or a regex telling which content-types should be')
                                     ->validate()
-                                        ->ifTrue(function ($v) { return !\is_bool($v) && (\is_string($v) && false === @preg_match($v, '')); })
+                                        ->ifTrue(function ($v) { return !\is_bool($v) && (!\is_string($v) || false === @preg_match($v, '')); })
                                         ->thenInvalid('Buffer option should be a boolean or a valid regex')
                                     ->end()
                                 ->end()
@@ -1537,9 +1537,9 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                         ->info('A list of SSL/TLS ciphers separated by colons, commas or spaces (e.g. "RC3-SHA:TLS13-AES-128-GCM-SHA256"...)')
                                     ->end()
                                     ->scalarNode('buffer')
-                                        ->info('Response content should be buffered or not')
+                                        ->info('Whether the response content should be buffered or a regex telling which content-types should be')
                                         ->validate()
-                                            ->ifTrue(function ($v) { return !\is_bool($v) && (\is_string($v) && false === @preg_match($v, '')); })
+                                            ->ifTrue(function ($v) { return !\is_bool($v) && (!\is_string($v) || false === @preg_match($v, '')); })
                                             ->thenInvalid('Buffer option should be a boolean or a valid regex')
                                         ->end()
                                     ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -503,11 +503,7 @@
         <xsd:attribute name="local-pk" type="xsd:string" />
         <xsd:attribute name="passphrase" type="xsd:string" />
         <xsd:attribute name="ciphers" type="xsd:string" />
-        <xsd:attribute name="buffer">
-            <xsd:simpleType>
-                <xsd:union memberTypes="xsd:string xsd:boolean" />
-            </xsd:simpleType>
-        </xsd:attribute>
+        <xsd:attribute name="buffer" type="xsd:string" />
 
     </xsd:complexType>
 
