digitick · merijnvdk · Dec 19, 2017
diff --git a/classes/BaseWsdlWriter.php b/classes/BaseWsdlWriter.php
@@ -154,16 +154,21 @@ private function addType(WsdlType &$wsdlType)
         $wsdlSequence = $this->createElement("sequence");
 
         // Create WSDL Elements
+        /* @var $elements WsdlProperty[] */
         $elements     = $wsdlType->getElements();
         foreach ($elements as &$element) {
+            /* @var $element WsdlProperty */
             $wsdlElement = $this->createElement("element");
             $wsdlElement->setAttribute("name", $element->name);
             if (WsdlType::isPrimitiveType($element->type)) {
                 $wsdlElement->setAttribute("type", "xsd:" . $element->type);
             } else {
                 $wsdlElement->setAttribute("type", "tns:" . $element->type);
             }
-
+            if($element->usage && $element->usage=='optional'){
+              $wsdlElement->setAttribute("minOccurs", "0");
+            }
+
             // Add WSDL Element to the Sequence
             $wsdlSequence->appendChild($wsdlElement);
         }
@@ -268,8 +273,8 @@ private function addBindingOperation($operation)
         $binding  = $this->getBinding();
 
         $definition    = $this->getDefinitionName();
-        $soapAction    = "urn:{$definition}#{$definition}Server#{$operation->name}";
-
+        $soapAction    = $this->getWsdlDefinition()->getNameSpace()."{$operation->name}";
+        
         // Create a new WSDL Operation
         $wsdlOperation = $this->createElement("operation");
         $wsdlOperation->setAttribute("name", $operation->name);
@@ -583,9 +588,12 @@ public function getDefinitionName()
      */
     public function getClassName()
     {
-        $className = $this->getWsdlDefinition()->getClassFileName();
-        $className = basename($className, ".inc");
-        $className = basename($className, ".php");
+        $className = $this->getWsdlDefinition()->getClassName();
+        if(!$className){
+          $className = $this->getWsdlDefinition()->getClassFileName();
+          $className = basename($className, ".inc");
+          $className = basename($className, ".php");
+        }
 
         return $className;
     }

