Skip to content

Commit ff8d5e2

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19452 from kamil-tekiela/Status-Data-status
Refactor Status\Data class
2 parents ddc64a4 + 574bc91 commit ff8d5e2

6 files changed

Lines changed: 152 additions & 253 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 58 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,151 +3781,121 @@ parameters:
37813781
path: src/Controllers/Server/Status/Processes/KillController.php
37823782

37833783
-
3784-
message: '#^Binary operation "\*" between mixed and \(float\|int\) results in an error\.$#'
3784+
message: '#^Binary operation "\*" between float\|int and mixed results in an error\.$#'
37853785
identifier: binaryOp.invalid
37863786
count: 1
37873787
path: src/Controllers/Server/Status/QueriesController.php
37883788

37893789
-
3790-
message: '#^Binary operation "\*" between mixed and 100 results in an error\.$#'
3790+
message: '#^Binary operation "\*" between float\|int\|string and 100 results in an error\.$#'
37913791
identifier: binaryOp.invalid
37923792
count: 1
37933793
path: src/Controllers/Server/Status/QueriesController.php
37943794

37953795
-
3796-
message: '#^Binary operation "\+\=" between float\|int and mixed results in an error\.$#'
3797-
identifier: assignOp.invalid
3796+
message: '#^Binary operation "\*" between float\|int\|string and mixed results in an error\.$#'
3797+
identifier: binaryOp.invalid
37983798
count: 1
37993799
path: src/Controllers/Server/Status/QueriesController.php
38003800

38013801
-
3802-
message: '#^Binary operation "/" between \(float\|int\) and mixed results in an error\.$#'
3803-
identifier: binaryOp.invalid
3804-
count: 2
3802+
message: '#^Binary operation "\+\=" between mixed and float\|int\|string results in an error\.$#'
3803+
identifier: assignOp.invalid
3804+
count: 1
38053805
path: src/Controllers/Server/Status/QueriesController.php
38063806

38073807
-
3808-
message: '#^Binary operation "/" between 3600 and mixed results in an error\.$#'
3808+
message: '#^Binary operation "/" between 3600 and float\|int\|string results in an error\.$#'
38093809
identifier: binaryOp.invalid
38103810
count: 1
38113811
path: src/Controllers/Server/Status/QueriesController.php
38123812

38133813
-
3814-
message: '#^Cannot cast mixed to int\.$#'
3815-
identifier: cast.int
3816-
count: 1
3814+
message: '#^Binary operation "/" between float\|int and float\|int\|string results in an error\.$#'
3815+
identifier: binaryOp.invalid
3816+
count: 2
38173817
path: src/Controllers/Server/Status/QueriesController.php
38183818

38193819
-
3820-
message: '#^Parameter \#3 \$subject of function str_replace expects array\<string\>\|string, \(int\|string\) given\.$#'
3821-
identifier: argument.type
3820+
message: '#^Binary operation "/" between mixed and float\|int results in an error\.$#'
3821+
identifier: binaryOp.invalid
38223822
count: 1
38233823
path: src/Controllers/Server/Status/QueriesController.php
38243824

38253825
-
3826-
message: '#^Binary operation "\*" between \(array\|float\|int\) and \(float\|int\) results in an error\.$#'
3826+
message: '#^Binary operation "\*" between float\|int\|string and 100 results in an error\.$#'
38273827
identifier: binaryOp.invalid
3828-
count: 1
3828+
count: 2
38293829
path: src/Controllers/Server/Status/StatusController.php
38303830

38313831
-
3832-
message: '#^Binary operation "\*" between mixed and \(float\|int\) results in an error\.$#'
3832+
message: '#^Binary operation "\*" between float\|int\|string and mixed results in an error\.$#'
38333833
identifier: binaryOp.invalid
38343834
count: 5
38353835
path: src/Controllers/Server/Status/StatusController.php
38363836

38373837
-
3838-
message: '#^Binary operation "\*" between mixed and 100 results in an error\.$#'
3838+
message: '#^Binary operation "\*" between mixed and mixed results in an error\.$#'
38393839
identifier: binaryOp.invalid
3840-
count: 2
3840+
count: 1
38413841
path: src/Controllers/Server/Status/StatusController.php
38423842

