Merge branch 'hotfix/5.22'

NathanGibbs3 · May 22, 2023 · d4f9f45 · d4f9f45
2 parents 931a81f + e631bd9
commit d4f9f45
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/adodb-perf.inc.php b/adodb-perf.inc.php
@@ -1017,7 +1017,7 @@ function SplitSQL($sql)
      *      <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 @@ function OptimizeTables()
      *      <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 @@ function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
      * 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
@@ -412,7 +412,7 @@ function addData( $attributes ) {
 	 * @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 @@ function addField( $name, $type, $size = NULL, $opts = NULL ) {
 	 * @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
@@ -450,7 +450,7 @@ function addData( $attributes ) {
 	 * @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 @@ function addField( $name, $type, $size = NULL, $opts = NULL ) {
 	 * @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 @@ function _tag_close( $parser, $tag ) {
 	 * 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 @@ function addField( $name ) {
 	 * 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 @@ function addField( $attributes ) {
 	}
 
 	/**
-	 * 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 @@ function saveSQL( $filename = './schema.sql' ) {
 			$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
@@ -199,7 +199,7 @@ function _close()
 	}
 } // 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
@@ -256,7 +256,7 @@ function MetaIndexes ($table, $primary = FALSE, $owner=false)
 
 
 	// 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 @@ function SQLDate($fmt, $col=false)
 	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
@@ -1363,6 +1363,9 @@ function getCharSet()
 		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
@@ -116,7 +116,7 @@ function load_blobvar_from_var($blobVarName, &$varName) {
   $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
@@ -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