diff --git a/classes/DocBlockParser.php b/classes/DocBlockParser.php
@@ -22,11 +22,11 @@ class DocBlockParser
 
     private static $docBlockTags = array(
                 "@param" => array(
-                                "regex"   => "|@param\s+([a-zA-Z0-9\[\]]+)\s+\\\$([a-zA-Z0-9]+)\s+(.*)|",
-                                "matches" => array("type", "name", "desc")
+                                "regex"   => "#@param\s+([_a-zA-Z0-9\[\]]+)\s+\\\$([_a-zA-Z0-9]+)(\=null|)\s+(.*)#",
+                                "matches" => array("type", "name", "optional", "desc")
                                 ),
                 "@return" => array(
-                                "regex"   => "|@return\s+([a-zA-Z0-9\[\]]+)\s+(.*)|",
+                                "regex"   => "|@return\s+([_a-zA-Z0-9\[\]]+)\s+(.*)|",
                                 "matches" => array("type", "desc")
                                 ),
                 "@author" => array(
@@ -37,27 +37,40 @@ class DocBlockParser
                                 "regex"   => "|@internal\s+(.*)|",
                                 "matches" => array("usage")
                                 ),
+                "@var" => array(
+                                "regex"   => "|@var\s+([_a-zA-Z0-9\[\]]+)\s+(.*)|",
+                                "matches" => array("type", "desc")
+                                )
                 );
 
     /**
      * Get the Type and Description Information for a Property
      *
-     * @param string $name The name of the Property
-     * @param string $className the name file which contains
-     *                the Class that the property is defined
+     * @param ReflectionProperty $property  The reflected property
      */
     public static function getPropertyInfo(ReflectionProperty $property)
     {
         $info        = array();
         $commentLine = $property->getDocComment();
 
         if (strlen($commentLine)) {
-            if (preg_match("|/\*\*\s+@var\s+([a-zA-Z0-9\[\]]+)([^(\*/)]*)\*/|", $commentLine, $matches)) {
-                $info['type'] = $matches[1];
-                if (isset($matches[2])) {
-                    $info['desc'] = $matches[2];
+            // parse docblock
+            $taginfoarr=self::getTagInfo($commentLine);
+            $info=array();
+            // flatten the parsed data
+            foreach($taginfoarr as $taginfo){
+              foreach($taginfo as $tag => $tagdata){
+                foreach($tagdata as $key => $value){
+                  if($value){
+                    // trim value because it can contain newlines etc
+                    $info[$key]=trim($value);
+                  }
                 }
-                return $info;
+              }
+            }
+            // if we found the type, return
+            if(isset($info['type'])){
+              return $info;
             }
         }
         return null;
@@ -72,7 +85,7 @@ public static function getPropertyInfo(ReflectionProperty $property)
     public static function getDescription($doc)
     {
         $tagRegex = self::getTagRegex();
-        $lines    = split("\n", self::stripCommentChars($doc));
+        $lines    = explode("\n", self::stripCommentChars($doc));
         $desc     = "";
 
         foreach ($lines as $line) {
@@ -101,8 +114,8 @@ public static function getTagInfo($doc)
         $currentTag   = null;
 
         // Do a Line at a time
-        $lines = split("\n", self::stripCommentChars($doc));
-
+        $lines = explode("\n", self::stripCommentChars($doc));
+        
         for ($i = 0, $c = count($lines); $i < $c; $i++) {
 
             // Loop through the Doc Tag list and Find Matches
@@ -156,7 +169,7 @@ public static function getTagInfo($doc)
     private static function stripCommentChars($doc)
     {
         $out = "";
-        $lines = split("\n", $doc);
+        $lines = explode("\n", $doc);
         foreach ($lines as $line) {
             $line = preg_replace("|^\s*/\**|", "", $line);
             $line = preg_replace("|^\s*\**|",  "", $line);

diff --git a/classes/WsdlDefinition.php b/classes/WsdlDefinition.php
@@ -26,7 +26,10 @@ class WsdlDefinition
     /** @var string */
     private $classFileName;
 
+    /** @var string */
+    private $className;
 
+
     /** @var string */
     private $wsdlFileName;
 
@@ -46,8 +49,10 @@ class WsdlDefinition
     /** @var string */
     private $baseUrl;
 
-
-
+    /** @var string[] */
+    private $typeMapping = array();
+
+
     /**
      * Get the value of classFileName
      *
@@ -58,6 +63,26 @@ public function getClassFileName()
         return $this->classFileName;
     }
 
+    /**
+     * Set the value of className
+     *
+     * @param string $className The value of className
+     */
+    public function setClassName($className)  
+    {
+        $this->className = $className;
+    }
+
+    /**
+     * Get the value of className
+     *
+     * @return string The value of className
+     */
+    public function getClassName()  
+    {
+        return $this->className;
+    }
+
     /**
      * Set the value of classFileName
      *
@@ -174,4 +199,25 @@ public function setBaseUrl($baseUrl)
         $this->baseUrl = $baseUrl;
     }
 
+
+    /**
+     * Get the value of typeMapping
+     *
+     * @return string[] The typeMapping as assoc array
+     */
+    public function getTypeMapping()  
+    {
+        return $this->typeMapping;
+    }
+
+    /**
+     * Set the value of typeMapping
+     *
+     * @param string[] $mapping The value of typeMapping
+     */
+    public function setTypeMapping($mapping)  
+    {
+        $this->typeMapping = $mapping;
+    }
+
 }
diff --git a/classes/WsdlMethod.php b/classes/WsdlMethod.php
@@ -10,6 +10,7 @@
  */
 
 require_once("WsdlPart.php");
+require_once("WsdlType.php");
 
 /**
  * WSDL Generator for PHP5
@@ -25,6 +26,8 @@ class WsdlMethod
     private $desc        = null;
     private $header      = false;
     private $reqHeaders  = array();
+
+    private $typeMapping = array();
 
     private $params      = array();
     private $returnType  = null;
@@ -60,6 +63,16 @@ public function setDesc($desc)
         $this->desc = $desc;
     }
 
+    /**
+     * Set the Description of the Method
+     *
+     * @param string[] $mapping Assoc array with type mapping old => new
+     */
+    public function setTypeMappings($mapping)
+    {
+        $this->typeMapping = $mapping;
+    }
+
     /**
      * Set whether the Method represents a SOAP Body or Header element
      *
@@ -122,7 +135,17 @@ public function resolveHeaders($wsdlMethods)
     public function addParameter($varType, $varName, $varDesc)
     {
         $param = new StdClass();
-
+        if (WsdlType::isArrayTypeClass($varType)) {
+          $varTypeCheck = WsdlType::stripArrayNotation($varType);
+          if(array_key_exists($varTypeCheck,$this->typeMapping)){
+            $varType = $this->typeMapping[$varTypeCheck].'[]';
+          }
+        }else{
+          if(array_key_exists($varType,$this->typeMapping)){
+            $varType = $this->typeMapping[$varType];
+          }
+        }
+
         $param->type = $varType;
         $param->name = $varName;
         $param->desc = $varDesc;
@@ -138,6 +161,17 @@ public function addParameter($varType, $varName, $varDesc)
      */
     public function setReturn($varType, $varDesc)
     {
+        if (WsdlType::isArrayTypeClass($varType)) {
+          $varTypeCheck = WsdlType::stripArrayNotation($varType);
+          if(array_key_exists($varTypeCheck,$this->typeMapping)){
+            $varType = $this->typeMapping[$varTypeCheck].'[]';
+          }
+        }else{
+          if(array_key_exists($varType,$this->typeMapping)){
+            $varType = $this->typeMapping[$varType];
+          }
+        }
+
         $this->returnType = $varType;
         $this->returnDesc = $varDesc;
     }

diff --git a/classes/WsdlProperty.php b/classes/WsdlProperty.php
@@ -23,6 +23,7 @@ class WsdlProperty
     public $type               = null;
     public $name               = null;
     public $description        = null;
+    public $usage              = null;
 
 
     public function setName($name)
@@ -45,4 +46,9 @@ public function setDesc($desc)
         $this->description = $desc;
     }
 
+    public function setUsage($usage)
+    {
+        $this->usage = $usage;
+    }
+
 }