Merge branch 'release'

zendframework · Sep 13, 2012 · 8d68789 · 8d68789
2 parents 501223e + c23360e
commit 8d68789
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/Zend/Server/Reflection/AbstractFunction.php b/library/Zend/Server/Reflection/AbstractFunction.php
@@ -268,7 +268,7 @@ protected function _reflect()
             // Get param types and description
             if (preg_match_all('/@param\s+([^\s]+)/m', $docBlock, $matches)) {
                 $paramTypesTmp = $matches[1];
-                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(@|\*\/)/s', $docBlock, $matches)) {
+                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(?=@|\*\/)/s', $docBlock, $matches)) {
                     $paramDesc = $matches[2];
                     foreach ($paramDesc as $key => $value) {
                         $value = preg_replace('/\s?\*\s/m', '', $value);