Skip to content

ensure php 8.3-8.5 compatibility #3

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
falkenhawk merged 1 commit into from
Apr 1, 2026
Merged

ensure php 8.3-8.5 compatibility #3

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"
experimental: [false]

env:
Expand Down
6 changes: 5 additions & 1 deletion PHPUnit/Extensions/Database/DB/DataSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $
* @param PHPUnit_Extensions_Database_DataSet_ITableMetaData $tableMetaData
* @return unknown
*/
public static function buildTableSelect(PHPUnit_Extensions_Database_DataSet_ITableMetaData $tableMetaData, PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection = NULL)
public static function buildTableSelect(PHPUnit_Extensions_Database_DataSet_ITableMetaData $tableMetaData, $databaseConnection = NULL)
{
if ($databaseConnection !== NULL && !$databaseConnection instanceof PHPUnit_Extensions_Database_DB_IDatabaseConnection) {
throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'PHPUnit_Extensions_Database_DB_IDatabaseConnection');
}

if ($tableMetaData->getTableName() == '') {
$e = new Exception("Empty Table Name");
echo $e->getTraceAsString();
Expand Down
6 changes: 5 additions & 1 deletion PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,12 @@ public function getSchema()
* @return PHPUnit_Extensions_Database_DataSet_IDataSet
* @todo Implement the filtered data set.
*/
public function createDataSet(array $tableNames = NULL)
public function createDataSet($tableNames = NULL)
{
if ($tableNames !== NULL && !is_array($tableNames)) {
throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'array');
}

if (empty($tableNames)) {
return new PHPUnit_Extensions_Database_DB_DataSet($this);
} else {
Expand Down
2 changes: 1 addition & 1 deletion PHPUnit/Extensions/Database/DB/IDatabaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function close();
* @param array $tableNames
* @return PHPUnit_Extensions_Database_DataSet_IDataSet
*/
public function createDataSet(Array $tableNames = NULL);
public function createDataSet($tableNames = NULL);

/**
* Creates a table with the result of the specified SQL statement.
Expand Down
4 changes: 2 additions & 2 deletions PHPUnit/Extensions/Database/UI/Context.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public function getMode()
*/
public function setModeArguments(array $arguments)
{
$this->mode_arguments = $arguments;
$this->modeArguments = $arguments;
}

/**
* @return array
*/
public function getModeArguments()
{
return $this->mode_arguments;
return $this->modeArguments;
}
}

Loading