updated lib phpdocumentor, phpdoc_md & docu system, docu system_wiki, small fixes for system\docu & saimod_docu
This commit is contained in:
parent
9fc473ef41
commit
a81e0a3774
@ -57,13 +57,22 @@ class docu {
|
|||||||
public static function generate($id){
|
public static function generate($id){
|
||||||
\LIB\lib_phpdocumentor::php();
|
\LIB\lib_phpdocumentor::php();
|
||||||
$config = \SYSTEM\DOCU\docu::get($id);
|
$config = \SYSTEM\DOCU\docu::get($id);
|
||||||
return \phpdocumentor::run( $config['inpath'],
|
$result1 = \phpdocumentor::run( $config['inpath'],
|
||||||
$config['outpath'],
|
$config['outpath'],
|
||||||
$config['cachepath'],
|
$config['cachepath'],
|
||||||
$config['ignore'],
|
$config['ignore'],
|
||||||
$config['title'],
|
$config['title'],
|
||||||
$config['sourcecode'],
|
$config['sourcecode'],
|
||||||
$config['parseprivate']);
|
$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){
|
public static function generate_md($id){
|
||||||
\LIB\lib_phpdoc_md::php();
|
\LIB\lib_phpdoc_md::php();
|
||||||
$config = \SYSTEM\DOCU\docu::get($id);
|
$config = \SYSTEM\DOCU\docu::get($id);
|
||||||
\phpdoc_md::run( $config['inpath_md'],
|
return \phpdoc_md::run( $config['inpath_md'],
|
||||||
$config['outpath_md']);
|
$config['outpath_md']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 0058387aea643d658746c837ed51284dd25c0f75
|
Subproject commit e1b78be9da41b36a94c9161dbdb5763143097663
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 0dd604843e8e7d418a27c86197c4bc71815e893b
|
Subproject commit 66ca23259d649ad34cb887fe527c358cd11685e5
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 848d57765b8fb9bed5c5ab6746301e8b0439c4ca
|
Subproject commit 43916041af1fba6205e3b0ca4126a00c60e35de3
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit ef39cf938da5165a38cf01b5ab980d0dbf2c1108
|
Subproject commit 56561aa20d45aea2edfae60086fe08e97ad24bb3
|
||||||
@ -51,9 +51,11 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule {
|
|||||||
* @return null Returns null
|
* @return null Returns null
|
||||||
*/
|
*/
|
||||||
public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_generate_md(){
|
public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_generate_md(){
|
||||||
|
$result = array();
|
||||||
$packages = \SYSTEM\DOCU\docu::getAll();
|
$packages = \SYSTEM\DOCU\docu::getAll();
|
||||||
foreach($packages as $package){
|
foreach($packages as $package){
|
||||||
\SYSTEM\DOCU\docu::generate_md($package);}
|
$result[] = \SYSTEM\DOCU\docu::generate_md($package);}
|
||||||
|
return \SYSTEM\LOG\JsonResult::toString($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user