Skip to content

Commit

Permalink
Merge branch 'release-3.0' into db_schema
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
  • Loading branch information
jdarwood007 committed Feb 26, 2024
2 parents f4573f9 + 80a2587 commit 01430b9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Sources/Db/APIs/MySQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ public function connect_errno(): int
/**
* {@inheritDoc}
*/
public function backup_table(string $table, string $backup_table): object
public function backup_table(string $table, string $backup_table): object|bool
{
$table = str_replace('{db_prefix}', $this->prefix, $table);

Expand Down
2 changes: 1 addition & 1 deletion Sources/Db/APIs/PostgreSQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ public function connect_errno(): int
/**
* {@inheritDoc}
*/
public function backup_table(string $table, string $backup_table): object
public function backup_table(string $table, string $backup_table): object|bool
{
$table = str_replace('{db_prefix}', $this->prefix, $table);

Expand Down
4 changes: 2 additions & 2 deletions Sources/Db/DatabaseApiInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ public function connect_errno(): int;
*
* @param string $table The name of the table to backup
* @param string $backup_table The name of the backup table for this table
* @return resource -the request handle to the table creation query
* @return resource|false -the request handle to the table creation query, false if it failed.
*/
public function backup_table(string $table, string $backup_table): object;
public function backup_table(string $table, string $backup_table): object|bool;

/**
* This function optimizes a table.
Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageManager/FtpConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class FtpConnection
/**
* Create a new FTP connection...
*
* @param string $ftp_server The server to connect to
* @param ?string $ftp_server The server to connect to
* @param int $ftp_port The port to connect to
* @param string $ftp_user The username
* @param string $ftp_pass The password
Expand Down
17 changes: 9 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 01430b9

Please sign in to comment.