[4.x] Upmerge 2025-11-09#355

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

Closed
richard67 wants to merge 5 commits into from
Closed

[4.x] Upmerge 2025-11-09 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d23f8a
Remove escape when not with string
kamil-tekiela Oct 18, 2025
2a9ecd6
Merge pull request #353 from kamil-tekiela/escape-and-quoteName
HLeithner Oct 19, 2025
e56b182
Fix MysqliStatement to work with named params (#351)
kamil-tekiela Oct 26, 2025
a567e9b
[3.x] Add mysqli exception mode (#349)
kamil-tekiela Nov 9, 2025
fda1e01
Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09
richard67 Nov 9, 2025
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
45 changes: 44 additions & 1 deletion Tests/Mysqli/MysqliPreparedStatementTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
)
);
}

$insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
$mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
$mysqliStatementObject->execute([
':title' => 'Test Title',
':description' => 'Test Description',
':start_date' => '2023-01-01',
]);
}

/**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
$statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
$mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
$dummyValue = 'test';
$dummyValue2 = 'test';
$mysqliStatementObject->bindParam(':search', $dummyValue);
$mysqliStatementObject->bindParam(':search2', $dummyValue);

$mysqliStatementObject->execute();
}

/**
* Regression test to ensure running queries with bound variables still works
*/
public function testPreparedStatementWithBinding()
{
$statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
$mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
$title = 'Test Title';
$mysqliStatementObject->bindParam(':search', $title);
$mysqliStatementObject->execute();
$result = $mysqliStatementObject->fetchColumn();

$title = 'changed';
$mysqliStatementObject->execute();
$result2 = $mysqliStatementObject->fetchColumn();
$this->assertNotEquals($result, $result2);
}

/**
* Regression test to ensure running queries with bound variables still works
*/
public function testPreparedStatementWithoutBinding()
{
$statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
$mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
$title = 'Test Title';
$params = [':search' => $title];
$mysqliStatementObject->execute($params);
$result = $mysqliStatementObject->fetchColumn();

$params[':search'] = 'changed';
$mysqliStatementObject->execute($params);
$result2 = $mysqliStatementObject->fetchColumn();
$this->assertNotEquals($result, $result2);
}
}
102 changes: 56 additions & 46 deletions src/Mysqli/MysqliDriver.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
throw new UnsupportedAdapterException('The MySQLi extension is not available');
}

$this->connection = mysqli_init();
// Enable mysqli error reporting
mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

$this->connection = new \mysqli();

$connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
);
}

// Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
$connected = @$this->connection->real_connect(
$this->options['host'],
$this->options['user'],
$this->options['password'],
null,
$this->options['port'],
$this->options['socket'],
$connectionFlags
);

