diff options
| -rw-r--r-- | adodb-perf.inc.php | 6 | ||||
| -rw-r--r-- | adodb-xmlschema.inc.php | 4 | ||||
| -rw-r--r-- | adodb-xmlschema03.inc.php | 16 | ||||
| -rw-r--r-- | drivers/adodb-csv.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-ibase.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-mysqli.inc.php | 3 | ||||
| -rw-r--r-- | drivers/adodb-sqlanywhere.inc.php | 2 | ||||
| -rw-r--r-- | perf/perf-oci8.inc.php | 2 |
8 files changed, 21 insertions, 18 deletions
diff --git a/adodb-perf.inc.php b/adodb-perf.inc.php index b8804dff..91610536 100644 --- a/adodb-perf.inc.php +++ b/adodb-perf.inc.php @@ -1017,7 +1017,7 @@ Committed_AS: 348732 kB * <code>ADODB_OPT_LOW</code> for CPU-less optimization * Default is LOW <code>ADODB_OPT_LOW</code> * @author Markus Staab - * @return Returns <code>true</code> on success and <code>false</code> on error + * @return bool true on success, false on error */ function OptimizeTables() { @@ -1048,7 +1048,7 @@ Committed_AS: 348732 kB * <code>ADODB_OPT_LOW</code> for CPU-less optimization * Default is LOW <code>ADODB_OPT_LOW</code> * @author Markus Staab - * @return Returns <code>true</code> on success and <code>false</code> on error + * @return bool true on success, false on error */ function OptimizeTable( $table, $mode = ADODB_OPT_LOW) { @@ -1062,7 +1062,7 @@ Committed_AS: 348732 kB * optimize each using <code>optmizeTable()</code> * * @author Markus Staab - * @return Returns <code>true</code> on success and <code>false</code> on error + * @return bool true on success, false on error */ function optimizeDatabase() { diff --git a/adodb-xmlschema.inc.php b/adodb-xmlschema.inc.php index ac13d34e..662e2aae 100644 --- a/adodb-xmlschema.inc.php +++ b/adodb-xmlschema.inc.php @@ -412,7 +412,7 @@ class dbTable extends dbObject { * @param string $type ADODB datadict field type. * @param string $size Field size * @param array $opts Field options array - * @return array Field specifier array + * @return void */ function addField( $name, $type, $size = NULL, $opts = NULL ) { $field_id = $this->FieldID( $name ); @@ -446,7 +446,7 @@ class dbTable extends dbObject { * @param string $field Field name * @param string $opt ADOdb field option * @param mixed $value Field option value - * @return array Field specifier array + * @return void */ function addFieldOpt( $field, $opt, $value = NULL ) { if( !isset( $value ) ) { diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php index 83a0a788..3c8bce5d 100644 --- a/adodb-xmlschema03.inc.php +++ b/adodb-xmlschema03.inc.php @@ -450,7 +450,7 @@ class dbTable extends dbObject { * @param string $type ADODB datadict field type. * @param string $size Field size * @param array $opts Field options array - * @return array Field specifier array + * @return void */ function addField( $name, $type, $size = NULL, $opts = NULL ) { $field_id = $this->fieldID( $name ); @@ -486,7 +486,7 @@ class dbTable extends dbObject { * @param string $field Field name * @param string $opt ADOdb field option * @param mixed $value Field option value - * @return array Field specifier array + * @return void */ function addFieldOpt( $field, $opt, $value = NULL ) { if( $this->currentPlatform ) { @@ -766,7 +766,7 @@ class dbIndex extends dbObject { * Adds a field to the index * * @param string $name Field name - * @return string Field list + * @return string[] Field list */ function addField( $name ) { $this->columns[$this->fieldID( $name )] = $name; @@ -779,7 +779,7 @@ class dbIndex extends dbObject { * Adds options to the index * * @param string $opt Comma-separated list of index options. - * @return string Option list + * @return string[] Option list */ function addIndexOpt( $opt ) { $this->opts[] = $opt; @@ -929,10 +929,10 @@ class dbData extends dbObject { } /** - * Adds options to the index + * Adds data. * - * @param string $opt Comma-separated list of index options. - * @return string Option list + * @param string $cdata Data to add + * @return void */ function addData( $cdata ) { // check we're in a valid field @@ -1782,7 +1782,7 @@ class adoSchema { $sqlArray = $this->sqlArray; } if( !isset( $sqlArray ) ) { - return FALSE; + return false; } $fp = fopen( $filename, "w" ); diff --git a/drivers/adodb-csv.inc.php b/drivers/adodb-csv.inc.php index 8a59626e..e6694d9a 100644 --- a/drivers/adodb-csv.inc.php +++ b/drivers/adodb-csv.inc.php @@ -199,7 +199,7 @@ class ADODB_csv extends ADOConnection { } } // class -class ADORecordset_csv extends ADORecordset { +class ADORecordset_csv extends ADORecordSet { function _close() { diff --git a/drivers/adodb-ibase.inc.php b/drivers/adodb-ibase.inc.php index 69adfa68..8d48f17d 100644 --- a/drivers/adodb-ibase.inc.php +++ b/drivers/adodb-ibase.inc.php @@ -256,7 +256,7 @@ class ADODB_ibase extends ADOConnection { // See http://community.borland.com/article/0,1410,25844,00.html - function RowLock($tables,$where,$col=false) + function rowLock($table, $where, $col = false) { if ($this->autoCommit) { $this->BeginTrans(); @@ -734,7 +734,7 @@ class ADODB_ibase extends ADOConnection { Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordset_ibase extends ADORecordSet +class ADORecordSet_ibase extends ADORecordSet { var $databaseType = "ibase"; diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php index 5fc50eef..62c28949 100644 --- a/drivers/adodb-mysqli.inc.php +++ b/drivers/adodb-mysqli.inc.php @@ -1363,6 +1363,9 @@ class ADODB_mysqli extends ADOConnection { return $this->charSet ?: false; } + /** + * @deprecated 5.21.0 Use {@see setConnectionParameter()} instead + */ function setCharSet($charset) { if (!$this->_connectionID || !method_exists($this->_connectionID,'set_charset')) { diff --git a/drivers/adodb-sqlanywhere.inc.php b/drivers/adodb-sqlanywhere.inc.php index 88897af9..8d909fde 100644 --- a/drivers/adodb-sqlanywhere.inc.php +++ b/drivers/adodb-sqlanywhere.inc.php @@ -116,7 +116,7 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){ $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); */ - function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB') + function updateBlob($table, $column, $val, $where, $blobtype = 'BLOB') { $blobVarName = 'hold_blob'; $this->create_blobvar($blobVarName); diff --git a/perf/perf-oci8.inc.php b/perf/perf-oci8.inc.php index c11b261f..345d8929 100644 --- a/perf/perf-oci8.inc.php +++ b/perf/perf-oci8.inc.php @@ -23,7 +23,7 @@ if (!defined('ADODB_DIR')) die(); -class perf_oci8 extends ADODB_perf{ +class perf_oci8 extends adodb_perf{ var $noShowIxora = 15; // if the sql for suspicious sql is taking too long, then disable ixora |
