Skip to content

Commit 780c1c1

Browse files
TheTechsTechTheTechsTech
authored
Merge pull request #228 from dannetstudio:fix/php84-implicit-nullable-deprecations
Fix PHP 8.4 implicit nullable parameter deprecations
2 parents e98292e + 385165f commit 780c1c1

14 files changed

+108
-108
lines changed

‎lib/Config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class Config extends ConfigAbstract implements ConfigInterface
1212
{
13-
public function __construct(string $driver = '', array $arguments = null)
13+
public function __construct(string $driver = '', ?array $arguments = null)
1414
{
1515
$sql = \strtolower($driver);
1616
if (!\array_key_exists($sql, \VENDOR) || empty($arguments)) {
@@ -31,7 +31,7 @@ public function __construct(string $driver = '', array $arguments = null)
3131
}
3232
}
3333

34-
public static function initialize(string $driver = '', array $arguments = null)
34+
public static function initialize(string $driver = '', ?array $arguments = null)
3535
{
3636
return new self($driver, $arguments);
3737
}

‎lib/ConfigInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ interface ConfigInterface
9999
* for: **sqlite3** - (`filePath`, `database`)
100100
* - `filePath` // The path to open an SQLite database
101101
*/
102-
public static function initialize(string $driver = '', array $arguments = null);
102+
public static function initialize(string $driver = '', ?array $arguments = null);
103103
}

‎lib/Database/ez_mysqli.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ez_mysqli extends ezsqlModel implements DatabaseInterface
3535
private $database;
3636
protected $shortcutUsed = false;
3737

