@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | * Restore data from a (compressed) csv file |
| 497 | 497 | * |
| 498 | 498 | * @param resource $f file opened with fopen for reading |
| 499 | - * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert |
|
| 499 | + * @param integer $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert |
|
| 500 | 500 | * @returns int number of rows read from csv file |
| 501 | 501 | */ |
| 502 | 502 | function db_restore($f, $insert_n_rows=10) |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | /** |
| 1045 | 1045 | * Backup all schemas in the form of a setup/tables_current.inc.php file |
| 1046 | 1046 | * |
| 1047 | - * @param resource|boolean $f |
|
| 1047 | + * @param resource $f |
|
| 1048 | 1048 | */ |
| 1049 | 1049 | function schema_backup($f=False) |
| 1050 | 1050 | { |
@@ -1089,6 +1089,7 @@ discard block |
||
| 1089 | 1089 | * Dump an array as php source |
| 1090 | 1090 | * |
| 1091 | 1091 | * copied from etemplate/inc/class.db_tools.inc.php |
| 1092 | + * @param integer $depth |
|
| 1092 | 1093 | */ |
| 1093 | 1094 | private static function write_array($arr,$depth,$parent='') |
| 1094 | 1095 | { |
@@ -94,10 +94,10 @@ |
||
| 94 | 94 | /** |
| 95 | 95 | * Constructor |
| 96 | 96 | * |
| 97 | - * @param Traversable $rs |
|
| 97 | + * @param \Traversable $rs |
|
| 98 | 98 | * @param callback $callback |
| 99 | 99 | * @param array $params =array() additional parameters, row is always first parameter |
| 100 | - * @param $key_callback =null optional callback, if you want different keys |
|
| 100 | + * @param \Closure $key_callback =null optional callback, if you want different keys |
|
| 101 | 101 | */ |
| 102 | 102 | public function __construct(\Traversable $rs, $callback, $params=array(), $key_callback=null) |
| 103 | 103 | { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * @deprecated not used anymore as it costs to much performance, use transactions if needed |
| 186 | 186 | * @param string $table name of table to lock |
| 187 | 187 | * @param string $mode type of lock required (optional), default write |
| 188 | - * @return bool True if sucessful, False if fails |
|
| 188 | + * @return boolean|null True if sucessful, False if fails |
|
| 189 | 189 | */ |
| 190 | 190 | function lock($table, $mode='write') |
| 191 | 191 | { |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * Unlock a table |
| 197 | 197 | * |
| 198 | 198 | * @deprecated not used anymore as it costs to much performance, use transactions if needed |
| 199 | - * @return bool True if sucessful, False if fails |
|
| 199 | + * @return boolean|null True if sucessful, False if fails |
|
| 200 | 200 | */ |
| 201 | 201 | function unlock() |
| 202 | 202 | {} |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * Constructor of schema-processor |
| 97 | 97 | * |
| 98 | 98 | * @param string $dbms type of the database: 'mysql','pgsql','mssql','maxdb' |
| 99 | - * @param Db $db =null database class, if null we use $GLOBALS['egw']->db |
|
| 99 | + * @param $db =null database class, if null we use $GLOBALS['egw']->db |
|
| 100 | 100 | * @return schema_proc |
| 101 | 101 | */ |
| 102 | 102 | function __construct($dbms=False, Api\Db $db=null) |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | * |
| 397 | 397 | * @param string $sTableName |
| 398 | 398 | * @param bool $preserveValue |
| 399 | - * @return boolean|string sequence-name or false |
|
| 399 | + * @return false|string sequence-name or false |
|
| 400 | 400 | */ |
| 401 | 401 | function _PostgresHasOldSequence($sTableName,$preserveValue=False) |
| 402 | 402 | { |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | /** |
| 423 | 423 | * Check if we have an old, not automaticaly droped sequence and drop it |
| 424 | 424 | * |
| 425 | - * @param $sTableName |
|
| 425 | + * @param string $sTableName |
|
| 426 | 426 | */ |
| 427 | 427 | function _PostgresTestDropOldSequence($sTableName) |
| 428 | 428 | { |
@@ -877,12 +877,7 @@ discard block |
||
| 877 | 877 | /** |
| 878 | 878 | * Execute a query |
| 879 | 879 | * |
| 880 | - * @param string $Query_String the query to be executed |
|
| 881 | - * @param mixed $line the line method was called from - use __LINE__ |
|
| 882 | - * @param string $file the file method was called from - use __FILE__ |
|
| 883 | - * @param int $offset row to start from |
|
| 884 | - * @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] |
|
| 885 | - * @return ADORecordSet or false, if the query fails |
|
| 880 | + * @param integer $line |
|
| 886 | 881 | */ |
| 887 | 882 | function query($sQuery, $line='', $file='') |
| 888 | 883 | { |
@@ -898,8 +893,6 @@ discard block |
||
| 898 | 893 | * if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence) |
| 899 | 894 | * @param int $line line-number to pass to query |
| 900 | 895 | * @param string $file file-name to pass to query |
| 901 | - * @param string $app=false string with name of app, this need to be set in setup anyway!!! |
|
| 902 | - * @return ADORecordSet or false, if the query fails |
|
| 903 | 896 | */ |
| 904 | 897 | function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false) |
| 905 | 898 | { |
@@ -910,7 +903,6 @@ discard block |
||
| 910 | 903 | * Execute the Sql statements in an array and give diagnostics, if any error occures |
| 911 | 904 | * |
| 912 | 905 | * @param array $aSql array of SQL strings to execute |
| 913 | - * @param int $debug_level for which debug_level (and higher) should the diagnostics always been printed |
|
| 914 | 906 | * @param string $debug variable number of arguments for the debug_message functions in case of an error |
| 915 | 907 | * @return int 2: no error, 1: errors, but continued, 0: errors aborted |
| 916 | 908 | */ |
@@ -953,7 +945,7 @@ discard block |
||
| 953 | 945 | * b) we use the table-names plus all column-names and remove dublicate parts |
| 954 | 946 | * |
| 955 | 947 | * @internal |
| 956 | - * @param $sTableName string name of the table |
|
| 948 | + * @param string $sTableName string name of the table |
|
| 957 | 949 | * @param $aColumnNames array of column-names or string with a single column-name |
| 958 | 950 | * @return string the index-name |
| 959 | 951 | */ |
@@ -1010,6 +1002,7 @@ discard block |
||
| 1010 | 1002 | |
| 1011 | 1003 | /** |
| 1012 | 1004 | * Giving a non-fatal error-message |
| 1005 | + * @param string $str |
|
| 1013 | 1006 | */ |
| 1014 | 1007 | function error($str) |
| 1015 | 1008 | { |
@@ -1038,7 +1031,7 @@ discard block |
||
| 1038 | 1031 | * |
| 1039 | 1032 | * The parameters get formated depending on their type. |
| 1040 | 1033 | * |
| 1041 | - * @param $msg string message with parameters/variables like lang(), eg. '%1' |
|
| 1034 | + * @param string $msg string message with parameters/variables like lang(), eg. '%1' |
|
| 1042 | 1035 | * @param $backtrace include a function-backtrace, default True=On |
| 1043 | 1036 | * should only be set to False=Off, if your code ensures a call with backtrace=On was made before !!! |
| 1044 | 1037 | * @param $param mixed a variable number of parameters, to be inserted in $msg |
@@ -543,7 +543,7 @@ |
||
| 543 | 543 | * |
| 544 | 544 | * @param string $name cell-name |
| 545 | 545 | * @param string $attr attribute-name |
| 546 | - * @param mixed $val if not NULL sets attribute else returns it |
|
| 546 | + * @param boolean|string $val if not NULL sets attribute else returns it |
|
| 547 | 547 | * @return reference to attribute |
| 548 | 548 | * @deprecated use setElementAttribute($name, $attr, $val) |
| 549 | 549 | */ |
@@ -155,7 +155,7 @@ |
||
| 155 | 155 | * |
| 156 | 156 | * @param string|XMLReader $xml |
| 157 | 157 | * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object |
| 158 | - * @return Template current object or clone, if any attribute was set |
|
| 158 | + * @return Widget current object or clone, if any attribute was set |
|
| 159 | 159 | */ |
| 160 | 160 | public function set_attrs($xml, $cloned=true) |
| 161 | 161 | { |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' |
| 43 | 43 | * @param array $content |
| 44 | 44 | * @param array &$validated=array() validated content |
| 45 | - * @return boolean true if no validation error, false otherwise |
|
| 45 | + * @return boolean|null true if no validation error, false otherwise |
|
| 46 | 46 | */ |
| 47 | 47 | public function validate($cname, array $expand, array $content, &$validated=array()) |
| 48 | 48 | { |
@@ -101,7 +101,6 @@ discard block |
||
| 101 | 101 | /** |
| 102 | 102 | * Put date in the proper format for sending to client |
| 103 | 103 | * @param string|int $value |
| 104 | - * @param string $format |
|
| 105 | 104 | */ |
| 106 | 105 | public function format_date($value) |
| 107 | 106 | { |
@@ -139,7 +138,7 @@ discard block |
||
| 139 | 138 | * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' |
| 140 | 139 | * @param array $content |
| 141 | 140 | * @param array &$validated=array() validated content |
| 142 | - * @return boolean true if no validation error, false otherwise |
|
| 141 | + * @return boolean|null true if no validation error, false otherwise |
|
| 143 | 142 | */ |
| 144 | 143 | public function validate($cname, array $expand, array $content, &$validated=array()) |
| 145 | 144 | { |
@@ -102,7 +102,6 @@ |
||
| 102 | 102 | * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' |
| 103 | 103 | * @param array $content |
| 104 | 104 | * @param array &$validated=array() validated content |
| 105 | - * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont' |
|
| 106 | 105 | */ |
| 107 | 106 | public function validate($cname, array $expand, array $content, &$validated=array()) |
| 108 | 107 | { |