Skip to content

Commit 8ae82df

Browse files
jonkerw85jonkerw85
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)

‎ToolkitApi/UserSpace.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class UserSpace
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 ;

‎log

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
diff --git a/ToolkitApi/CW/cw.php b/ToolkitApi/CW/cw.php
2+
index 38cf73f..afd85fb 100644
3+
--- a/ToolkitApi/CW/cw.php
4+
+++ b/ToolkitApi/CW/cw.php
5+
@@ -615,7 +615,7 @@ function i5_pclose(ToolkitServiceCw &$connection)
6+
* @param ToolkitServiceCw $connection [optional] the result of i5_connect(), or omit
7+
* @return boolean True on success, False on failure
8+
*/
9+
-function i5_adopt_authority($user, $password, ToolkitServiceCw $connection=null)
10+
+function i5_adopt_authority($user, $password, ?ToolkitServiceCw $connection=null)
11+
{
12+
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
13+
if (!$connection = verifyConnection($connection)) {
14+
@@ -801,7 +801,7 @@ function i5_errormsg()
15+
* @param ToolkitServiceCw $connection Optional connection object
16+
* @return boolean for success/failure
17+
*/
18+
-function i5_command($cmdString, $input = array(), $output = array(), ToolkitServiceCw $connection = null)
19+
+function i5_command($cmdString, $input = array(), $output = array(), ?ToolkitServiceCw $connection = null)
20+
{
21+
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
22+
if (!$connection = verifyConnection($connection)) {
23+
@@ -1464,7 +1464,7 @@ function i5_jobLog_list_close(&$list = null)
24+
* @param ToolkitServiceCw $connection
25+
* @return bool|null
26+
*/
27+
-function verifyConnection(ToolkitServiceCw $connection = null)
28+
+function verifyConnection(?ToolkitServiceCw $connection = null)
29+
{
30+
// if conn passed and non-null but it's bad
31+
if ($connection && !is_a($connection, 'ToolkitApi\CW\ToolkitServiceCw')) {
32+
@@ -2082,7 +2082,7 @@ function i5_data_area_read($name, $offsetOrConnection = null, $length = null, $c
33+
* @param ToolkitServiceCw $connection
34+
* @return boolean True on success, false on failure
35+
*/
36+
-function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ToolkitServiceCw $connection=null)
37+
+function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ?ToolkitServiceCw $connection=null)
38+
{
39+
if (isset($length)) {
40+
// assume offset and length are both provided, since they come as a pair.
41+
@@ -2851,7 +2851,7 @@ function i5_objects_list_close(&$list)
42+
* @param ToolkitServiceCw $connection
43+
* @return \ToolkitApi\CW\DataDescription
44+
*/
45+
-function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ToolkitServiceCw $connection = null)
46+
+function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ?ToolkitServiceCw $connection = null)
47+
{
48+
$keySize = 0; // init
49+
// user is allowed to omit $keySize, so there may be a variable number of parameters
50+
diff --git a/ToolkitApi/DataArea.php b/ToolkitApi/DataArea.php
51+
index fe63b5b..529dc3a 100644
52+
--- a/ToolkitApi/DataArea.php
53+
+++ b/ToolkitApi/DataArea.php
54+
@@ -16,7 +16,7 @@ class DataArea
55+
/**
56+
* @param ToolkitInterface $ToolkitSrvObj
57+
*/
58+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null)
59+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
60+
{
61+
if ($ToolkitSrvObj instanceof Toolkit) {
62+
$this->ToolkitSrvObj = $ToolkitSrvObj;
63+
diff --git a/ToolkitApi/DataQueue.php b/ToolkitApi/DataQueue.php
64+
index e218877..cd7c273 100644
65+
--- a/ToolkitApi/DataQueue.php
66+
+++ b/ToolkitApi/DataQueue.php
67+
@@ -17,7 +17,7 @@ class DataQueue
68+
/**
69+
* @param ToolkitInterface $ToolkitSrvObj
70+
*/
71+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null)
72+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
73+
{
74+
if ($ToolkitSrvObj instanceof Toolkit) {
75+
$this->Toolkit = $ToolkitSrvObj ;
76+
diff --git a/ToolkitApi/DateTimeApi.php b/ToolkitApi/DateTimeApi.php
77+
index 7f0c02d..7fcda74 100644
78+
--- a/ToolkitApi/DateTimeApi.php
79+
+++ b/ToolkitApi/DateTimeApi.php
80+
@@ -13,7 +13,7 @@ class DateTimeApi
81+
/**
82+
* @param ToolkitInterface $ToolkitSrvObj
83+
*/
84+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null)
85+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
86+
{
87+
if ($ToolkitSrvObj instanceof Toolkit) {
88+
$this->ToolkitSrvObj = $ToolkitSrvObj ;
89+
diff --git a/ToolkitApi/JobLogs.php b/ToolkitApi/JobLogs.php
90+
index 46bc1c1..1c50e67 100644
91+
--- a/ToolkitApi/JobLogs.php
92+
+++ b/ToolkitApi/JobLogs.php
93+
@@ -19,7 +19,7 @@ class JobLogs
94+
* @param ToolkitInterface $ToolkitSrvObj
95+
* @param string $tmpUSLib
96+
*/
97+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
98+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
99+
{
100+
if ($ToolkitSrvObj instanceof Toolkit ) {
101+
$this->ToolkitSrvObj = $ToolkitSrvObj;
102+
diff --git a/ToolkitApi/ListFromApi.php b/ToolkitApi/ListFromApi.php
103+
index cf687de..2a83860 100644
104+
--- a/ToolkitApi/ListFromApi.php
105+
+++ b/ToolkitApi/ListFromApi.php
106+
@@ -20,7 +20,7 @@ class ListFromApi
107+
* @param $lengthOfReceiverVariable
108+
* @param ToolkitInterface $ToolkitSrvObj
109+
*/
110+
- public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ToolkitInterface $ToolkitSrvObj = null)
111+
+ public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ?ToolkitInterface $ToolkitSrvObj = null)
112+
{
113+
if ($ToolkitSrvObj instanceof Toolkit) {
114+
$this->ToolkitSrvObj = $ToolkitSrvObj;
115+
diff --git a/ToolkitApi/ObjectLists.php b/ToolkitApi/ObjectLists.php
116+
index 41085d4..6034c67 100644
117+
--- a/ToolkitApi/ObjectLists.php
118+
+++ b/ToolkitApi/ObjectLists.php
119+
@@ -16,7 +16,7 @@ class ObjectLists
120+
/**
121+
* @param ToolkitInterface $ToolkitSrvObj
122+
*/
123+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null)
124+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
125+
{
126+
if ($ToolkitSrvObj instanceof Toolkit) {
127+
$this->ToolkitSrvObj = $ToolkitSrvObj;
128+
diff --git a/ToolkitApi/SpooledFiles.php b/ToolkitApi/SpooledFiles.php
129+
index 458f015..7f92368 100644
130+
--- a/ToolkitApi/SpooledFiles.php
131+
+++ b/ToolkitApi/SpooledFiles.php
132+
@@ -19,7 +19,7 @@ class SpooledFiles
133+
* @param ToolkitInterface $ToolkitSrvObj
134+
* @param null $UserLib
135+
*/
136+
- public function __construct(ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
137+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
138+
{
139+
if ($ToolkitSrvObj instanceof Toolkit) {
140+
$this->ToolkitSrvObj = $ToolkitSrvObj;
141+
diff --git a/ToolkitApi/SystemValues.php b/ToolkitApi/SystemValues.php
142+
index 7f76807..af65c12 100644
143+
--- a/ToolkitApi/SystemValues.php
144+
+++ b/ToolkitApi/SystemValues.php
145+
@@ -14,7 +14,7 @@ class SystemValues
146+
/**
147+
* @param ToolkitInterface $ToolkitSrvObj
148+
*/
149+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null){
150+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null){
151+
if ($ToolkitSrvObj instanceof Toolkit) {
152+
$this->ToolkitSrvObj = $ToolkitSrvObj;
153+
return $this;
154+
diff --git a/ToolkitApi/ToolkitServiceXML.php b/ToolkitApi/ToolkitServiceXML.php
155+
index f817acf..ca70a00 100644
156+
--- a/ToolkitApi/ToolkitServiceXML.php
157+
+++ b/ToolkitApi/ToolkitServiceXML.php
158+
@@ -369,7 +369,7 @@ class XMLWrapper
159+
* @param null $function
160+
* @return string
161+
*/
162+
- public function buildXmlIn($inputOutputParams = NULL, array $returnParams = NULL,
163+
+ public function buildXmlIn($inputOutputParams = NULL, ?array $returnParams = NULL,
164+
$pgm = "",
165+
$lib = "",
166+
$function = NULL)
167+
diff --git a/ToolkitApi/UserSpace.php b/ToolkitApi/UserSpace.php
168+
index e0649c7..ae8e4f6 100644
169+
--- a/ToolkitApi/UserSpace.php
170+
+++ b/ToolkitApi/UserSpace.php
171+
@@ -13,7 +13,7 @@ class UserSpace
172+
/**
173+
* @param ToolkitInterface $ToolkitSrvObj
174+
*/
175+
- public function __construct(ToolkitInterface $ToolkitSrvObj = null)
176+
+ public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
177+
{
178+
if ($ToolkitSrvObj instanceof Toolkit) {
179+
$this->ToolkitSrvObj = $ToolkitSrvObj ;

0 commit comments

Comments
 (0)