38-
public function __construct(ConfigInterface $settings = null)
38+
public function __construct(?ConfigInterface $settings = null)
3939
{
4040
if (empty($settings)) {
4141
throw new Exception(\MISSING_CONFIGURATION);
@@ -278,7 +278,7 @@ private function fetch_prepared_result(&$stmt, $query)
278278
* @param array $param
279279
* @return bool|\mysqli_result
280280
*/
281-
public function query_prepared(string $query, array $param = null)
281+
public function query_prepared(string $query, ?array $param = null)
282282
{
283283
$stmt = $this->dbh->prepare($query);
284284
if (!$stmt instanceof \mysqli_stmt) {

‎lib/Database/ez_pdo.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ez_pdo extends ezsqlModel implements DatabaseInterface
3535
*/
3636
private $database;
3737

38-
public function __construct(ConfigInterface $settings = null)
38+
public function __construct(?ConfigInterface $settings = null)
3939
{
4040
if (empty($settings)) {
4141
throw new Exception(\MISSING_CONFIGURATION);
@@ -235,7 +235,7 @@ public function catch_error()
235235
* @param boolean $isSelect - return \PDOStatement, if SELECT SQL statement, otherwise int
236236
* @return bool|int|\PDOStatement
237237
*/
238-
public function query_prepared(string $query, array $param = null, $isSelect = false)
238+
public function query_prepared(string $query, ?array $param = null, $isSelect = false)
239239
{
240240
$stmt = $this->dbh->prepare($query);
241241
$result = false;
@@ -349,7 +349,7 @@ private function processResult(string $query, $result = null, bool $isSelect = f
349349
* @param array $param
350350
* @return bool|void
351351
*/
352-
private function processQuery(string $query, array $param = null)
352+
private function processQuery(string $query, ?array $param = null)
353353
{
354354
// Query was an insert, delete, update, replace
355355
if (\preg_match("/^(insert|delete|update|replace|drop|create)\s+/i", $query)) {

‎lib/Database/ez_pgsql.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ez_pgsql extends ezsqlModel implements DatabaseInterface
3535
*/
3636
private $database;
3737

38-
public function __construct(ConfigInterface $settings = null)
38+
public function __construct(?ConfigInterface $settings = null)
3939
{
4040
if (empty($settings)) {
4141
throw new Exception(\MISSING_CONFIGURATION);
@@ -143,7 +143,7 @@ public function sysDate()
143143
* @param array $param
144144
* @return bool|mixed
145145
*/
146-
public function query_prepared(string $query, array $param = null)
146+
public function query_prepared(string $query, ?array $param = null)
147147
{
148148
$result = @\pg_query_params($this->dbh, $query, $param);
149149
return ($this->shortcutUsed) ? $result : $this->processQueryResult($query, $result);

‎lib/Database/ez_sqlite3.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ez_sqlite3 extends ezsqlModel implements DatabaseInterface
3939
* Constructor - allow the user to perform a quick connect at the
4040
* same time as initializing the ez_sqlite3 class
4141
*/
42-
public function __construct(ConfigInterface $settings = null)
42+
public function __construct(?ConfigInterface $settings = null)
4343
{
4444
if (empty($settings)) {
4545
throw new Exception(\MISSING_CONFIGURATION);
@@ -142,7 +142,7 @@ public function getArgType($arg)
142142
* @param array $param
143143
* @return bool \SQLite3Result
144144
*/
145-
public function query_prepared(string $query, array $param = null)
145+
public function query_prepared(string $query, ?array $param = null)
146146
{
147147
$stmt = $this->dbh->prepare($query);
148148
if (!$stmt instanceof \SQLite3Stmt) {

‎lib/Database/ez_sqlsrv.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ez_sqlsrv extends ezsqlModel implements DatabaseInterface
4444
*/
4545
private $database;
4646

47-
public function __construct(ConfigInterface $settings = null)
47+
public function __construct(?ConfigInterface $settings = null)
4848
{
4949
if (empty($settings)) {
5050
throw new Exception(\MISSING_CONFIGURATION);
@@ -141,7 +141,7 @@ public function sysDate()
141141
* @param array $param
142142
* @return bool|mixed
143143
*/
144-
public function query_prepared(string $query, array $param = null)
144+
public function query_prepared(string $query, ?array $param = null)
145145
{
146146
$result = @\sqlsrv_query($this->dbh, $query, $param);
147147
if ($this->shortcutUsed)

‎lib/DatabaseInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function sysDate();
7171
* @param array $param
7272
* @return bool|mixed
7373
*/
74-
public function query_prepared(string $query, array $param = null);
74+
public function query_prepared(string $query, ?array $param = null);
7575

7676
/**
7777
* Perform SQL query and try to determine result value.

‎lib/ezFunctions.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function clearInstance(): void
6868
* @param string $instanceTag - Store the instance for later use
6969
* @return \ezsql\Database\ez_pdo|\ezsql\Database\ez_pgsql|\ezsql\Database\ez_sqlsrv|\ezsql\Database\ez_sqlite3|\ezsql\Database\ez_mysqli
7070
*/
71-
function database(string $sqlDriver = null, array $connectionSetting = null, string $instanceTag = null)
71+
function database(?string $sqlDriver = null, ?array $connectionSetting = null, ?string $instanceTag = null)
7272
{
7373
return Database::initialize($sqlDriver, $connectionSetting, $instanceTag);
7474
}
@@ -79,7 +79,7 @@ function database(string $sqlDriver = null, array $connectionSetting = null, str
7979
* @param string $getTag - An stored tag instance
8080
* @return \ezsql\Database\ez_pdo|\ezsql\Database\ez_pgsql|\ezsql\Database\ez_sqlsrv|\ezsql\Database\ez_sqlite3|\ezsql\Database\ez_mysqli
8181
*/
82-
function tagInstance(string $getTag = null)
82+
function tagInstance(?string $getTag = null)
8383
{
8484
return database($getTag);
8585
}
@@ -93,7 +93,7 @@ function tagInstance(string $getTag = null)
9393
*
9494
* @return \ezsql\Database\ez_mysqli
9595
*/
96-
function mysqlInstance(array $databaseSetting = null, string $instanceTag = null)
96+
function mysqlInstance(?array $databaseSetting = null, ?string $instanceTag = null)
9797
{
9898
return database(\MYSQLI, $databaseSetting, $instanceTag);
9999
}
@@ -107,7 +107,7 @@ function mysqlInstance(array $databaseSetting = null, string $instanceTag = null
107107
*
108108
* @return \ezsql\Database\ez_pgsql
109109
*/
110-
function pgsqlInstance(array $databaseSetting = null, string $instanceTag = null)
110+
function pgsqlInstance(?array $databaseSetting = null, ?string $instanceTag = null)
111111
{
112112
return database(\PGSQL, $databaseSetting, $instanceTag);
113113
}
@@ -120,7 +120,7 @@ function pgsqlInstance(array $databaseSetting = null, string $instanceTag = null
120120
*
121121
* @return \ezsql\Database\ez_sqlsrv
122122
*/
123-
function mssqlInstance(array $databaseSetting = null, string $instanceTag = null)
123+
function mssqlInstance(?array $databaseSetting = null, ?string $instanceTag = null)
124124
{
125125
return database(\MSSQL, $databaseSetting, $instanceTag);
126126
}
@@ -133,7 +133,7 @@ function mssqlInstance(array $databaseSetting = null, string $instanceTag = null
133133
*
134134
* @return \ezsql\Database\ez_pdo
135135
*/
136-
function pdoInstance(array $databaseSetting = null, string $instanceTag = null)
136+
function pdoInstance(?array $databaseSetting = null, ?string $instanceTag = null)
137137
{
138138
return database(\Pdo, $databaseSetting, $instanceTag);
139139
}
@@ -146,7 +146,7 @@ function pdoInstance(array $databaseSetting = null, string $instanceTag = null)
146146
*
147147
* @return \ezsql\Database\ez_sqlite3
148148
*/
149-
function sqliteInstance(array $databaseSetting = null, string $instanceTag = null)
149+
function sqliteInstance(?array $databaseSetting = null, ?string $instanceTag = null)
150150
{
151151
return database(\SQLITE3, $databaseSetting, $instanceTag);
152152
}
@@ -157,7 +157,7 @@ function sqliteInstance(array $databaseSetting = null, string $instanceTag = nul
157157
*
158158
* @return string|null `mysqli`|`pgsql`|`sqlite3`|`sqlsrv`
159159
*/
160-
function get_vendor(DatabaseInterface $instance = null): ?string
160+
function get_vendor(?DatabaseInterface $instance = null): ?string
161161
{
162162
return ezSchema::vendor($instance);
163163
}
@@ -191,7 +191,7 @@ function to_string($arrays, $separation = ','): string
191191
*
192192
* @return string|bool - SQL schema string, or false for error
193193
*/
194-
function column(string $column = null, string $type = null, ...$arguments)
194+
function column(?string $column = null, ?string $type = null, ...$arguments)
195195
{
196196
return ezSchema::column($column, $type, ...$arguments);
197197
}
@@ -625,7 +625,7 @@ function create_certificate(
625625
string $certificateFile = 'certificate.crt',
626626
string $signingFile = 'certificate.csr',
627627
// string $caCertificate = null,
628-
string $ssl_path = null,
628+
?string $ssl_path = null,
629629
array $details = ["commonName" => "localhost"]
630630
) {
631631
if (empty($ssl_path)) {
@@ -966,7 +966,7 @@ function set_prefix(string $append = '')
966966
* @return mixed bool/result - false for error
967967
* @codeCoverageIgnore
968968
*/
969-
function select_into(string $newTable, $fromColumns = '*', string $oldTable = null, ...$fromWhereConditions)
969+
function select_into(string $newTable, $fromColumns = '*', ?string $oldTable = null, ...$fromWhereConditions)
970970
{
971971
$ezQuery = getInstance();
972972
return ($ezQuery instanceof DatabaseInterface)

0 commit comments

Comments
 (0)