Merged Source/Master

zendframework · Mar 13, 2013 · e0c31db · e0c31db
commit e0c31db
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 49 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -10,7 +10,6 @@
 namespace Zend\Soap;
 
 use Zend\Server\Reflection;
-use Zend\Server\Reflection\AbstractFunction;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
 use Zend\Soap\Wsdl;
@@ -96,27 +95,26 @@ class AutoDiscover
     /**
      * Constructor
      *
-     * @param ComplexTypeStrategy $strategy
-     * @param string|Uri\Uri $endpointUri
-     * @param string $wsdlClass
-     * @param array $classMap
+     * @param null|ComplexTypeStrategy $strategy
+     * @param null|string|Uri\Uri $endpointUri
+     * @param null|string $wsdlClass
+     * @param null|array $classMap
      */
-    public function __construct(ComplexTypeStrategy $strategy = null, $endpointUri=null, $wsdlClass=null, array $classMap = array())
+    public function __construct(ComplexTypeStrategy $strategy = null, $endpointUri = null, $wsdlClass = null, array $classMap = array())
     {
         $this->reflection = new Reflection();
         $this->discoveryStrategy = new ReflectionDiscovery();
 
-        if ($strategy !== null) {
+        if (null !== $strategy) {
             $this->setComplexTypeStrategy($strategy);
         }
-
-        if ($endpointUri !== null) {
+        if (null !== $endpointUri) {
             $this->setUri($endpointUri);
         }
-
-        if ($wsdlClass !== null) {
+        if (null !== $wsdlClass) {
             $this->setWsdlClass($wsdlClass);
         }
+        $this->setClassMap($classMap);
     }
 
     /**
@@ -151,9 +149,19 @@ public function getClassMap()
 
     /**
      * Set the class map of php to wsdl qname types.
+     *
+     * @param array $classmap
+     * @return AutoDiscover
      */
     public function setClassMap($classMap)
     {
+        if (!is_array($classMap)) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects an array; received "%s"',
+                __METHOD__,
+                (is_object($classMap) ? get_class($classMap) : gettype($classMap))
+            ));
+        }
         $this->classMap = $classMap;
         return $this;
     }
@@ -183,9 +191,10 @@ public function getServiceName()
                 return $this->reflection->reflectClass($this->class)
                                          ->getShortName();
             } else {
-                throw new Exception\RuntimeException(
-                    "No service name given. Call Autodiscover::setServiceName()."
-                );
+                throw new Exception\RuntimeException(sprintf(
+                    "No service name given. Call %s::setServiceName().",
+                    __CLASS__
+                ));
             }
         }
 
