Merge branch '0.2'

Author: francisbesset

SoapClient.php

@@ -41,15 +41,6 @@ class SoapClient extends \SoapClient
      */
     protected $tracingEnabled = false;
 
-    /**
-     * Work around missing header/php://input access in PHP cli webserver by
-     * setting headers additionally as GET parameters and SOAP request body
-     * explicitly as POST variable.
-     *
-     * @var boolean
-     */
-    private $cliWebserverWorkaround = false;
-
     /**
      * cURL instance.
      *
@@ -108,10 +99,7 @@ public function __construct($wsdl, array $options = array())
         if (isset($options['soap_version'])) {
             $this->soapVersion = $options['soap_version'];
         }
-        // activate cli webserver workaround
-        if (isset($options['cli_webserver_workaround'])) {
-            $this->cliWebserverWorkaround = $options['cli_webserver_workaround'];
-        }
+
         $this->curl = new Curl($options);
 
         if (isset($options['extra_options'])) {
@@ -158,25 +146,6 @@ private function __doHttpRequest(SoapRequest $soapRequest)
 
         $location = $soapRequest->getLocation();
         $content = $soapRequest->getContent();
-        /*
-         * Work around missing header/php://input access in PHP cli webserver by
-         * setting headers additionally as GET parameters and SOAP request body
-         * explicitly as POST variable
-         */
-        if ($this->cliWebserverWorkaround === true) {
-            if (strpos($location, '?') === false) {
-                $location .= '?';
-            } else {
-                $location .= '&';
-            }
-            $location .= SoapMessage::CONTENT_TYPE_HEADER.'='.urlencode($soapRequest->getContentType());
-            $location .= '&';
-            $location .= SoapMessage::SOAP_ACTION_HEADER.'='.urlencode($soapRequest->getAction());
-
-            $content = http_build_query(array('request' => $content));
-
-            $headers = array();
-        }
 
         $headers = $this->filterRequestHeaders($soapRequest, $headers);
 
@@ -189,6 +158,7 @@ private function __doHttpRequest(SoapRequest $soapRequest)
             $headers,
             $options
         );
+
         // tracing enabled: store last request header and body
         if ($this->tracingEnabled === true) {
             $this->lastRequestHeaders = $this->curl->getRequestHeaders();

Tests/ServerInterop/MTOMClient.php

@@ -18,7 +18,6 @@
         'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
         'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
     ),
-    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     'connection_timeout' => 1,
 );
 

Tests/ServerInterop/MtomServerInteropTest.php

@@ -20,7 +20,6 @@ class MtomServerInteropTest extends TestCase
             'base64Binary'      => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary',
             'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest',
         ),
-        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testAttachment()

Tests/ServerInterop/SwaClient.php

@@ -24,7 +24,6 @@
         'uploadFile'           => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFile',
         'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFileResponse',
     ),
-    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/SwA.wsdl', $options);

Tests/ServerInterop/SwaServerInteropTest.php

@@ -23,7 +23,6 @@ class SwaServerInteropTest extends TestCase
             'uploadFile'           => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFile',
             'uploadFileResponse'   => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFileResponse',
         ),
-        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testUploadDownloadText()

Tests/ServerInterop/WsSecuritySigEncServerClient.php

@@ -31,7 +31,6 @@
         'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
         'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
     ),
-    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecuritySigEnc.wsdl', $options);

Tests/ServerInterop/WsSecuritySigEncServerInteropTest.php

@@ -30,7 +30,6 @@ class WsSecuritySigEncServerInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
         ),
-        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testSigEnc()

Tests/ServerInterop/WsSecurityUserPassServerClient.php

@@ -28,7 +28,6 @@
         'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
         'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
     ),
-    'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
 );
 
 $sc = new BeSimpleSoapClient(__DIR__.'/Fixtures/WsSecurityUserPass.wsdl', $options);

Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php

@@ -29,7 +29,6 @@ class WsSecurityUserPassServerInteropTest extends TestCase
             'addBookResponse'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse',
             'BookInformation'        => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation',
         ),
-        'cli_webserver_workaround' => true, // Work around missing header access in PHP cli webserver by setting headers additionally as GET parameters.
     );
 
     public function testUserPassText()