Skip to content
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

Fix nullable type declarations for PHP 8.4 compatibility #218

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix nullable type declarations for PHP 8.4 compatibility #218

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ae82df
Fix nullable type declarations for PHP 8.4 compatibility
jonkerw85 Mar 18, 2025
2a9ef62
Removed log file
jonkerw85 Mar 18, 2025
71df096
chore: enforce visibility of methods and properties, ensuring declara…
jonkerw85 Mar 19, 2025
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
10 changes: 5 additions & 5 deletions ToolkitApi/CW/cw.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ function i5_pclose(ToolkitServiceCw &$connection)
* @param ToolkitServiceCw $connection [optional] the result of i5_connect(), or omit
* @return boolean True on success, False on failure
*/
function i5_adopt_authority($user, $password, ToolkitServiceCw $connection=null)
function i5_adopt_authority($user, $password, ?ToolkitServiceCw $connection=null)
{
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
if (!$connection = verifyConnection($connection)) {
Expand Down Expand Up @@ -801,7 +801,7 @@ function i5_errormsg()
* @param ToolkitServiceCw $connection Optional connection object
* @return boolean for success/failure
*/
function i5_command($cmdString, $input = array(), $output = array(), ToolkitServiceCw $connection = null)
function i5_command($cmdString, $input = array(), $output = array(), ?ToolkitServiceCw $connection = null)
{
// if conn not passed in, get instance of toolkit. If can't be obtained, return false.
if (!$connection = verifyConnection($connection)) {
Expand Down Expand Up @@ -1464,7 +1464,7 @@ function i5_jobLog_list_close(&$list = null)
* @param ToolkitServiceCw $connection
* @return bool|null
*/
function verifyConnection(ToolkitServiceCw $connection = null)
function verifyConnection(?ToolkitServiceCw $connection = null)
{
// if conn passed and non-null but it's bad
if ($connection && !is_a($connection, 'ToolkitApi\CW\ToolkitServiceCw')) {
Expand Down Expand Up @@ -2082,7 +2082,7 @@ function i5_data_area_read($name, $offsetOrConnection = null, $length = null, $c
* @param ToolkitServiceCw $connection
* @return boolean True on success, false on failure
*/
function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ToolkitServiceCw $connection=null)
function i5_data_area_write($name, $value, $offsetOrConnection = null, $length = null, ?ToolkitServiceCw $connection=null)
{
if (isset($length)) {
// assume offset and length are both provided, since they come as a pair.
Expand Down Expand Up @@ -2851,7 +2851,7 @@ function i5_objects_list_close(&$list)
* @param ToolkitServiceCw $connection
* @return \ToolkitApi\CW\DataDescription
*/
function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ToolkitServiceCw $connection = null)
function i5_dtaq_prepare($name, $description, $keySizeOrConnection = 0, ?ToolkitServiceCw $connection = null)
{
$keySize = 0; // init
// user is allowed to omit $keySize, so there may be a variable number of parameters
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/DataArea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DataArea
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/DataQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class DataQueue
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->Toolkit = $ToolkitSrvObj ;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/DateTimeApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class DateTimeApi
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj ;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/JobLogs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class JobLogs
* @param ToolkitInterface $ToolkitSrvObj
* @param string $tmpUSLib
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null, $tmpUSLib = DFTLIB)
{
if ($ToolkitSrvObj instanceof Toolkit ) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/ListFromApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ListFromApi
* @param $lengthOfReceiverVariable
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ToolkitInterface $ToolkitSrvObj = null)
public function __construct($requestHandle, $totalRecords, $receiverDs, $lengthOfReceiverVariable, ?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/ObjectLists.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ObjectLists
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/SpooledFiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SpooledFiles
* @param ToolkitInterface $ToolkitSrvObj
* @param null $UserLib
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
public function __construct(?ToolkitInterface $ToolkitSrvObj = NULL, $UserLib = NULL)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/SystemValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SystemValues
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null){
public function __construct(?ToolkitInterface $ToolkitSrvObj = null){
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj;
return $this;
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/ToolkitServiceXML.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public function parseDiagnosticsXml($xml)
* @param null $function
* @return string
*/
public function buildXmlIn($inputOutputParams = NULL, array $returnParams = NULL,
public function buildXmlIn($inputOutputParams = NULL, ?array $returnParams = NULL,
$pgm = "",
$lib = "",
$function = NULL)
Expand Down
2 changes: 1 addition & 1 deletion ToolkitApi/UserSpace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class UserSpace
/**
* @param ToolkitInterface $ToolkitSrvObj
*/
public function __construct(ToolkitInterface $ToolkitSrvObj = null)
public function __construct(?ToolkitInterface $ToolkitSrvObj = null)
{
if ($ToolkitSrvObj instanceof Toolkit) {
$this->ToolkitSrvObj = $ToolkitSrvObj ;
Expand Down