Merged in feature/314-dev-dev01 (pull request #24)

auto-patch  314-dev-dev01-2024-01-25T04_09_02

* auto-patch  314-dev-dev01-2024-01-25T04_09_02
This commit is contained in:
Tony Volpe
2024-01-25 04:11:47 +00:00
parent 6b67473553
commit 68dbe860e9
540 changed files with 3445 additions and 2131 deletions

View File

@@ -45,6 +45,13 @@ class WPSEO_Database_Proxy {
*/
protected $database;
/**
* Holds the table prefix.
*
* @var string
*/
protected $table_prefix;
/**
* Sets the class attributes and registers the table.
*
@@ -120,7 +127,7 @@ class WPSEO_Database_Proxy {
*
* @return false|int False when the upsert request is invalid, int on number of rows changed.
*/
public function upsert( array $data, array $where = null, $format = null, $where_format = null ) {
public function upsert( array $data, ?array $where = null, $format = null, $where_format = null ) {
if ( $where_format !== null ) {
_deprecated_argument( __METHOD__, '7.7.0', 'The where_format argument is deprecated' );
}
@@ -226,6 +233,8 @@ class WPSEO_Database_Proxy {
/**
* Executed before a query will be ran.
*
* @return void
*/
protected function pre_execution() {
if ( $this->suppress_errors ) {
@@ -235,6 +244,8 @@ class WPSEO_Database_Proxy {
/**
* Executed after a query has been ran.
*
* @return void
*/
protected function post_execution() {
if ( $this->suppress_errors ) {