Merge pull request php-curl-class#514 from zachborboa/master

Add support for detecting SOAP content-types

Author: zachborboa

src/Curl/Curl.php

@@ -55,7 +55,7 @@ class Curl
 
     private $jsonDecoderArgs = array();
     private $jsonPattern = '/^(?:application|text)\/(?:[a-z]+(?:[\.-][0-9a-z]+){0,}[\+\.]|x-)?json(?:-[a-z]+)?/i';
-    private $xmlPattern = '~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
+    private $xmlPattern = '~^(?:text/|application/(?:atom\+|rss\+|soap\+)?)xml~i';
     private $defaultDecoder = null;
 
     public static $RFC2616 = array(

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -2567,6 +2567,27 @@ public function testJsonContentTypeDetection()
         }
     }
 
+    public function testXmlContentTypeDetection()
+    {
+        $xml_content_types = array(
+            'application/atom+xml',
+            'application/rss+xml',
+            'application/soap+xml',
+            'application/xml',
+            'text/xml',
+        );
+
+        $class = new \ReflectionClass('\Curl\Curl');
+        $property = $class->getProperty('xmlPattern');
+        $property->setAccessible(true);
+        $xml_pattern = $property->getValue(new Curl);
+
+        foreach ($xml_content_types as $xml_content_type) {
+            $message = '"' . $xml_content_type . '" does not match pattern ' . $xml_pattern;
+            $this->assertEquals(1, preg_match($xml_pattern, $xml_content_type), $message);
+        }
+    }
+
     public function testXMLResponse()
     {
         foreach (array(
@@ -2579,6 +2600,9 @@ public function testXMLResponse()
                 'application/rss+xml',
                 'application/rss+xml; charset=utf-8',
                 'application/rss+xml;charset=utf-8',
+                'application/soap+xml',
+                'application/soap+xml; charset=utf-8',
+                'application/soap+xml;charset=utf-8',
                 'application/xml',
                 'application/xml; charset=utf-8',
                 'application/xml;charset=utf-8',