fixed type/name order

src/Doc/Business/DocBlock.php

@@ -12,15 +12,16 @@ use Exception;
 
 class DocBlock {
 
-    public $docblock,
-        $description = null,
-        $all_params = array();
+    public $docblock;
+    public $description = null;
+    public $all_params = array();
 
     /**
      * Parses a docblock;
      */
-    function __construct($docblock) {
-        if( !is_string($docblock) ) {
+    function __construct($docblock)
+    {
+        if (!is_string($docblock)) {
             throw new Exception("DocBlock expects first parameter to be a string");
         }
 
@@ -45,19 +46,21 @@ class DocBlock {
      * @param string $param_name
      * @return mixed
      */
-    public function __call($param_name, $values = null) {
-        if( $param_name == "description" ) {
+    public function __call($param_name, $values = null)
+    {
+        if ($param_name == "description") {
             return $this->description;
-        }else if( isset($this->all_params[$param_name]) ) {
+        }
+        else if (isset($this->all_params[$param_name])) {
             $params = $this->all_params[$param_name];
 
-            if( count($params) == 1 ) {
+            if (count($params) == 1) {
                 return $params[0];
-            }else {
+            }
+            else {
                 return $params;
             }
         }
-
         return null;
     }
 
@@ -67,42 +70,34 @@ class DocBlock {
      * and the rest in `$this->description`
      */
     private function parse_block() {
-        // split at each line
-        foreach(preg_split("/(\r?\n)/", $this->docblock) as $line){
+        foreach(preg_split("/(\r?\n)/", $this->docblock) as $line) {
 
-            // if starts with an asterisk
-            if( preg_match('/^(?=\s+?\*[^\/])(.+)/', $line, $matches) ) {
+            if (preg_match('/^(?=\s+?\*[^\/])(.+)/', $line, $matches)) {
 
                 $info = $matches[1];
-
-                // remove wrapping whitespace
                 $info = trim($info);
-
-                // remove leading asterisk
                 $info = preg_replace('/^(\*\s+?)/', '', $info);
 
-                // if it doesn't start with an "@" symbol
-                // then add to the description
-                if( $info[0] !== "@" ) {
+                if ($info[0] !== "@") {
                     $this->description .= "\n$info";
-                    continue;
-                }else {
-                    // get the name of the param
-                    if (preg_match('/@param +\\$([^ ]+) +([^ ]+) +(.*)$/', $info, $matches) == 1) {
+                }
+                else if (preg_match('/@param +([^ ]+) +([^ ]+) +(.*)$/', $info, $matches) == 1) {
+                    if ($matches[1][0] == "$") {
                         $param_name = $matches[1];
                         $param_type = $matches[2];
-                        $value = $matches[3];
-
-
-                        // push the param value into place
-                        $this->all_params[$param_name] = [
-                            "name" => $param_name,
-                            "type" => $param_type,
-                            "description" => $value
-                        ];
-
-                        continue;
                     }
+                    else {
+                        $param_name = $matches[2];
+                        $param_type = $matches[1];
+                    }
+                    $value = $matches[3];
+                    $param_name = substr($param_name, 1);
+
+                    $this->all_params[$param_name] = [
+                        "name" => $param_name,
+                        "type" => $param_type,
+                        "description" => $value
+                    ];
                 }
             }
         }