Skip to content

Commit 8ae82df

Browse files
committed
Fix nullable type declarations for PHP 8.4 compatibility
1 parent 15fb93d commit 8ae82df

File tree

12 files changed

+194
-15
lines changed

12 files changed

+194
-15
lines changed

ToolkitApi/CW/cw.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ function i5_pclose(ToolkitServiceCw &$connection)
615615
* @param ToolkitServiceCw $connection [optional] the result of i5_connect(), or omit
616616
* @return boolean True on success, False on failure
617617
*/
618-
function i5_adopt_authority($user, $password, ToolkitServiceCw $connection=null)
618+
function i5_adopt_authority($user, $password, ?ToolkitServiceCw $connection=null)
619619
{
620620
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
621621
if (!$connection = verifyConnection($connection)) {
@@ -801,7 +801,7 @@ function i5_errormsg()
801801
* @param ToolkitServiceCw $connection Optional connection object
802802
* @return boolean for success/failure
803803
*/
804-
function i5_command($cmdString, $input = array(), $output = array(), ToolkitServiceCw $connection = null)
804+
function i5_command($cmdString, $input = array(), $output = array(), ?ToolkitServiceCw $connection = null)
805805
{
806806
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
807807
if (!$connection = verifyConnection($connection)) {
@@ -1464,7 +1464,7 @@ function i5_jobLog_list_close(&$list = null)
14641464
* @param ToolkitServiceCw $connection
14651465
* @return bool|null
14661466
*/
1467-
function verifyConnection(ToolkitServiceCw $connection = null)
1467+
function verifyConnection(?ToolkitServiceCw $connection = null)
14681468
{
14691469
// if conn passed and non-null but it's bad
14701470
if ($connection && !is_a($connection, 'ToolkitApi\CW\ToolkitServiceCw')) {
@@ -2082,7 +2082,7 @@ function i5_data_area_read($name, $offsetOrConnection = null, $length = null, $c
20822082
* @param ToolkitServiceCw $connection
20832083
* @return boolean True on success, false on failure
20842084
*/
2085-
function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ToolkitServiceCw $connection=null)
2085+
function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ?ToolkitServiceCw $connection=null)
20862086
{
20872087
if (isset($length)) {
20882088
// assume offset and length are both provided, since they come as a pair.
@@ -2851,7 +2851,7 @@ function i5_objects_list_close(&$list)
28512851
* @param ToolkitServiceCw $connection
28522852
* @return \ToolkitApi\CW\DataDescription
28532853
*/
2854-
function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ToolkitServiceCw $connection = null)
2854+
function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ?ToolkitServiceCw $connection = null)
28552855
{
28562856
$keySize = 0; // init
28572857
// user is allowed to omit $keySize, so there may be a variable number of parameters

ToolkitApi/DataArea.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DataArea
1616
/**
1717
* @param ToolkitInterface $ToolkitSrvObj
1818
*/
19-
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
19+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
2020
{
2121
if ($ToolkitSrvObj instanceof Toolkit) {
2222
$this->ToolkitSrvObj = $ToolkitSrvObj;

ToolkitApi/DataQueue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DataQueue
1717
/**
1818
* @param ToolkitInterface $ToolkitSrvObj
1919
*/
20-
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
20+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
2121
{
2222
if ($ToolkitSrvObj instanceof Toolkit) {
2323
$this->Toolkit = $ToolkitSrvObj ;

ToolkitApi/DateTimeApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DateTimeApi
1313
/**
1414
* @param ToolkitInterface $ToolkitSrvObj
1515
*/
16-
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
16+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
1717
{
1818
if ($ToolkitSrvObj instanceof Toolkit) {
1919
$this->ToolkitSrvObj = $ToolkitSrvObj ;

ToolkitApi/JobLogs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class JobLogs
1919
* @param ToolkitInterface $ToolkitSrvObj
2020
* @param string $tmpUSLib
2121
*/
22-
public function __construct(ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
22+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
2323
{
2424
if ($ToolkitSrvObj instanceof Toolkit ) {
2525
$this->ToolkitSrvObj = $ToolkitSrvObj;

ToolkitApi/ListFromApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ListFromApi
2020
* @param $lengthOfReceiverVariable
2121
* @param ToolkitInterface $ToolkitSrvObj
2222
*/
23-
public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ToolkitInterface $ToolkitSrvObj = null)
23+
public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ?ToolkitInterface $ToolkitSrvObj = null)
2424
{
2525
if ($ToolkitSrvObj instanceof Toolkit) {
2626
$this->ToolkitSrvObj = $ToolkitSrvObj;

ToolkitApi/ObjectLists.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ObjectLists
1616
/**
1717
* @param ToolkitInterface $ToolkitSrvObj
1818
*/
19-
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
19+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
2020
{
2121
if ($ToolkitSrvObj instanceof Toolkit) {
2222
$this->ToolkitSrvObj = $ToolkitSrvObj;

ToolkitApi/SpooledFiles.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SpooledFiles
1919
* @param ToolkitInterface $ToolkitSrvObj
2020
* @param null $UserLib
2121
*/
22-
public function __construct(ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
22+
public function __construct(?ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
2323
{
2424
if ($ToolkitSrvObj instanceof Toolkit) {
2525
$this->ToolkitSrvObj = $ToolkitSrvObj;

ToolkitApi/SystemValues.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SystemValues
1414
/**
1515
* @param ToolkitInterface $ToolkitSrvObj
1616
*/
17-
public function __construct(ToolkitInterface $ToolkitSrvObj = null){
17+
public function __construct(?ToolkitInterface $ToolkitSrvObj = null){
1818
if ($ToolkitSrvObj instanceof Toolkit) {
1919
$this->ToolkitSrvObj = $ToolkitSrvObj;
2020
return $this;

ToolkitApi/ToolkitServiceXML.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public function parseDiagnosticsXml($xml)
369369
* @param null $function
370370
* @return string
371371
*/
372-
public function buildXmlIn($inputOutputParams = NULL, array $returnParams = NULL,
372+
public function buildXmlIn($inputOutputParams = NULL, ?array $returnParams = NULL,
373373
$pgm = "",
374374
$lib = "",
375375
$function = NULL)

0 commit comments

Comments
 (0)