if (!$connected) {
try {
$this->connection->real_connect(
$this->options['host'],
$this->options['user'],
$this->options['password'],
null,
$this->options['port'],
$this->options['socket'],
$connectionFlags
);
} catch (\mysqli_sql_exception $e) {
throw new ConnectionFailureException(
'Could not connect to database: ' . $this->connection->connect_error,
$this->connection->connect_errno
'Could not connect to database: ' . $e->getMessage(),
$e->getCode(),
$e
);
}

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

foreach ($tables as $table) {
// Set the query to get the table CREATE statement.
$row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
$row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

// Populate the result array based on the create statements.
$result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
$result = [];

// Set the query to get the table fields statement.
$fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
$fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

// If we only want the type as the value add just that to the list.
if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
return false;
}

if (!$this->connection->select_db($database)) {
throw new ConnectionFailureException('Could not connect to database.');
try {
$this->connection->select_db($database);
} catch (\mysqli_sql_exception $e) {
throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
}

return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
// Which charset should I use, plain utf8 or multibyte utf8mb4?
$charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

$result = @$this->connection->set_charset($charset);

/*
* If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
* server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
* can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
* undefined in this case we catch the error and determine that utf8mb4 is not supported!
*/
if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
$this->utf8mb4 = false;
$result = @$this->connection->set_charset('utf8');
try {
$this->connection->set_charset($charset);
} catch (\mysqli_sql_exception) {
/*
* If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
* server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
* can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
* undefined in this case we catch the error and determine that utf8mb4 is not supported!
*/
if ($this->utf8mb4 && $this->options['utf8mb4']) {
$this->utf8mb4 = false;
try {
$this->connection->set_charset('utf8');
} catch (\mysqli_sql_exception) {
return false;
}
}
}

return $result;
return true;
}

/**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
if (!$toSavepoint || $this->transactionDepth <= 1) {
$this->connect();

if ($this->connection->commit()) {
try {
$this->connection->commit();
$this->transactionDepth = 0;
} catch (\mysqli_sql_exception) {
// TODO: Handle commit failure?
}

return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
if (!$toSavepoint || $this->transactionDepth <= 1) {
$this->connect();

if ($this->connection->rollback()) {
try {
$this->connection->rollback();
$this->transactionDepth = 0;
} catch (\mysqli_sql_exception) {
// TODO: Handle rollback failure?
}

return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
{
$this->connect();

$cursor = $this->connection->query($sql);

// If an error occurred handle it.
if (!$cursor) {
$errorNum = (int) $this->connection->errno;
$errorMsg = (string) $this->connection->error;
try {
$this->connection->query($sql);
} catch (\mysqli_sql_exception $e) {
$errorNum = $e->getCode();
$errorMsg = $e->getMessage();

// Check if the server was disconnected.
if (!$this->connected()) {
try {
// Attempt to reconnect.
$this->connection = null;
$this->connect();
} catch (ConnectionFailureException $e) {
} catch (ConnectionFailureException) {
// If connect fails, ignore that exception and throw the normal exception.
throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
}
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
}

$this->freeResult();

if ($cursor instanceof \mysqli_result) {
$cursor->free_result();
}

return true;
}

Expand Down
43 changes: 23 additions & 20 deletions src/Mysqli/MysqliStatement.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

$query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
$this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
}
}

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

if (!empty($this->parameterKeyMapping)) {
foreach ($values as $key => &$value) {
$params[$this->parameterKeyMapping[$key]] =& $value;
$paramKey = $this->parameterKeyMapping[$key];
foreach ($paramKey as $currentKey) {
$params[$currentKey] =& $value;
}
}

ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

array_unshift($params, implode('', $types));

if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
try {
\call_user_func_array([$this->statement, 'bind_param'], $params);
} catch (\Exception $e) {
throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
}
} elseif ($parameters !== null) {
if (!$this->bindValues($parameters)) {
throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
try {
$this->bindValues($parameters);
} catch (\Exception $e) {
throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
}
}

try {
if (!$this->statement->execute()) {
throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
}
$this->statement->execute();
} catch (\Throwable $e) {
throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
}
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
$refs[$key] =& $value;
}

if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
throw new \RuntimeException($this->statement->error, $this->statement->errno);
}
\call_user_func_array([$this->statement, 'bind_result'], $refs);
}

$this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
return false;
}

if ($values === false) {
throw new \RuntimeException($this->statement->error, $this->statement->errno);
}

switch ($fetchStyle) {
case FetchMode::NUMERIC:
return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
*/
private function fetchData()
{
$return = $this->statement->fetch();
try {
$return = $this->statement->fetch();
} catch (\Throwable $e) {
throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
}

if ($return === true) {
$values = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[4.x] Upmerge 2025-11-09#355

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

 Closed

richard67
wants to merge
5
commits into

from

 Closed


[4.x] Upmerge 2025-11-09
#355
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4d23f8a

Remove escape when not with string


kamil-tekiela Oct 18, 2025
2a9ecd6

Merge pull request #353 from kamil-tekiela/escape-and-quoteName


HLeithner Oct 19, 2025
e56b182

Fix MysqliStatement to work with named params (#351)


kamil-tekiela Oct 26, 2025
a567e9b

[3.x] Add mysqli exception mode (#349)


kamil-tekiela Nov 9, 2025
fda1e01

Merge branch '3.x-dev' into 4.x-dev-upmerge-2025-11-09


richard67 Nov 9, 2025

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


45 changes: 44 additions & 1 deletion
Tests/Mysqli/MysqliPreparedStatementTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,14 @@ protected function setUp(): void
 )
 );
 }

 $insertQuery = 'INSERT INTO dbtest (title, description, start_date) VALUES (:title, :description, :start_date)';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $insertQuery);
 $mysqliStatementObject->execute([
 ':title' => 'Test Title',
 ':description' => 'Test Description',
 ':start_date' => '2023-01-01',
 ]);
 }

 /**
Expand DownExpand Up@@ -148,10 +156,45 @@ public function testPreparedStatementWithSingleKey()
 $statement = 'SELECT * FROM dbtest WHERE `title` LIKE :search OR `description` LIKE :search2';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $dummyValue = 'test';
 $dummyValue2 = 'test';
 $mysqliStatementObject->bindParam(':search', $dummyValue);
 $mysqliStatementObject->bindParam(':search2', $dummyValue);

 $mysqliStatementObject->execute();
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $mysqliStatementObject->bindParam(':search', $title);
 $mysqliStatementObject->execute();
 $result = $mysqliStatementObject->fetchColumn();

 $title = 'changed';
 $mysqliStatementObject->execute();
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }

 /**
 * Regression test to ensure running queries with bound variables still works
 */
 public function testPreparedStatementWithoutBinding()
 {
 $statement = 'SELECT id FROM dbtest WHERE `title` LIKE :search';
 $mysqliStatementObject = new MysqliStatement(static::$connection->getConnection(), $statement);
 $title = 'Test Title';
 $params = [':search' => $title];
 $mysqliStatementObject->execute($params);
 $result = $mysqliStatementObject->fetchColumn();

 $params[':search'] = 'changed';
 $mysqliStatementObject->execute($params);
 $result2 = $mysqliStatementObject->fetchColumn();
 $this->assertNotEquals($result, $result2);
 }
}