38433843
-
3844-
message: '#^Binary operation "\+" between mixed and mixed results in an error\.$#'
3844+
message: '#^Binary operation "\+" between float\|int\|string and float\|int\|string results in an error\.$#'
38453845
identifier: binaryOp.invalid
38463846
count: 3
38473847
path: src/Controllers/Server/Status/StatusController.php
38483848

38493849
-
3850-
message: '#^Binary operation "\." between ''SELECT UNIX…'' and mixed results in an error\.$#'
3851-
identifier: binaryOp.invalid
3852-
count: 1
3853-
path: src/Controllers/Server/Status/StatusController.php
3854-
3855-
-
3856-
message: '#^Binary operation "/" between \(float\|int\) and mixed results in an error\.$#'
3850+
message: '#^Binary operation "/" between 3600 and float\|int\|string results in an error\.$#'
38573851
identifier: binaryOp.invalid
38583852
count: 2
38593853
path: src/Controllers/Server/Status/StatusController.php
38603854

38613855
-
3862-
message: '#^Binary operation "/" between 3600 and mixed results in an error\.$#'
3856+
message: '#^Binary operation "/" between mixed and float\|int\<1, max\>\|string results in an error\.$#'
38633857
identifier: binaryOp.invalid
38643858
count: 2
38653859
path: src/Controllers/Server/Status/StatusController.php
38663860

3867-
-
3868-
message: '#^Cannot cast mixed to int\.$#'
3869-
identifier: cast.int
3870-
count: 1
3871-
path: src/Controllers/Server/Status/StatusController.php
3872-
38733861
-
38743862
message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
38753863
identifier: if.condNotBoolean
38763864
count: 2
38773865
path: src/Controllers/Server/Status/StatusController.php
38783866

3879-
-
3880-
message: '#^Only numeric types are allowed in \*, \(array\|float\|int\) given on the left side\.$#'
3881-
identifier: mul.leftNonNumeric
3882-
count: 1
3883-
path: src/Controllers/Server/Status/StatusController.php
3884-
3885-
-
3886-
message: '#^Parameter \#1 \$value of static method PhpMyAdmin\\Util\:\:formatByteDown\(\) expects float\|int\|string\|null, \(array\|float\|int\) given\.$#'
3887-
identifier: argument.type
3888-
count: 2
3889-
path: src/Controllers/Server/Status/StatusController.php
3890-
38913867
-
38923868
message: '#^Parameter \#1 \$value of static method PhpMyAdmin\\Util\:\:formatByteDown\(\) expects float\|int\|string\|null, mixed given\.$#'
38933869
identifier: argument.type
3894-
count: 2
3870+
count: 4
38953871
path: src/Controllers/Server/Status/StatusController.php
38963872

38973873
-
38983874
message: '#^Parameter \#1 \$value of static method PhpMyAdmin\\Util\:\:formatNumber\(\) expects float\|int\|string, mixed given\.$#'
38993875
identifier: argument.type
3900-
count: 4
3876+
count: 5
39013877
path: src/Controllers/Server/Status/StatusController.php
39023878

39033879
-
3904-
message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
3905-
identifier: foreach.nonIterable
3906-
count: 1
3907-
path: src/Controllers/Server/Status/VariablesController.php
3908-
3909-
-
3910-
message: '#^Binary operation "\*" between 0\.01 and mixed results in an error\.$#'
3880+
message: '#^Binary operation "\*" between 0\.01 and float\|int\|string results in an error\.$#'
39113881
identifier: binaryOp.invalid
39123882
count: 1
39133883
path: src/Controllers/Server/Status/VariablesController.php
39143884

39153885
-
3916-
message: '#^Binary operation "\*" between 0\.9 and mixed results in an error\.$#'
3886+
message: '#^Binary operation "\*" between 0\.9 and float\|int\|string results in an error\.$#'
39173887
identifier: binaryOp.invalid
39183888
count: 1
39193889
path: src/Controllers/Server/Status/VariablesController.php
39203890