@@ -203,9 +212,10 @@ public function getServiceName()
     public function setUri($uri)
     {
         if (!is_string($uri) && !($uri instanceof Uri\Uri)) {
-            throw new Exception\InvalidArgumentException(
-                'No uri given to \Zend\Soap\AutoDiscover::setUri as string or \Zend\Uri\Uri instance.'
-            );
+            throw new Exception\InvalidArgumentException(sprintf(
+                'No uri given to %s() as string or \Zend\Uri\Uri instance.',
+                __METHOD__
+            ));
         }
         $this->uri = $uri;
 
@@ -221,7 +231,10 @@ public function setUri($uri)
     public function getUri()
     {
         if ($this->uri === null) {
-            throw new Exception\RuntimeException("Missing uri. You have to explicitly configure the Endpoint Uri by calling AutoDiscover::setUri().");
+            throw new Exception\RuntimeException(sprintf(
+                "Missing uri. You have to explicitly configure the Endpoint Uri by calling %s::setUri().",
+                __CLASS__
+            ));
         }
         if (is_string($this->uri)) {
             $this->uri = Uri\UriFactory::factory($this->uri);
@@ -240,9 +253,11 @@ public function getUri()
     public function setWsdlClass($wsdlClass)
     {
         if (!is_string($wsdlClass) && !is_subclass_of($wsdlClass, 'Zend\Soap\Wsdl')) {
-            throw new Exception\InvalidArgumentException(
-                'No \Zend\Soap\Wsdl subclass given to Zend\Soap\AutoDiscover::setWsdlClass as string.'
-            );
+            throw new Exception\InvalidArgumentException(sprintf(
+                'No %s\Wsdl subclass given to %s() as string.',
+                __NAMESPACE__,
+                __METHOD__
+            ));
         }
         $this->wsdlClass = $wsdlClass;
 
@@ -269,7 +284,7 @@ public function getWsdlClass()
      * @return AutoDiscover
      * @throws Exception\InvalidArgumentException
      */
-    public function setOperationBodyStyle(array $operationStyle=array())
+    public function setOperationBodyStyle(array $operationStyle = array())
     {
         if (!isset($operationStyle['use'])) {
             throw new Exception\InvalidArgumentException("Key 'use' is required in Operation soap:body style.");
@@ -286,7 +301,7 @@ public function setOperationBodyStyle(array $operationStyle=array())
      * @param  array $bindingStyle
      * @return AutoDiscover
      */
-    public function setBindingStyle(array $bindingStyle=array())
+    public function setBindingStyle(array $bindingStyle = array())
     {
         if (isset($bindingStyle['style'])) {
             $this->bindingStyle['style'] = $bindingStyle['style'];
@@ -414,7 +429,10 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
             }
         }
         if ($prototype === null) {
-            throw new Exception\InvalidArgumentException("No prototypes could be found for the '" . $function->getName() . "' function");
+            throw new Exception\InvalidArgumentException(sprintf(
+                'No prototypes could be found for the "%s" function',
+                $function->getName()
+            ));
         }
 
         $functionName = $wsdl->translateType($function->getName());
@@ -443,7 +461,9 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
         } else {
             // RPC style: add each parameter as a typed part
             foreach ($prototype->getParameters() as $param) {
-                $args[$param->getName()] = array('type' => $wsdl->getType($this->discoveryStrategy->getFunctionParameterType($param)));
+                $args[$param->getName()] = array(
+                    'type' => $wsdl->getType($this->discoveryStrategy->getFunctionParameterType($param))
+                );
             }
         }
         $wsdl->addMessage($functionName . 'In', $args);
@@ -470,7 +490,9 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
                 $args['parameters'] = array('element' => $wsdl->addElement($element));
             } elseif ($prototype->getReturnType() != "void") {
                 // RPC style: add the return value as a typed part
-                $args['return'] = array('type' => $wsdl->getType($this->discoveryStrategy->getFunctionReturnType($function, $prototype)));
+                $args['return'] = array(
+                    'type' => $wsdl->getType($this->discoveryStrategy->getFunctionReturnType($function, $prototype))
+                );
             }
             $wsdl->addMessage($functionName . 'Out', $args);
         }

diff --git a/src/Client.php b/src/Client.php
@@ -1068,7 +1068,7 @@ public function getLastSoapOutputHeaderObjects()
      */
     public function __call($name, $arguments)
     {
-        if(!is_array($arguments)) {
+        if (!is_array($arguments)) {
             $arguments = array($arguments);
         }
         $soapClient = $this->getSoapClient();
@@ -1109,7 +1109,10 @@ public function call($method, $params = array())
     public function getFunctions()
     {
         if ($this->getWSDL() == null) {
-            throw new Exception\UnexpectedValueException(__METHOD__ . ' is available only in WSDL mode.');
+            throw new Exception\UnexpectedValueException(sprintf(
+                '%s method is available only in WSDL mode.',
+                __METHOD__
+            ));
         }
 
         $soapClient = $this->getSoapClient();
@@ -1132,7 +1135,10 @@ public function getFunctions()
     public function getTypes()
     {
         if ($this->getWSDL() == null) {
-            throw new Exception\UnexpectedValueException(__METHOD__ . ' method is available only in WSDL mode.');
+            throw new Exception\UnexpectedValueException(sprintf(
+                '%s method is available only in WSDL mode.',
+                __METHOD__
+            ));
         }
 
         $soapClient = $this->getSoapClient();

diff --git a/src/Server.php b/src/Server.php
@@ -529,11 +529,17 @@ public function setClass($class, $namespace = '', $argv = null)
         }
 
         if (!is_string($class)) {
-            throw new Exception\InvalidArgumentException('Invalid class argument (' . gettype($class) . ')');
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Invalid class argument (%s)',
+                gettype($class)
+            ));
         }
 
         if (!class_exists($class)) {
-            throw new Exception\InvalidArgumentException('Class "' . $class . '" does not exist');
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Class "%s" does not exist',
+                $class
+            ));
         }
 
         $this->class = $class;
@@ -557,11 +563,16 @@ public function setClass($class, $namespace = '', $argv = null)
     public function setObject($object)
     {
         if (!is_object($object)) {
-            throw new Exception\InvalidArgumentException('Invalid object argument ('.gettype($object).')');
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Invalid object argument (%s)',
+                gettype($object)
+            ));
         }
 
         if (isset($this->object)) {
-            throw new Exception\InvalidArgumentException('An object has already been registered with this soap server instance');
+            throw new Exception\InvalidArgumentException(
+                'An object has already been registered with this soap server instance'
+            );
         }
 
         $this->object = $object;

diff --git a/src/Server/DocumentLiteralWrapper.php b/src/Server/DocumentLiteralWrapper.php
@@ -128,8 +128,10 @@ protected function _parseArguments($method, $document)
         foreach (get_object_vars($document) as $argName => $argValue) {
             if (!isset($params[$argName])) {
                 throw new UnexpectedValueException(sprintf(
-                    "Received unknown argument %s which is not an argument to %s::%s",
-                    $argName, get_class($this->object), $method
+                    "Received unknown argument %s which is not an argument to %s::%s()",
+                    $argName,
+                    get_class($this->object),
+                    $method
                 ));
             }
             $delegateArgs[$params[$argName]->getPosition()] = $argValue;
@@ -147,7 +149,8 @@ protected function _assertServiceDelegateHasMethod($method)
         if (!$this->reflection->hasMethod($method)) {
             throw new BadMethodCallException(sprintf(
                 "Method %s does not exist on delegate object %s",
-                $method, get_class($this->object)
+                $method,
+                get_class($this->object)
             ));
         }
     }
@@ -157,7 +160,8 @@ protected function _assertOnlyOneArgument($args)
         if (count($args) != 1) {
             throw new UnexpectedValueException(sprintf(
                 "Expecting exactly one argument that is the document/literal wrapper, got %d",
-                count($args)));
+                count($args)
+            ));
         }
     }
 }
