Merge pull request #218 from jonkerw85/implicitly-nullable-types

Fix nullable type declarations for PHP 8.4 compatibility

Author: alanseiden

ToolkitApi/CW/I5Error.php

@@ -8,13 +8,13 @@
  */
 class I5Error
 {
-    static $instance = null;
-    static protected $_i5Error = array();
+    public static $instance = null;
+    protected static $_i5Error = array();
 
     /**
      * @return null
      */
-    static function getInstance()
+    public static function getInstance()
     {
         if(self::$instance == NULL){
             $className = __CLASS__;

ToolkitApi/CW/ToolkitServiceCw.php

@@ -10,7 +10,7 @@
  */
 class ToolkitServiceCw extends Toolkit
 {
-    static $instance = null;
+    public static $instance = null;
 
     public function __construct($database, $userOrI5NamingFlag, $password, $extensionPrefix, $isPersistent = false)
     {
@@ -28,7 +28,7 @@ public function __construct($database, $userOrI5NamingFlag, $password, $extensio
      * @param bool $forceNew
      * @return bool|null
      */
-    static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingFlag = '', $password = '', $extensionPrefix = '', $isPersistent = false, $forceNew = false)
+    public static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingFlag = '', $password = '', $extensionPrefix = '', $isPersistent = false, $forceNew = false)
     {
         // if we're forcing a new instance, close db conn first if exists.
         if ($forceNew && self::hasInstance() && isset(self::$instance->conn))
@@ -64,7 +64,7 @@ static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingF
      *
      * @return boolean
      */
-    static function hasInstance()
+    public static function hasInstance()
     {
         if (isset(self::$instance) && is_object(self::$instance)) {
             return true;

ToolkitApi/CW/cw.php

@@ -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)) {
@@ -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)) {
@@ -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')) {
@@ -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.
@@ -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

ToolkitApi/DataArea.php

@@ -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;

ToolkitApi/DataQueue.php

@@ -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 ;

ToolkitApi/DateTimeApi.php

@@ -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 ;

ToolkitApi/JobLogs.php

@@ -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;

ToolkitApi/ListFromApi.php

@@ -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;

ToolkitApi/ObjectLists.php

@@ -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;

ToolkitApi/SpooledFiles.php

@@ -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;