39213891
-
3922-
message: '#^Binary operation "\*" between 0\.95 and mixed results in an error\.$#'
3892+
message: '#^Binary operation "\*" between 0\.95 and string results in an error\.$#'
39233893
identifier: binaryOp.invalid
39243894
count: 1
39253895
path: src/Controllers/Server/Status/VariablesController.php
39263896

39273897
-
3928-
message: '#^Binary operation "/" between mixed and 5 results in an error\.$#'
3898+
message: '#^Binary operation "/" between float\|int\|string and 5 results in an error\.$#'
39293899
identifier: binaryOp.invalid
39303900
count: 1
39313901
path: src/Controllers/Server/Status/VariablesController.php
@@ -3942,18 +3912,6 @@ parameters:
39423912
count: 1
39433913
path: src/Controllers/Server/Status/VariablesController.php
39443914

3945-
-
3946-
message: '#^Parameter \#1 \$haystack of function str_contains expects string, \(int\|string\) given\.$#'
3947-
identifier: argument.type
3948-
count: 1
3949-
path: src/Controllers/Server/Status/VariablesController.php
3950-
3951-
-
3952-
message: '#^Parameter \#1 \$name of static method PhpMyAdmin\\Html\\Generator\:\:linkToVarDocumentation\(\) expects string, \(int\|string\) given\.$#'
3953-
identifier: argument.type
3954-
count: 1
3955-
path: src/Controllers/Server/Status/VariablesController.php
3956-
39573915
-
39583916
message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
39593917
identifier: ternary.shortNotAllowed
@@ -16225,21 +16183,27 @@ parameters:
1622516183
path: src/Server/Status/Data.php
1622616184

1622716185
-
16228-
message: '#^Binary operation "\*" between mixed and 1024 results in an error\.$#'
16186+
message: '#^Binary operation "\*" between mixed and 100 results in an error\.$#'
1622916187
identifier: binaryOp.invalid
1623016188
count: 1
1623116189
path: src/Server/Status/Data.php
1623216190

1623316191
-
16234-
message: '#^Binary operation "\*" between mixed and mixed results in an error\.$#'
16192+
message: '#^Binary operation "\*" between string and 1024 results in an error\.$#'
16193+
identifier: binaryOp.invalid
16194+
count: 1
16195+
path: src/Server/Status/Data.php
16196+
16197+
-
16198+
message: '#^Binary operation "\*" between string and string results in an error\.$#'
1623516199
identifier: binaryOp.invalid
1623616200
count: 1
1623716201
path: src/Server/Status/Data.php
1623816202

1623916203
-
1624016204
message: '#^Binary operation "/" between \(float\|int\) and mixed results in an error\.$#'
1624116205
identifier: binaryOp.invalid
16242-
count: 4
16206+
count: 2
1624316207
path: src/Server/Status/Data.php
1624416208

1624516209
-
@@ -16248,6 +16212,12 @@ parameters:
1624816212
count: 1
1624916213
path: src/Server/Status/Data.php
1625016214

16215+
-
16216+
message: '#^Binary operation "/" between mixed and string results in an error\.$#'
16217+
identifier: binaryOp.invalid
16218+
count: 2
16219+
path: src/Server/Status/Data.php
16220+
1625116221
-
1625216222
message: '#^Cannot access offset ''doc'' on mixed\.$#'
1625316223
identifier: offsetAccess.nonOffsetAccessible
@@ -16266,6 +16236,12 @@ parameters:
1626616236
count: 2
1626716237
path: src/Server/Status/Data.php
1626816238

16239+
-
16240+
message: '#^Method PhpMyAdmin\\Server\\Status\\Data\:\:calculateValues\(\) should return array\<string, float\|int\|string\> but returns array\<string, mixed\>\.$#'
16241+
identifier: return.type
16242+
count: 1
16243+
path: src/Server/Status/Data.php
16244+
1626916245
-
1627016246
message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
1627116247
identifier: if.condNotBoolean
@@ -16278,12 +16254,6 @@ parameters:
1627816254
count: 1
1627916255
path: src/Server/Status/Data.php
1628016256