102 changes: 56 additions & 46 deletions
src/Mysqli/MysqliDriver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,7 +202,10 @@ public function connect()
 throw new UnsupportedAdapterException('The MySQLi extension is not available');
 }

 $this->connection = mysqli_init();
 // Enable mysqli error reporting
 mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

 $this->connection = new \mysqli();

 $connectionFlags = 0;

Expand DownExpand Up@@ -232,21 +235,21 @@ public function connect()
 );
 }

 // Attempt to connect to the server, use error suppression to silence warnings and allow us to throw an Exception separately.
 $connected = @$this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );

 if (!$connected) {
 try {
 $this->connection->real_connect(
 $this->options['host'],
 $this->options['user'],
 $this->options['password'],
 null,
 $this->options['port'],
 $this->options['socket'],
 $connectionFlags
 );
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException(
 'Could not connect to database: ' . $this->connection->connect_error,
 $this->connection->connect_errno
 'Could not connect to database: ' . $e->getMessage(),
 $e->getCode(),
 $e
 );
 }

Expand DownExpand Up@@ -509,7 +512,7 @@ public function getTableCreate($tables)

 foreach ($tables as $table) {
 // Set the query to get the table CREATE statement.
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($this->escape($table)))->loadRow();
 $row = $this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table))->loadRow();

 // Populate the result array based on the create statements.
 $result[$table] = $row[1];