diff --git a/src/Wsdl.php b/src/Wsdl.php
@@ -688,7 +688,7 @@ public function addComplexType($type)
     private function _parseElement($element)
     {
         if (!is_array($element)) {
-            throw new Exception\RuntimeException("The 'element' parameter needs to be an associative array.");
+            throw new Exception\RuntimeException('The "element" parameter needs to be an associative array.');
         }
 
         $elementXml = $this->dom->createElement(self::XSD_NS . ':element');

diff --git a/src/Wsdl/ComplexTypeStrategy/Composite.php b/src/Wsdl/ComplexTypeStrategy/Composite.php
@@ -108,9 +108,10 @@ public function getStrategyOfType($type)
             }
 
             if ( !($strategy instanceof ComplexTypeStrategy) ) {
-                throw new Exception\InvalidArgumentException(
-                    "Strategy for Complex Type '$type' is not a valid strategy object."
-                );
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Strategy for Complex Type "%s" is not a valid strategy object.',
+                    $type
+                ));
             }
             $this->typeMap[$type] = $strategy;
         } else {
@@ -141,9 +142,10 @@ public function setContext(Wsdl $context)
     public function addComplexType($type)
     {
         if (!($this->context instanceof Wsdl) ) {
-            throw new Exception\InvalidArgumentException(
-                "Cannot add complex type '$type', no context is set for this composite strategy."
-            );
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Cannot add complex type "%s", no context is set for this composite strategy.',
+                $type
+            ));
         }
 
         $strategy = $this->getStrategyOfType($type);

diff --git a/src/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/src/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -28,7 +28,8 @@ public function addComplexType($type)
         if (!class_exists($type)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Cannot add a complex type %s that is not an object or where '
-              . 'class could not be found in \'DefaultComplexType\' strategy.', $type
+                . 'class could not be found in "DefaultComplexType" strategy.',
+                $type
             ));
         }
 

diff --git a/test/Wsdl/CompositeStrategyTest.php b/test/Wsdl/CompositeStrategyTest.php
@@ -72,7 +72,7 @@ public function testCompositeThrowsExceptionOnInvalidStrategy()
         $strategy = new ComplexTypeStrategy\Composite(array(), 'invalid');
         $strategy->connectTypeToStrategy('Book', 'strategy');
 
-        $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Strategy for Complex Type \'Book\' is not a valid strategy');
+        $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Strategy for Complex Type "Book" is not a valid strategy');
         $book = $strategy->getStrategyOfType('Book');
     }
 
@@ -105,7 +105,7 @@ public function testCompositeRequiresContextForAddingComplexTypesOtherwiseThrows
     {
         $strategy = new ComplexTypeStrategy\Composite();
 
-        $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Cannot add complex type \'Test\'');
+        $this->setExpectedException('Zend\Soap\Exception\InvalidArgumentException', 'Cannot add complex type "Test"');
         $strategy->addComplexType('Test');
     }
 }