Skip to content

fix the field type of phpdoc comment #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2022
Merged

fix the field type of phpdoc comment #975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions MysqliDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @author Alexander V. Butenko <[email protected]>
* @copyright Copyright (c) 2010-2017
* @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
* @link http://github.com/joshcam/PHP-MySQLi-Database-Class
* @link http://github.com/joshcam/PHP-MySQLi-Database-Class
* @version 2.9.3
*/

Expand Down Expand Up @@ -243,7 +243,7 @@ class MysqliDb
* @var string the name of a default (main) mysqli connection
*/
public $defConnectionName = 'default';

public $autoReconnect = true;
protected $autoReconnectCount = 0;

Expand Down Expand Up @@ -306,7 +306,7 @@ public function connect($connectionName = 'default')
{
if(!isset($this->connectionsSettings[$connectionName]))
throw new Exception('Connection profile not set');

$pro = $this->connectionsSettings[$connectionName];
$params = array_values($pro);
$charset = array_pop($params);
Expand Down Expand Up @@ -724,10 +724,10 @@ public function withTotalCount()
/**
* A convenient SELECT * function.
*
* @param string $tableName The name of the database table to work with.
* @param int|array $numRows Array to define SQL limit in format Array ($offset, $count)
* or only $count
* @param string $columns Desired columns
* @param string $tableName The name of the database table to work with.
* @param int|array $numRows Array to define SQL limit in format Array ($offset, $count)
* or only $count
* @param string|array $columns Desired columns
*
* @return array|MysqliDb Contains the returned rows from the select query.
* @throws Exception
Expand Down Expand Up @@ -766,8 +766,8 @@ public function get($tableName, $numRows = null, $columns = '*')
/**
* A convenient SELECT * function to get one record.
*
* @param string $tableName The name of the database table to work with.
* @param string $columns Desired columns
* @param string $tableName The name of the database table to work with.
* @param string|array $columns Desired columns
*
* @return array Contains the returned rows from the select query.
* @throws Exception
Expand Down Expand Up @@ -2464,8 +2464,8 @@ protected function _buildJoin () {
else
$joinStr = $joinTable;

$this->_query .= " " . $joinType. " JOIN " . $joinStr .
(false !== stripos($joinCondition, 'using') ? " " : " on ")
$this->_query .= " " . $joinType. " JOIN " . $joinStr .
(false !== stripos($joinCondition, 'using') ? " " : " on ")
. $joinCondition;

// Add join and query
Expand Down