Expand All@@ -536,7 +539,7 @@ public function getTableColumns($table, $typeOnly = true)
 $result = [];

 // Set the query to get the table fields statement.
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)))->loadObjectList();
 $fields = $this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table))->loadObjectList();

 // If we only want the type as the value add just that to the list.
 if ($typeOnly) {
Expand DownExpand Up@@ -783,8 +786,10 @@ public function select($database)
 return false;
 }

 if (!$this->connection->select_db($database)) {
 throw new ConnectionFailureException('Could not connect to database.');
 try {
 $this->connection->select_db($database);
 } catch (\mysqli_sql_exception $e) {
 throw new ConnectionFailureException('Could not connect to database: ' . $e->getMessage(), $e->getCode(), $e);
 }

 return true;
Expand All@@ -810,20 +815,26 @@ public function setUtf()
 // Which charset should I use, plain utf8 or multibyte utf8mb4?
 $charset = $this->utf8mb4 && $this->options['utf8mb4'] ? 'utf8mb4' : 'utf8';

 $result = @$this->connection->set_charset($charset);

 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if (!$result && $this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 $result = @$this->connection->set_charset('utf8');
 try {
 $this->connection->set_charset($charset);
 } catch (\mysqli_sql_exception) {
 /*
 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise. This happens on old MySQL
 * server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd masks the server version and reports only its own we
 * can not be sure if the server actually does support UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is
 * undefined in this case we catch the error and determine that utf8mb4 is not supported!
 */
 if ($this->utf8mb4 && $this->options['utf8mb4']) {
 $this->utf8mb4 = false;
 try {
 $this->connection->set_charset('utf8');
 } catch (\mysqli_sql_exception) {
 return false;
 }
 }
 }

 return $result;
 return true;
 }

 /**
Expand All@@ -841,8 +852,11 @@ public function transactionCommit($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->commit()) {
 try {
 $this->connection->commit();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle commit failure?
 }

 return;
Expand All@@ -866,8 +880,11 @@ public function transactionRollback($toSavepoint = false)
 if (!$toSavepoint || $this->transactionDepth <= 1) {
 $this->connect();

 if ($this->connection->rollback()) {
 try {
 $this->connection->rollback();
 $this->transactionDepth = 0;
 } catch (\mysqli_sql_exception) {
 // TODO: Handle rollback failure?
 }

 return;
Expand DownExpand Up@@ -922,20 +939,19 @@ protected function executeUnpreparedQuery($sql)
 {
 $this->connect();

 $cursor = $this->connection->query($sql);

 // If an error occurred handle it.
 if (!$cursor) {
 $errorNum = (int) $this->connection->errno;
 $errorMsg = (string) $this->connection->error;
 try {
 $this->connection->query($sql);
 } catch (\mysqli_sql_exception $e) {
 $errorNum = $e->getCode();
 $errorMsg = $e->getMessage();

 // Check if the server was disconnected.
 if (!$this->connected()) {
 try {
 // Attempt to reconnect.
 $this->connection = null;
 $this->connect();
 } catch (ConnectionFailureException $e) {
 } catch (ConnectionFailureException) {
 // If connect fails, ignore that exception and throw the normal exception.
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }
Expand All@@ -948,12 +964,6 @@ protected function executeUnpreparedQuery($sql)
 throw new ExecutionFailureException($sql, $errorMsg, $errorNum);
 }

 $this->freeResult();

 if ($cursor instanceof \mysqli_result) {
 $cursor->free_result();
 }

 return true;
 }

Expand Down

43 changes: 23 additions & 20 deletions
src/Mysqli/MysqliStatement.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,10 +135,10 @@ public function __construct(\mysqli $connection, string $query)

 $query = $this->prepareParameterKeyMapping($query);

$this->statement = $connection->prepare($query);

if (!$this->statement) {
 throw new PrepareStatementFailureException($this->connection->error, $this->connection->errno);
try {
 $this->statement = $connection->prepare($query);
} catch (\mysqli_sql_exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

Expand DownExpand Up@@ -306,7 +306,10 @@ private function bindValues(array $values)

 if (!empty($this->parameterKeyMapping)) {
 foreach ($values as $key => &$value) {
 $params[$this->parameterKeyMapping[$key]] =& $value;
 $paramKey = $this->parameterKeyMapping[$key];
 foreach ($paramKey as $currentKey) {
 $params[$currentKey] =& $value;
 }
 }

 ksort($params);
Expand DownExpand Up@@ -394,19 +397,21 @@ public function execute(?array $parameters = null)

 array_unshift($params, implode('', $types));

 if (!\call_user_func_array([$this->statement, 'bind_param'], $params)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 \call_user_func_array([$this->statement, 'bind_param'], $params);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 } elseif ($parameters !== null) {
 if (!$this->bindValues($parameters)) {
 throw new PrepareStatementFailureException($this->statement->error, $this->statement->errno);
 try {
 $this->bindValues($parameters);
 } catch (\Exception $e) {
 throw new PrepareStatementFailureException($e->getMessage(), $e->getCode(), $e);
 }
 }

 try {
 if (!$this->statement->execute()) {
 throw new ExecutionFailureException($this->query, $this->statement->error, $this->statement->errno);
 }
 $this->statement->execute();
 } catch (\Throwable $e) {
 throw new ExecutionFailureException($this->query, $e->getMessage(), $e->getCode(), $e);
 }
Expand DownExpand Up@@ -439,9 +444,7 @@ public function execute(?array $parameters = null)
 $refs[$key] =& $value;
 }

 if (!\call_user_func_array([$this->statement, 'bind_result'], $refs)) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }
 \call_user_func_array([$this->statement, 'bind_result'], $refs);
 }

 $this->result = true;
Expand DownExpand Up@@ -485,10 +488,6 @@ public function fetch(?int $fetchStyle = null, int $cursorOrientation = FetchOri
 return false;
 }

 if ($values === false) {
 throw new \RuntimeException($this->statement->error, $this->statement->errno);
 }

 switch ($fetchStyle) {
 case FetchMode::NUMERIC:
 return $values;
Expand DownExpand Up@@ -540,7 +539,11 @@ public function fetchColumn($columnIndex = 0)
 */
 private function fetchData()
 {
 $return = $this->statement->fetch();
 try {
 $return = $this->statement->fetch();
 } catch (\Throwable $e) {
 throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }

 if ($return === true) {
 $values = [];
Expand Down
Loading