@@ -86,8 +86,6 @@ |
||
86 | 86 | * Here we need to handle any incoming data. Setup is done in the constructor, |
87 | 87 | * output is handled by parent. |
88 | 88 | * |
89 | - * @param type $id |
|
90 | - * @param etemplate_new $etemplate |
|
91 | 89 | */ |
92 | 90 | public static function process($content = array()) |
93 | 91 | { |
@@ -129,6 +129,8 @@ discard block |
||
129 | 129 | |
130 | 130 | /** |
131 | 131 | Accepts $src and $dest arrays, replacing string $data |
132 | + * @param string[] $src |
|
133 | + * @param string[] $dest |
|
132 | 134 | */ |
133 | 135 | function ADODB_str_replace($src, $dest, $data) |
134 | 136 | { |
@@ -432,6 +434,12 @@ discard block |
||
432 | 434 | return $ret; |
433 | 435 | } |
434 | 436 | |
437 | + /** |
|
438 | + * @param string $argHostname |
|
439 | + * @param string $argUsername |
|
440 | + * @param string $argPassword |
|
441 | + * @param string $argDatabaseName |
|
442 | + */ |
|
435 | 443 | function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName) |
436 | 444 | { |
437 | 445 | return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName); |
@@ -540,6 +548,7 @@ discard block |
||
540 | 548 | |
541 | 549 | /** |
542 | 550 | * PEAR DB Compat |
551 | + * @param string $s |
|
543 | 552 | */ |
544 | 553 | function Quote($s) |
545 | 554 | { |
@@ -926,7 +935,7 @@ discard block |
||
926 | 935 | * GenID is only available if $this->hasGenID = true; |
927 | 936 | * |
928 | 937 | * @param seqname name of sequence to use |
929 | - * @param startID if sequence does not exist, start at this ID |
|
938 | + * @param startID integer sequence does not exist, start at this ID |
|
930 | 939 | * @return 0 if not supported, otherwise a sequence id |
931 | 940 | */ |
932 | 941 | function GenID($seqname='adodbseq',$startID=1) |
@@ -1008,7 +1017,7 @@ discard block |
||
1008 | 1017 | |
1009 | 1018 | |
1010 | 1019 | /** |
1011 | - * @return the last error message |
|
1020 | + * @return string last error message |
|
1012 | 1021 | */ |
1013 | 1022 | function ErrorMsg() |
1014 | 1023 | { |
@@ -1018,7 +1027,7 @@ discard block |
||
1018 | 1027 | |
1019 | 1028 | |
1020 | 1029 | /** |
1021 | - * @return the last error number. Normally 0 means no error. |
|
1030 | + * @return integer last error number. Normally 0 means no error. |
|
1022 | 1031 | */ |
1023 | 1032 | function ErrorNo() |
1024 | 1033 | { |
@@ -1069,7 +1078,7 @@ discard block |
||
1069 | 1078 | * Choose a database to connect to. Many databases do not support this. |
1070 | 1079 | * |
1071 | 1080 | * @param dbName is the name of the database to select |
1072 | - * @return true or false |
|
1081 | + * @return boolean or false |
|
1073 | 1082 | */ |
1074 | 1083 | function SelectDB($dbName) |
1075 | 1084 | {return false;} |
@@ -1542,6 +1551,8 @@ discard block |
||
1542 | 1551 | * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). |
1543 | 1552 | * Assuming that we can have 50,000 files per directory with good performance, |
1544 | 1553 | * then we can scale to 12.8 million unique cached recordsets. Wow! |
1554 | + * @param string $sql |
|
1555 | + * @param boolean $createdir |
|
1545 | 1556 | */ |
1546 | 1557 | function _gencachename($sql,$createdir) |
1547 | 1558 | { |
@@ -1913,7 +1924,7 @@ discard block |
||
1913 | 1924 | /** |
1914 | 1925 | * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans(). |
1915 | 1926 | * |
1916 | - * @return true if succeeded or false if database does not support transactions |
|
1927 | + * @return boolean if succeeded or false if database does not support transactions |
|
1917 | 1928 | */ |
1918 | 1929 | function BeginTrans() {return false;} |
1919 | 1930 | |
@@ -2082,7 +2093,7 @@ discard block |
||
2082 | 2093 | * @param table table name to query |
2083 | 2094 | * @param primary true to only show primary keys. Not actually used for most databases |
2084 | 2095 | * |
2085 | - * @return array of indexes on current table. Each element represents an index, and is itself an associative array. |
|
2096 | + * @return boolean of indexes on current table. Each element represents an index, and is itself an associative array. |
|
2086 | 2097 | |
2087 | 2098 | Array ( |
2088 | 2099 | [name_of_index] => Array |
@@ -2132,7 +2143,7 @@ discard block |
||
2132 | 2143 | * |
2133 | 2144 | * Usage: $db->Concat($str1,$str2); |
2134 | 2145 | * |
2135 | - * @return concatenated string |
|
2146 | + * @return string string |
|
2136 | 2147 | */ |
2137 | 2148 | function Concat() |
2138 | 2149 | { |
@@ -2146,7 +2157,7 @@ discard block |
||
2146 | 2157 | * |
2147 | 2158 | * @param d a date in Unix date time format. |
2148 | 2159 | * |
2149 | - * @return date string in database date format |
|
2160 | + * @return string string in database date format |
|
2150 | 2161 | */ |
2151 | 2162 | function DBDate($d) |
2152 | 2163 | { |
@@ -2167,7 +2178,7 @@ discard block |
||
2167 | 2178 | * |
2168 | 2179 | * @param ts a timestamp in Unix date time format. |
2169 | 2180 | * |
2170 | - * @return timestamp string in database timestamp format |
|
2181 | + * @return string string in database timestamp format |
|
2171 | 2182 | */ |
2172 | 2183 | function DBTimeStamp($ts) |
2173 | 2184 | { |
@@ -2538,7 +2549,7 @@ discard block |
||
2538 | 2549 | & @param [compareFields0] when we have 2 cols in recordset, we compare the defstr with |
2539 | 2550 | * column 0 (1st col) if this is true. This is not documented. |
2540 | 2551 | * |
2541 | - * @return HTML |
|
2552 | + * @return string |
|
2542 | 2553 | * |
2543 | 2554 | * changes by [email protected] to support multiple hilited items |
2544 | 2555 | */ |
@@ -2618,7 +2629,7 @@ discard block |
||
2618 | 2629 | * return recordset as a 2-dimensional array. |
2619 | 2630 | * Helper function for ADOConnection->SelectLimit() |
2620 | 2631 | * |
2621 | - * @param offset is the row to start calculations from (1-based) |
|
2632 | + * @param offset integer the row to start calculations from (1-based) |
|
2622 | 2633 | * @param [nrows] is the number of rows to return |
2623 | 2634 | * |
2624 | 2635 | * @return an array indexed by the rows (0-based) from the recordset |
@@ -2871,7 +2882,7 @@ discard block |
||
2871 | 2882 | /** |
2872 | 2883 | * Move to the first row in the recordset. Many databases do NOT support this. |
2873 | 2884 | * |
2874 | - * @return true or false |
|
2885 | + * @return boolean or false |
|
2875 | 2886 | */ |
2876 | 2887 | function MoveFirst() |
2877 | 2888 | { |
@@ -2883,7 +2894,7 @@ discard block |
||
2883 | 2894 | /** |
2884 | 2895 | * Move to the last row in the recordset. |
2885 | 2896 | * |
2886 | - * @return true or false |
|
2897 | + * @return boolean or false |
|
2887 | 2898 | */ |
2888 | 2899 | function MoveLast() |
2889 | 2900 | { |
@@ -2902,7 +2913,7 @@ discard block |
||
2902 | 2913 | /** |
2903 | 2914 | * Move to next record in the recordset. |
2904 | 2915 | * |
2905 | - * @return true if there still rows available, or false if there are no more rows (EOF). |
|
2916 | + * @return boolean if there still rows available, or false if there are no more rows (EOF). |
|
2906 | 2917 | */ |
2907 | 2918 | function MoveNext() |
2908 | 2919 | { |
@@ -2926,9 +2937,9 @@ discard block |
||
2926 | 2937 | * Random access to a specific row in the recordset. Some databases do not support |
2927 | 2938 | * access to previous rows in the databases (no scrolling backwards). |
2928 | 2939 | * |
2929 | - * @param rowNumber is the row to move to (0-based) |
|
2940 | + * @param rowNumber integer the row to move to (0-based) |
|
2930 | 2941 | * |
2931 | - * @return true if there still rows available, or false if there are no more rows (EOF). |
|
2942 | + * @return boolean if there still rows available, or false if there are no more rows (EOF). |
|
2932 | 2943 | */ |
2933 | 2944 | function Move($rowNumber = 0) |
2934 | 2945 | { |
@@ -3024,7 +3035,7 @@ discard block |
||
3024 | 3035 | /** |
3025 | 3036 | * Clean up recordset |
3026 | 3037 | * |
3027 | - * @return true or false |
|
3038 | + * @return null|boolean or false |
|
3028 | 3039 | */ |
3029 | 3040 | function Close() |
3030 | 3041 | { |
@@ -3041,7 +3052,7 @@ discard block |
||
3041 | 3052 | /** |
3042 | 3053 | * synonyms RecordCount and RowCount |
3043 | 3054 | * |
3044 | - * @return the number of rows or -1 if this is not supported |
|
3055 | + * @return integer number of rows or -1 if this is not supported |
|
3045 | 3056 | */ |
3046 | 3057 | function RecordCount() {return $this->_numOfRows;} |
3047 | 3058 | |
@@ -3058,7 +3069,7 @@ discard block |
||
3058 | 3069 | /** |
3059 | 3070 | * synonyms RecordCount and RowCount |
3060 | 3071 | * |
3061 | - * @return the number of rows or -1 if this is not supported |
|
3072 | + * @return integer number of rows or -1 if this is not supported |
|
3062 | 3073 | */ |
3063 | 3074 | function RowCount() {return $this->_numOfRows;} |
3064 | 3075 | |
@@ -3086,19 +3097,19 @@ discard block |
||
3086 | 3097 | } |
3087 | 3098 | |
3088 | 3099 | /** |
3089 | - * @return the current row in the recordset. If at EOF, will return the last row. 0-based. |
|
3100 | + * @return integer current row in the recordset. If at EOF, will return the last row. 0-based. |
|
3090 | 3101 | */ |
3091 | 3102 | function CurrentRow() {return $this->_currentRow;} |
3092 | 3103 | |
3093 | 3104 | /** |
3094 | 3105 | * synonym for CurrentRow -- for ADO compat |
3095 | 3106 | * |
3096 | - * @return the current row in the recordset. If at EOF, will return the last row. 0-based. |
|
3107 | + * @return integer current row in the recordset. If at EOF, will return the last row. 0-based. |
|
3097 | 3108 | */ |
3098 | 3109 | function AbsolutePosition() {return $this->_currentRow;} |
3099 | 3110 | |
3100 | 3111 | /** |
3101 | - * @return the number of columns in the recordset. Some databases will set this to 0 |
|
3112 | + * @return integer number of columns in the recordset. Some databases will set this to 0 |
|
3102 | 3113 | * if no records are returned, others will return the number of columns in the query. |
3103 | 3114 | */ |
3104 | 3115 | function FieldCount() {return $this->_numOfFields;} |
@@ -3107,7 +3118,7 @@ discard block |
||
3107 | 3118 | /** |
3108 | 3119 | * Get the ADOFieldObject of a specific column. |
3109 | 3120 | * |
3110 | - * @param fieldoffset is the column position to access(0-based). |
|
3121 | + * @param fieldoffset integer the column position to access(0-based). |
|
3111 | 3122 | * |
3112 | 3123 | * @return the ADOFieldObject for that column, or false. |
3113 | 3124 | */ |
@@ -3217,7 +3228,7 @@ discard block |
||
3217 | 3228 | * type to our standardised version which uses 1 character codes: |
3218 | 3229 | * |
3219 | 3230 | * @param t is the type passed in. Normally is ADOFieldObject->type. |
3220 | - * @param len is the maximum length of that field. This is because we treat character |
|
3231 | + * @param len integer the maximum length of that field. This is because we treat character |
|
3221 | 3232 | * fields bigger than a certain size as a 'B' (blob). |
3222 | 3233 | * @param fieldobj is the field object returned by the database driver. Can hold |
3223 | 3234 | * additional info (eg. primary_key for mysql). |
@@ -3409,7 +3420,8 @@ discard block |
||
3409 | 3420 | * PDO compatibility function: fetch the next row |
3410 | 3421 | * |
3411 | 3422 | * @param $fetchmode=null ADODB_FETCH_{DEFAULT|ASSOC|NUM|BOTH}, default is to use currently selected fetch-mode |
3412 | - * @return array|boolean false if there's nothing to fetch |
|
3423 | + * @param integer $fetchmode |
|
3424 | + * @return boolean false if there's nothing to fetch |
|
3413 | 3425 | */ |
3414 | 3426 | function &fetch($fetchmode=null) |
3415 | 3427 | { |
@@ -3429,7 +3441,7 @@ discard block |
||
3429 | 3441 | /** |
3430 | 3442 | * PDO compatibility function: fetch the n-th column of the next row |
3431 | 3443 | * |
3432 | - * @param int $column_number=0 |
|
3444 | + * @param int $column_number |
|
3433 | 3445 | * @return string|boolean false if there's nothing to fetch |
3434 | 3446 | */ |
3435 | 3447 | function fetchColumn($column_number=0) |
@@ -3828,6 +3840,10 @@ discard block |
||
3828 | 3840 | |
3829 | 3841 | |
3830 | 3842 | // $perf == true means called by NewPerfMonitor(), otherwise for data dictionary |
3843 | + |
|
3844 | + /** |
|
3845 | + * @return string |
|
3846 | + */ |
|
3831 | 3847 | function _adodb_getdriver($provider,$drivername,$perf=false) |
3832 | 3848 | { |
3833 | 3849 | switch ($provider) { |