issue #28 - allow the non-WSDL-mode to be used

Author: mikaelcom

src/AbstractSoapClientBase.php

@@ -57,6 +57,7 @@ public function setSoapClient(\SoapClient $soapClient)
      * @uses AbstractSoapClientBase::getDefaultWsdlOptions()
      * @uses AbstractSoapClientBase::getSoapClientClassName()
      * @uses AbstractSoapClientBase::setSoapClient()
+     * @uses AbstractSoapClientBase::OPTION_PREFIX
      * @param array $options WSDL options
      * @return void
      */
@@ -71,20 +72,42 @@ public function initSoapClient(array $options)
                 $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optionName)] = $optionValue;
             }
         }
-        if (array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_URL), $wsdlOptions)) {
-            $wsdlUrl = $wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)];
-            unset($wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)]);
+        if (self::canInstantiateSoapClientWithOptions($wsdlOptions)) {
+            $wsdlUrl = null;
+            if (array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_URL), $wsdlOptions)) {
+                $wsdlUrl = $wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)];
+                unset($wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)]);
+            }
             $soapClientClassName = $this->getSoapClientClassName();
             $this->setSoapClient(new $soapClientClassName($wsdlUrl, $wsdlOptions));
         }
     }
+    /**
+     * Checks if the provided options are sufficient to instantiate a SoapClient:
+     *  - WSDL-mode : only the WSDL is required
+     *  - non-WSDL-mode : URI and LOCATION are required, WSDL url can be empty then
+     * @uses AbstractSoapClientBase::OPTION_PREFIX
+     * @param $wsdlOptions
+     * @return bool
+     */
+    protected static function canInstantiateSoapClientWithOptions($wsdlOptions)
+    {
+        return (
+            array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_URL), $wsdlOptions) ||
+            (
+                array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_URI), $wsdlOptions) &&
+                array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_LOCATION), $wsdlOptions)
+            )
+        );
+    }
     /**
      * Returns the SoapClient class name to use to create the instance of the SoapClient.
      * The SoapClient class is determined based on the package name.
      * If a class is named as {Api}SoapClient, then this is the class that will be used.
      * Be sure that this class inherits from the native PHP SoapClient class and this class has been loaded or can be loaded.
      * The goal is to allow the override of the SoapClient without having to modify this generated class.
      * Then the overridding SoapClient class can override for example the SoapClient::__doRequest() method if it is needed.
+     * @uses AbstractSoapClientBase::DEFAULT_SOAP_CLIENT_CLASS
      * @return string
      */
     public function getSoapClientClassName($soapClientClassName = null)

tests/SoapClientTest.php

@@ -49,20 +49,20 @@ public function testSetLocation()
 
         $soapClient->setLocation('http://api.bing.net:80/soap.asm');
 
-        $this->assertSAme('http://api.bing.net:80/soap.asm', $soapClient->getSoapClient()->location);
+        $this->assertSame('http://api.bing.net:80/soap.asm', $soapClient->getSoapClient()->location);
     }
     /**
      *
      */
-    public function testLocationOotion()
+    public function testLocationOption()
     {
         $soapClient = new SoapClient(array(
             SoapClient::WSDL_URL => __DIR__ . '/resources/bingsearch.wsdl',
             SoapClient::WSDL_CLASSMAP => self::classMap(),
             SoapClient::WSDL_LOCATION => 'http://api.bing.net:80/soap.asm',
         ));
 
-        $this->assertSAme('http://api.bing.net:80/soap.asm', $soapClient->getSoapClient()->location);
+        $this->assertSame('http://api.bing.net:80/soap.asm', $soapClient->getSoapClient()->location);
     }
     /**
      *
@@ -481,4 +481,52 @@ public static function classMap()
             'WebSearchTag' => 'ApiStructWebSearchTag',
         );
     }
+    /**
+     *
+     */
+    public function testInvalidNonWsdlModeMustNotCreateASoapInstanceForMissingUriAndLocationOptions()
+    {
+        $soapClient = new SoapClient(array(
+            SoapClient::WSDL_URL => null,
+        ));
+
+        $this->assertNull($soapClient->getSoapClient());
+    }
+    /**
+     *
+     */
+    public function testInvalidNonWsdlModeMustNotCreateASoapInstanceForMissingLocationOption()
+    {
+        $soapClient = new SoapClient(array(
+            SoapClient::WSDL_URL => null,
+            SoapClient::WSDL_URI => 'http://api.bing.net:80/soap.asmx',
+        ));
+
+        $this->assertNull($soapClient->getSoapClient());
+    }
+    /**
+     *
+     */
+    public function testInvalidNonWsdlModeMustNotCreateASoapInstanceForMissingUriOption()
+    {
+        $soapClient = new SoapClient(array(
+            SoapClient::WSDL_URL => null,
+            SoapClient::WSDL_LOCATION => 'http://api.bing.net:80/soap.asmx',
+        ));
+
+        $this->assertNull($soapClient->getSoapClient());
+    }
+    /**
+     *
+     */
+    public function testInvalidNonWsdlModeMustCreateASoapInstanceWithUriAndLocationOptions()
+    {
+        $soapClient = new SoapClient(array(
+            SoapClient::WSDL_URL => null,
+            SoapClient::WSDL_LOCATION => 'http://api.bing.net:80/soap.asmx',
+            SoapClient::WSDL_URI => 'http://api.bing.net:80/soap.asmx',
+        ));
+
+        $this->assertInstanceOf('\SoapClient', $soapClient->getSoapClient());
+    }
 }