1 files changed, 16 insertions, 5 deletions
diff --git a/inc/confutils.php b/inc/confutils.php
index e3d2bf994..47ee68969 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -202,6 +202,11 @@ function getSchemes() {
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Gina Haeussge <gina@foosel.net>
+ *
+ * @param array $lines
+ * @param bool $lower
+ *
+ * @return array
  */
 function linesToHash($lines, $lower=false) {
     $conf = array();
@@ -235,6 +240,11 @@ function linesToHash($lines, $lower=false) {
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Gina Haeussge <gina@foosel.net>
+ *
+ * @param string $file
+ * @param bool $lower
+ *
+ * @return array
  */
 function confToHash($file,$lower=false) {
     $conf = array();
@@ -249,15 +259,16 @@ function confToHash($file,$lower=false) {
  *
  * @author Chris Smith <chris@jalakai.co.uk>
  *
- * @param  string   $type     the configuration settings to be read, must correspond to a key/array in $config_cascade
- * @param  callback $fn       the function used to process the configuration file into an array
- * @param  array    $params   optional additional params to pass to the callback
- * @param  callback $combine  the function used to combine arrays of values read from different configuration files;
+ * @param  string $type the configuration settings to be read, must correspond to a key/array in $config_cascade
+ * @param  callback $fn the function used to process the configuration file into an array
+ * @param  array $params optional additional params to pass to the callback
+ * @param callable|string $combine the function used to combine arrays of values read from different configuration files;
  *                            the function takes two parameters,
  *                               $combined - the already read & merged configuration values
  *                               $new - array of config values from the config cascade file being currently processed
  *                            and returns an array of the merged configuration values.
- * @return array    configuration values
+ *
+ * @return array configuration values
  */
 function retrieveConfig($type,$fn,$params=null,$combine='array_merge') {
     global $config_cascade;