Skip to content

Commit 75bf4bf

Browse files
jonkerw85jonkerw85
committed
chore: enforce visibility of methods and properties, ensuring declaration order consistency
1 parent 2a9ef62 commit 75bf4bf

10 files changed

+303
-116
lines changed

‎ToolkitApi/CW/I5Error.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
*/
99
class I5Error
1010
{
11-
static $instance = null;
12-
static protected $_i5Error = array();
11+
public static $instance = null;
12+
protected static $_i5Error = array();
1313

1414
/**
1515
* @return null
1616
*/
17-
static function getInstance()
17+
public static function getInstance()
1818
{
1919
if(self::$instance == NULL){
2020
$className = __CLASS__;

‎ToolkitApi/CW/ToolkitServiceCw.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
class ToolkitServiceCw extends Toolkit
1212
{
13-
static $instance = null;
13+
public static $instance = null;
1414

1515
public function __construct($database, $userOrI5NamingFlag, $password, $extensionPrefix, $isPersistent = false)
1616
{
@@ -28,7 +28,7 @@ public function __construct($database, $userOrI5NamingFlag, $password, $extensio
2828
* @param bool $forceNew
2929
* @return bool|null
3030
*/
31-
static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingFlag = '', $password = '', $extensionPrefix = '', $isPersistent = false, $forceNew = false)
31+
public static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingFlag = '', $password = '', $extensionPrefix = '', $isPersistent = false, $forceNew = false)
3232
{
3333
// if we're forcing a new instance, close db conn first if exists.
3434
if ($forceNew && self::hasInstance() && isset(self::$instance->conn))
@@ -64,7 +64,7 @@ static function getInstance($databaseNameOrResource = '*LOCAL', $userOrI5NamingF
6464
*
6565
* @return boolean
6666
*/
67-
static function hasInstance()
67+
public static function hasInstance()
6868
{
6969
if (isset(self::$instance) && is_object(self::$instance)) {
7070
return true;

‎ToolkitApi/SystemValues.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function getError() {
105105
/**
106106
* @param $errCode
107107
*/
108-
private function setError($errCode)
108+
private function setError($errCode)
109109
{
110110
if ($errCode == '') /*clear error message*/ {
111111
$this->ErrMessage = '';

‎ToolkitApi/TmpUserSpace.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TmpUserSpace extends UserSpace
1111
* @param int $DftUsSize
1212
* @throws \Exception
1313
*/
14-
function __construct($Toolkit, $UsLib = DFTLIB, $DftUsSize = 32700)
14+
public function __construct($Toolkit, $UsLib = DFTLIB, $DftUsSize = 32700)
1515
{
1616
parent::__construct($Toolkit);
1717

@@ -27,7 +27,7 @@ function __construct($Toolkit, $UsLib = DFTLIB, $DftUsSize = 32700)
2727
/**
2828
* @todo do not delete
2929
*/
30-
function __destruct()
30+
public function __destruct()
3131
{
3232
// $this->DeleteUserSpace();
3333
}

‎ToolkitApi/Toolkit.php

+37-37
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
class Toolkit implements ToolkitInterface
2020
{
21-
const VERSION = "1.9.6"; // version number for front-end PHP toolkit
21+
public const VERSION = "1.9.6"; // version number for front-end PHP toolkit
2222

2323
/* @todo use inputXml and outputXml to make this class more flexibly OO-like. Fewer strings copied around.
2424
* Better would be to use a Request object that has a connection.
@@ -53,8 +53,8 @@ class Toolkit implements ToolkitInterface
5353

5454
protected $_isCw = false; // whether the CW is used for this instance.
5555

56-
static protected $_config; // config options from INI file. Accessed by static method getConfigValue();
57-
static protected $_os; // operating system
56+
protected static $_config; // config options from INI file. Accessed by static method getConfigValue();
57+
protected static $_os; // operating system
5858

5959
// brought over from CW
6060
protected $joblog = '';
@@ -1139,7 +1139,7 @@ public function getDiagnostics($info = 'joblog', $jobName = '', $jobUser = '', $
11391139
*
11401140
* @return string Version number (e.g. '1.4.0')
11411141
*/
1142-
static function getFrontEndVersion()
1142+
public static function getFrontEndVersion()
11431143
{
11441144
return self::VERSION;
11451145
}
@@ -1170,7 +1170,7 @@ public function getBackEndVersion()
11701170
* @param $library
11711171
* @return string Version number (e.g. '1.8.0')
11721172
*/
1173-
static function getLocalBackEndVersion($library)
1173+
public static function getLocalBackEndVersion($library)
11741174
{
11751175
$cmd = "qsh -c /qsys.lib/$library.lib/xmlver.pgm";
11761176

@@ -1395,7 +1395,7 @@ public function ClCommandWithCpf($command)
13951395
* @param int $dimension
13961396
* @return array
13971397
*/
1398-
static function AddParameter($type, $io, $comment, $varName = '', $value = '', $varying = 'off', $dimension = 0)
1398+
public static function AddParameter($type, $io, $comment, $varName = '', $value = '', $varying = 'off', $dimension = 0)
13991399
{
14001400
return array ('type' => $type, // storage
14011401
'io' => $io, // in/out/both
@@ -1421,7 +1421,7 @@ static function AddParameter($type, $io, $comment, $varName = '', $value = '', $
14211421
* @param bool $useHex
14221422
* @return CharParam
14231423
*/
1424-
static function AddParameterChar($io, $size , $comment, $varName = '', $value= '', $varying = 'off',$dimension = 0,
1424+
public static function AddParameterChar($io, $size , $comment, $varName = '', $value= '', $varying = 'off',$dimension = 0,
14251425
$by='', $isArray = false, $ccsidBefore = '', $ccsidAfter = '', $useHex = false)
14261426
{
14271427
return new CharParam($io, $size , $comment, $varName, $value , $varying , $dimension, $by,
@@ -1436,7 +1436,7 @@ static function AddParameterChar($io, $size , $comment, $varName = '', $value= '
14361436
* @param int $dimension
14371437
* @return Int32Param
14381438
*/
1439-
static function AddParameterInt32($io, $comment, $varName = '', $value = '', $dimension = 0)
1439+
public static function AddParameterInt32($io, $comment, $varName = '', $value = '', $dimension = 0)
14401440
{
14411441
return new Int32Param($io, $comment, $varName, $value, $dimension);
14421442
}
@@ -1447,7 +1447,7 @@ static function AddParameterInt32($io, $comment, $varName = '', $value = '', $di
14471447
* @param $labelFindLen
14481448
* @return SizeParam
14491449
*/
1450-
static function AddParameterSize($comment, $varName = '', $labelFindLen = 0)
1450+
public static function AddParameterSize($comment, $varName = '', $labelFindLen = 0)
14511451
{
14521452
return new SizeParam($comment, $varName, $labelFindLen);
14531453
}
@@ -1458,7 +1458,7 @@ static function AddParameterSize($comment, $varName = '', $labelFindLen = 0)
14581458
* @param $labelFindLen
14591459
* @return SizePackParam
14601460
*/
1461-
static function AddParameterSizePack($comment, $varName = '', $labelFindLen = 0)
1461+
public static function AddParameterSizePack($comment, $varName = '', $labelFindLen = 0)
14621462
{
14631463
return new SizePackParam($comment, $varName, $labelFindLen);
14641464
}
@@ -1497,7 +1497,7 @@ public static function AddParameterInt16($io, $comment, $varName='', $value='',
14971497
* @param int $dimension
14981498
* @return Int64Param
14991499
*/
1500-
static function AddParameterInt64($io, $comment, $varName = '', $value = '', $dimension = 0)
1500+
public static function AddParameterInt64($io, $comment, $varName = '', $value = '', $dimension = 0)
15011501
{
15021502
return new Int64Param($io, $comment, $varName, $value, $dimension);
15031503
}
@@ -1536,7 +1536,7 @@ public static function AddParameterUInt16($io, $comment, $varName='', $value='',
15361536
* @param int $dimension
15371537
* @return UInt32Param
15381538
*/
1539-
static function AddParameterUInt32($io, $comment, $varName = '', $value = '', $dimension =0)
1539+
public static function AddParameterUInt32($io, $comment, $varName = '', $value = '', $dimension =0)
15401540
{
15411541
return new UInt32Param($io, $comment, $varName, $value, $dimension) ; // removed erroneous "off"
15421542
}
@@ -1549,7 +1549,7 @@ static function AddParameterUInt32($io, $comment, $varName = '', $value = '', $d
15491549
* @param int $dimension
15501550
* @return UInt64Param
15511551
*/
1552-
static function AddParameterUInt64($io, $comment, $varName = '', $value='', $dimension=0)
1552+
public static function AddParameterUInt64($io, $comment, $varName = '', $value='', $dimension=0)
15531553
{
15541554
return new UInt64Param($io, $comment, $varName, $value, $dimension);
15551555
}
@@ -1562,7 +1562,7 @@ static function AddParameterUInt64($io, $comment, $varName = '', $value='', $dim
15621562
* @param int $dimension
15631563
* @return FloatParam
15641564
*/
1565-
static function AddParameterFloat($io, $comment, $varName = '', $value='', $dimension=0)
1565+
public static function AddParameterFloat($io, $comment, $varName = '', $value='', $dimension=0)
15661566
{
15671567
return(new FloatParam($io, $comment, $varName, $value, $dimension));
15681568
}
@@ -1575,7 +1575,7 @@ static function AddParameterFloat($io, $comment, $varName = '', $value='', $dime
15751575
* @param int $dimension
15761576
* @return RealParam
15771577
*/
1578-
static function AddParameterReal($io, $comment, $varName = '', $value='', $dimension=0)
1578+
public static function AddParameterReal($io, $comment, $varName = '', $value='', $dimension=0)
15791579
{
15801580
return new RealParam($io, $comment, $varName, $value, $dimension);
15811581
}
@@ -1590,7 +1590,7 @@ static function AddParameterReal($io, $comment, $varName = '', $value='', $dimen
15901590
* @param int $dimension
15911591
* @return PackedDecParam
15921592
*/
1593-
static function AddParameterPackDec($io, $length ,$scale , $comment, $varName = '', $value='', $dimension=0)
1593+
public static function AddParameterPackDec($io, $length ,$scale , $comment, $varName = '', $value='', $dimension=0)
15941594
{
15951595
return new PackedDecParam($io, $length ,$scale , $comment, $varName, $value, $dimension);
15961596
}
@@ -1605,7 +1605,7 @@ static function AddParameterPackDec($io, $length ,$scale , $comment, $varName =
16051605
* @param int $dimension
16061606
* @return ZonedParam
16071607
*/
1608-
static function AddParameterZoned($io, $length ,$scale , $comment, $varName = '', $value='', $dimension=0)
1608+
public static function AddParameterZoned($io, $length ,$scale , $comment, $varName = '', $value='', $dimension=0)
16091609
{
16101610
return new ZonedParam($io, $length ,$scale , $comment, $varName , $value, $dimension);
16111611
}
@@ -1617,7 +1617,7 @@ static function AddParameterZoned($io, $length ,$scale , $comment, $varName = ''
16171617
* @param string $comment
16181618
* @return HoleParam
16191619
*/
1620-
static function AddParameterHole($size , $comment='hole')
1620+
public static function AddParameterHole($size , $comment='hole')
16211621
{
16221622
return new HoleParam($size, $comment);
16231623
}
@@ -1631,7 +1631,7 @@ static function AddParameterHole($size , $comment='hole')
16311631
* @param int $dimension
16321632
* @return BinParam
16331633
*/
1634-
static function AddParameterBin($io, $size , $comment, $varName = '', $value='',$dimension =0)
1634+
public static function AddParameterBin($io, $size , $comment, $varName = '', $value='',$dimension =0)
16351635
{
16361636
return new BinParam($io, $size , $comment, $varName, $value,$dimension);
16371637
}
@@ -1640,7 +1640,7 @@ static function AddParameterBin($io, $size , $comment, $varName = '', $value='',
16401640
* @param $array
16411641
* @return array
16421642
*/
1643-
static function AddParameterArray($array)
1643+
public static function AddParameterArray($array)
16441644
{
16451645
$params = array();
16461646

@@ -1668,15 +1668,15 @@ static function AddParameterArray($array)
16681668
* @param string $io
16691669
* @return DataStructure
16701670
*/
1671-
static function AddDataStruct(array $parameters, $name='struct_name', $dim=0, $by='', $isArray=false, $labelLen = null, $comment = '', $io = 'both')
1671+
public static function AddDataStruct(array $parameters, $name='struct_name', $dim=0, $by='', $isArray=false, $labelLen = null, $comment = '', $io = 'both')
16721672
{
16731673
return new DataStructure($parameters, $name, $dim, $comment, $by, $isArray, $labelLen, $io);
16741674
}
16751675

16761676
/**
16771677
* @return DataStructure
16781678
*/
1679-
static function AddErrorDataStruct()
1679+
public static function AddErrorDataStruct()
16801680
{
16811681
return new DataStructure(self::GenerateErrorParameter(), 'errorDs', 0);
16821682
}
@@ -1688,7 +1688,7 @@ static function AddErrorDataStruct()
16881688
*
16891689
* @return DataStructure
16901690
*/
1691-
static function AddErrorDataStructZeroBytes()
1691+
public static function AddErrorDataStructZeroBytes()
16921692
{
16931693
return new DataStructure(self::GenerateErrorParameterZeroBytes(), 'errorDs', 0);
16941694
}
@@ -1715,7 +1715,7 @@ static function AddErrorDataStructZeroBytes()
17151715
* @param int $paramNum
17161716
* @return string
17171717
*/
1718-
static function getErrorDataStructXml($paramNum = 0)
1718+
public static function getErrorDataStructXml($paramNum = 0)
17191719
{
17201720
$paramNumStr = ($paramNum) ? ($paramNum . '.') : '';
17211721

@@ -1734,7 +1734,7 @@ static function getErrorDataStructXml($paramNum = 0)
17341734
* @param int $paramNum
17351735
* @return string
17361736
*/
1737-
static function getErrorDataStructXmlWithCode($paramNum = 0)
1737+
public static function getErrorDataStructXmlWithCode($paramNum = 0)
17381738
{
17391739
$paramNumStr = ($paramNum) ? ($paramNum . '.') : '';
17401740

@@ -1754,7 +1754,7 @@ static function getErrorDataStructXmlWithCode($paramNum = 0)
17541754
* @param int $paramNum
17551755
* @return string
17561756
*/
1757-
static function getListInfoApiXml($paramNum = 0)
1757+
public static function getListInfoApiXml($paramNum = 0)
17581758
{
17591759
$paramNumStr = ($paramNum) ? ($paramNum . '.') : '';
17601760

@@ -1781,7 +1781,7 @@ static function getListInfoApiXml($paramNum = 0)
17811781
* @param int $paramNum
17821782
* @return string
17831783
*/
1784-
static function getNumberOfRecordsDesiredApiXml($paramNum = 0)
1784+
public static function getNumberOfRecordsDesiredApiXml($paramNum = 0)
17851785
{
17861786
$paramNumStr = ($paramNum) ? ($paramNum . '.') : '';
17871787

@@ -1796,7 +1796,7 @@ static function getNumberOfRecordsDesiredApiXml($paramNum = 0)
17961796
* @param int $paramNum
17971797
* @return string
17981798
*/
1799-
static function getSortInformationApiXml($paramNum = 0)
1799+
public static function getSortInformationApiXml($paramNum = 0)
18001800
{
18011801
$paramNumStr = ($paramNum) ? ($paramNum . '.') : '';
18021802

@@ -1815,7 +1815,7 @@ static function getSortInformationApiXml($paramNum = 0)
18151815
* @param $lengthOfReceiverVariable
18161816
* @return string
18171817
*/
1818-
static function getDummyReceiverAndLengthApiXml($paramNum, $lengthOfReceiverVariable)
1818+
public static function getDummyReceiverAndLengthApiXml($paramNum, $lengthOfReceiverVariable)
18191819
{
18201820
$paramNumStr = $paramNum . '.';
18211821
$paramNumStrNext = ($paramNum + 1) . '.';
@@ -2060,7 +2060,7 @@ public function generate_name()
20602060
*
20612061
* @return array
20622062
*/
2063-
static function GenerateErrorParameter()
2063+
public static function GenerateErrorParameter()
20642064
{
20652065
$ErrBytes = 144;
20662066
$ErrBytesAv = 144;
@@ -2083,7 +2083,7 @@ static function GenerateErrorParameter()
20832083
*
20842084
* @return array
20852085
*/
2086-
static function GenerateErrorParameterZeroBytes()
2086+
public static function GenerateErrorParameterZeroBytes()
20872087
{
20882088
$ErrBytes = 0;
20892089
// changed $this to self so can work in static context
@@ -2244,7 +2244,7 @@ public function getJobAttributes()
22442244
*
22452245
* @return string
22462246
*/
2247-
static function classPath()
2247+
public static function classPath()
22482248
{
22492249
return __FILE__;
22502250
}
@@ -2384,7 +2384,7 @@ protected function extractErrorFromJoblog(array $programsToLookFor)
23842384
* @param string $password
23852385
* @return boolean True on success, False on failure
23862386
*/
2387-
function changeCurrentUser($user, $password)
2387+
public function changeCurrentUser($user, $password)
23882388
{
23892389
// Force user/pw to uppercase. (should they?)
23902390
// Ask Support team for opinion on uppercase or not.
@@ -2487,7 +2487,7 @@ function changeCurrentUser($user, $password)
24872487
* @param mixed|null $default
24882488
* @return bool|null
24892489
*/
2490-
static function getConfigValue($heading, $key, $default = null)
2490+
public static function getConfigValue($heading, $key, $default = null)
24912491
{
24922492
// if we haven't read config file yet, do so.
24932493
if (!isset(self::$_config)) {
@@ -2510,7 +2510,7 @@ static function getConfigValue($heading, $key, $default = null)
25102510
*
25112511
* @return string
25122512
*/
2513-
static function getPhpOperatingSystem() {
2513+
public static function getPhpOperatingSystem() {
25142514

25152515
if (!isset(self::$_os)) {
25162516
self::$_os = php_uname('s');
@@ -2524,7 +2524,7 @@ static function getPhpOperatingSystem() {
25242524
*
25252525
* @return bool
25262526
*/
2527-
static function isPhpRunningOnIbmI()
2527+
public static function isPhpRunningOnIbmI()
25282528
{
25292529
return (self::getPhpOperatingSystem() == 'OS400');
25302530
}
@@ -2539,7 +2539,7 @@ static function isPhpRunningOnIbmI()
25392539
*
25402540
* @return bool
25412541
*/
2542-
static function getPhpCcsid()
2542+
public static function getPhpCcsid()
25432543
{
25442544
if (isset($_SERVER['CCSID'])) {
25452545
// web/fastcgi

0 commit comments

Comments
 (0)