diff --git a/docu/docu.php b/docu/docu.php index 7d2b488..38b0e6f 100644 --- a/docu/docu.php +++ b/docu/docu.php @@ -57,13 +57,22 @@ class docu { public static function generate($id){ \LIB\lib_phpdocumentor::php(); $config = \SYSTEM\DOCU\docu::get($id); - return \phpdocumentor::run( $config['inpath'], - $config['outpath'], - $config['cachepath'], - $config['ignore'], - $config['title'], - $config['sourcecode'], - $config['parseprivate']); + $result1 = \phpdocumentor::run( $config['inpath'], + $config['outpath'], + $config['cachepath'], + $config['ignore'], + $config['title'], + $config['sourcecode'], + $config['parseprivate']); + $result2 = \phpdocumentor::run( $config['inpath'], + $config['outpath'], + $config['cachepath'], + $config['ignore'], + $config['title'], + $config['sourcecode'], + $config['parseprivate'], + 'xml'); + return array_merge($result1,$result2); } /** @@ -75,7 +84,7 @@ class docu { public static function generate_md($id){ \LIB\lib_phpdoc_md::php(); $config = \SYSTEM\DOCU\docu::get($id); - \phpdoc_md::run( $config['inpath_md'], - $config['outpath_md']); + return \phpdoc_md::run( $config['inpath_md'], + $config['outpath_md']); } } \ No newline at end of file diff --git a/docu/system b/docu/system index 0058387..e1b78be 160000 --- a/docu/system +++ b/docu/system @@ -1 +1 @@ -Subproject commit 0058387aea643d658746c837ed51284dd25c0f75 +Subproject commit e1b78be9da41b36a94c9161dbdb5763143097663 diff --git a/docu/system_wiki b/docu/system_wiki index 0dd6048..66ca232 160000 --- a/docu/system_wiki +++ b/docu/system_wiki @@ -1 +1 @@ -Subproject commit 0dd604843e8e7d418a27c86197c4bc71815e893b +Subproject commit 66ca23259d649ad34cb887fe527c358cd11685e5 diff --git a/lib/phpdoc_md b/lib/phpdoc_md index 848d577..4391604 160000 --- a/lib/phpdoc_md +++ b/lib/phpdoc_md @@ -1 +1 @@ -Subproject commit 848d57765b8fb9bed5c5ab6746301e8b0439c4ca +Subproject commit 43916041af1fba6205e3b0ca4126a00c60e35de3 diff --git a/lib/phpdocumentor b/lib/phpdocumentor index ef39cf9..56561aa 160000 --- a/lib/phpdocumentor +++ b/lib/phpdocumentor @@ -1 +1 @@ -Subproject commit ef39cf938da5165a38cf01b5ab980d0dbf2c1108 +Subproject commit 56561aa20d45aea2edfae60086fe08e97ad24bb3 diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 50939d6..71794f7 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -51,9 +51,11 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { * @return null Returns null */ public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_generate_md(){ + $result = array(); $packages = \SYSTEM\DOCU\docu::getAll(); foreach($packages as $package){ - \SYSTEM\DOCU\docu::generate_md($package);} + $result[] = \SYSTEM\DOCU\docu::generate_md($package);} + return \SYSTEM\LOG\JsonResult::toString($result); } /**