16281-
-
16282-
message: '#^Parameter \#1 \$haystack of function str_contains expects string, \(int\|string\) given\.$#'
16283-
identifier: argument.type
16284-
count: 1
16285-
path: src/Server/Status/Data.php
16286-
1628716257
-
1628816258
message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
1628916259
identifier: foreach.nonIterable
@@ -20271,19 +20241,13 @@ parameters:
2027120241
count: 1
2027220242
path: tests/unit/Controllers/Server/ShowEngineControllerTest.php
2027320243

20274-
-
20275-
message: '#^@readonly property PhpMyAdmin\\Server\\Status\\Data\:\:\$dataLoaded is assigned outside of its declaring class\.$#'
20276-
identifier: property.readOnlyByPhpDocAssignOutOfClass
20277-
count: 2
20278-
path: tests/unit/Controllers/Server/Status/AdvisorControllerTest.php
20279-
2028020244
-
2028120245
message: '''
2028220246
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
2028320247
Use dependency injection instead\.$#
2028420248
'''
2028520249
identifier: staticMethod.deprecated
20286-
count: 1
20250+
count: 2
2028720251
path: tests/unit/Controllers/Server/Status/AdvisorControllerTest.php
2028820252

2028920253
-
@@ -20467,25 +20431,19 @@ parameters:
2046720431
path: tests/unit/Controllers/Server/Status/ProcessesControllerTest.php
2046820432

2046920433
-
20470-
message: '#^@readonly property PhpMyAdmin\\Server\\Status\\Data\:\:\$status is assigned outside of its declaring class\.$#'
20471-
identifier: property.readOnlyByPhpDocAssignOutOfClass
20472-
count: 1
20473-
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
20474-
20475-
-
20476-
message: '#^@readonly property PhpMyAdmin\\Server\\Status\\Data\:\:\$usedQueries is assigned outside of its declaring class\.$#'
20477-
identifier: property.readOnlyByPhpDocAssignOutOfClass
20434+
message: '#^Binary operation "\*" between float\|int and mixed results in an error\.$#'
20435+
identifier: binaryOp.invalid
2047820436
count: 1
2047920437
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
2048020438

2048120439
-
20482-
message: '#^Binary operation "/" between \(float\|int\) and mixed results in an error\.$#'
20440+
message: '#^Binary operation "/" between 3600 and float\|int\|string results in an error\.$#'
2048320441
identifier: binaryOp.invalid
2048420442
count: 1
2048520443
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
2048620444

2048720445
-
20488-
message: '#^Binary operation "/" between 3600 and mixed results in an error\.$#'
20446+
message: '#^Binary operation "/" between float\|int and float\|int\|string results in an error\.$#'
2048920447
identifier: binaryOp.invalid
2049020448
count: 1
2049120449
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
@@ -20509,10 +20467,10 @@ parameters:
2050920467
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
2051020468

2051120469
-
20512-
message: '#^@readonly property PhpMyAdmin\\Server\\Status\\Data\:\:\$status is assigned outside of its declaring class\.$#'
20513-
identifier: property.readOnlyByPhpDocAssignOutOfClass
20514-
count: 6
20515-
path: tests/unit/Controllers/Server/Status/StatusControllerTest.php
20470+
message: '#^Parameter \#1 \$value of static method PhpMyAdmin\\Util\:\:formatNumber\(\) expects float\|int\|string, mixed given\.$#'
20471+
identifier: argument.type
20472+
count: 1
20473+
path: tests/unit/Controllers/Server/Status/QueriesControllerTest.php
2051620474

2051720475
-
2051820476
message: '''
@@ -20529,7 +20487,7 @@ parameters:
2052920487
Use dependency injection instead\.$#
2053020488
'''
2053120489
identifier: staticMethod.deprecated
20532-
count: 3
20490+
count: 2
2053320491
path: tests/unit/Controllers/Server/Status/StatusControllerTest.php
2053420492

2053520493
-

0 commit comments

Comments
 (0)