Skip to content

Commit 0911f63

Browse files
prwaterprwater
committed
Align with coding standards.
1 parent a5880c8 commit 0911f63

File tree

7 files changed

+52
-29
lines changed

7 files changed

+52
-29
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"prefer-stable": true,
1414
"require-dev": {
1515
"phing/phing": "^3.0.0-RC4",
16-
"phpstan/phpstan": "^1.9.4",
17-
"phpunit/phpunit": "^9.5.27"
16+
"phpstan/phpstan": "^1.9.14",
17+
"phpunit/phpunit": "^9.5.28"
1818
},
1919
"autoload": {
2020
"psr-4": {

‎src/Cast.php‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,16 @@ public static function isManFloat(mixed $value): bool
4242

4343
case 'string':
4444
// Reject empty strings.
45-
if ($value==='') return false;
45+
if ($value==='')
46+
{
47+
return false;
48+
}
4649

4750
// Reject leading zeros unless they are followed by a decimal point.
48-
if (strlen($value)>1 && $value[0]==='0' && $value[1]!=='.') return false;
51+
if (strlen($value)>1 && $value[0]==='0' && $value[1]!=='.')
52+
{
53+
return false;
54+
}
4955

5056
$filtered = filter_var($value,
5157
FILTER_SANITIZE_NUMBER_FLOAT,
@@ -77,10 +83,16 @@ public static function isManFloatInclusive(mixed $value): bool
7783

7884
case 'string':
7985
// Reject empty strings.
80-
if ($value==='') return false;
86+
if ($value==='')
87+
{
88+
return false;
89+
}
8190

8291
// Reject leading zeros unless they are followed by a decimal point
83-
if (strlen($value)>1 && $value[0]==='0' && $value[1]!=='.') return false;
92+
if (strlen($value)>1 && $value[0]==='0' && $value[1]!=='.')
93+
{
94+
return false;
95+
}
8496

8597
$filtered = filter_var($value,
8698
FILTER_SANITIZE_NUMBER_FLOAT,
@@ -300,9 +312,20 @@ public static function toManFloatInclusive(mixed $value, ?float $default = null)
300312
throw new InvalidCastException('Value can not be converted to float');
301313
}
302314

303-
if ($value==='NAN') return NAN;
304-
if ($value==='INF') return INF;
305-
if ($value==='-INF') return -INF;
315+
if ($value==='NAN')
316+
{
317+
return NAN;
318+
}
319+
320+
if ($value==='INF')
321+
{
322+
return INF;
323+
}
324+
325+
if ($value==='-INF')
326+
{
327+
return -INF;
328+
}
306329

307330
return (float)$value;
308331
}

‎test/CastBoolTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testManBoolWithDefault()
7373
*
7474
* @dataProvider invalidManBoolCases
7575
*/
76-
public function testManBoolWithInvalidValues($value): void
76+
public function testManBoolWithInvalidValues(mixed $value): void
7777
{
7878
$test = Cast::isManBool($value);
7979
self::assertFalse($test);
@@ -91,7 +91,7 @@ public function testManBoolWithInvalidValues($value): void
9191
*
9292
* @dataProvider validManBoolCases
9393
*/
94-
public function testManBoolWithValidValues($value, bool $expected): void
94+
public function testManBoolWithValidValues(mixed $value, bool $expected): void
9595
{
9696
$test = Cast::isManBool($value);
9797
self::assertTrue($test);
@@ -130,7 +130,7 @@ public function testOptBoolWithDefault()
130130
*
131131
* @dataProvider invalidOptBoolCases
132132
*/
133-
public function testOptBoolWithInvalidValues($value): void
133+
public function testOptBoolWithInvalidValues(mixed $value): void
134134
{
135135
$test = Cast::isOptBool($value);
136136
self::assertFalse($test);
@@ -148,7 +148,7 @@ public function testOptBoolWithInvalidValues($value): void
148148
*
149149
* @dataProvider validOptBoolCases
150150
*/
151-
public function testOptBoolWithValidValues($value, ?bool $expected): void
151+
public function testOptBoolWithValidValues(mixed $value, ?bool $expected): void
152152
{
153153
$test = Cast::isOptBool($value);
154154
self::assertTrue($test);

‎test/CastFloatInclusiveTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testManFloatWithDefault()
7373
*
7474
* @dataProvider invalidManFloatCases
7575
*/
76-
public function testManFloatWithInvalidValues($value): void
76+
public function testManFloatWithInvalidValues(mixed $value): void
7777
{
7878
$test = Cast::isManFloatInclusive($value);
7979
self::assertFalse($test);
@@ -91,7 +91,7 @@ public function testManFloatWithInvalidValues($value): void
9191
*
9292
* @dataProvider validManFloatCases
9393
*/
94-
public function testManFloatWithValidValues($value, float $expected): void
94+
public function testManFloatWithValidValues(mixed $value, float $expected): void
9595
{
9696
$test = Cast::isManFloatInclusive($value);
9797
self::assertTrue($test);
@@ -134,7 +134,7 @@ public function testOptFloatWithDefault()
134134
*
135135
* @dataProvider invalidOptFloatCases
136136
*/
137-
public function testOptFloatWithInvalidValues($value): void
137+
public function testOptFloatWithInvalidValues(mixed $value): void
138138
{
139139
$test = Cast::isOptFloatInclusive($value);
140140
self::assertFalse($test);
@@ -152,7 +152,7 @@ public function testOptFloatWithInvalidValues($value): void
152152
*
153153
* @dataProvider validOptFloatCases
154154
*/
155-
public function testOptFloatWithValidValues($value, ?float $expected): void
155+
public function testOptFloatWithValidValues(mixed $value, ?float $expected): void
156156
{
157157
$test = Cast::isOptFloatInclusive($value);
158158
self::assertTrue($test);

‎test/CastFloatTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function testManFiniteFloatWithDefault4()
112112
*
113113
* @dataProvider invalidManFiniteFloatCases
114114
*/
115-
public function testManFiniteFloatWithInvalidValues($value): void
115+
public function testManFiniteFloatWithInvalidValues(mixed $value): void
116116
{
117117
$test = Cast::isManFloat($value);
118118
self::assertFalse($test);
@@ -130,7 +130,7 @@ public function testManFiniteFloatWithInvalidValues($value): void
130130
*
131131
* @dataProvider validManFiniteFloatCases
132132
*/
133-
public function testManFiniteFloatWithValidValues($value, float $expected): void
133+
public function testManFiniteFloatWithValidValues(mixed $value, float $expected): void
134134
{
135135
$test = Cast::isManFloat($value);
136136
self::assertTrue($test);
@@ -206,7 +206,7 @@ public function testOptFiniteFloatWithDefault4()
206206
*
207207
* @dataProvider invalidOptFiniteFloatCases
208208
*/
209-
public function testOptFiniteFloatWithInvalidValues($value): void
209+
public function testOptFiniteFloatWithInvalidValues(mixed $value): void
210210
{
211211
$test = Cast::isOptFloat($value);
212212
self::assertFalse($test);
@@ -224,7 +224,7 @@ public function testOptFiniteFloatWithInvalidValues($value): void
224224
*
225225
* @dataProvider validOptFiniteFloatCases
226226
*/
227-
public function testOptFiniteFloatWithValidValues($value, ?float $expected): void
227+
public function testOptFiniteFloatWithValidValues(mixed $value, ?float $expected): void
228228
{
229229
$test = Cast::isOptFloat($value);
230230
self::assertTrue($test);

‎test/CastIntTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testManIntWithDefault()
6969
*
7070
* @dataProvider invalidManIntCases
7171
*/
72-
public function testManIntWithInvalidValues($value): void
72+
public function testManIntWithInvalidValues(mixed $value): void
7373
{
7474
$test = Cast::isManInt($value);
7575
self::assertFalse($test);
@@ -87,7 +87,7 @@ public function testManIntWithInvalidValues($value): void
8787
*
8888
* @dataProvider validManIntCases
8989
*/
90-
public function testManIntWithValidValues($value, int $expected): void
90+
public function testManIntWithValidValues(mixed $value, int $expected): void
9191
{
9292
$test = Cast::isManInt($value);
9393
self::assertTrue($test);
@@ -123,7 +123,7 @@ public function testOptIntWithDefault()
123123
*
124124
* @dataProvider invalidOptIntCases
125125
*/
126-
public function testOptIntWithInvalidValues($value): void
126+
public function testOptIntWithInvalidValues(mixed $value): void
127127
{
128128
$test = Cast::isOptInt($value);
129129
self::assertFalse($test);
@@ -141,7 +141,7 @@ public function testOptIntWithInvalidValues($value): void
141141
*
142142
* @dataProvider validOptIntCases
143143
*/
144-
public function testOptIntWithValidValues($value, ?int $expected): void
144+
public function testOptIntWithValidValues(mixed $value, ?int $expected): void
145145
{
146146
$test = Cast::isOptInt($value);
147147
self::assertTrue($test);

‎test/CastStringTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function testManStringWithDefault()
6565
*
6666
* @dataProvider invalidManStringCases
6767
*/
68-
public function testManStringWithInvalidValues($value): void
68+
public function testManStringWithInvalidValues(mixed $value): void
6969
{
7070
$test = Cast::isManString($value);
7171
self::assertFalse($test);
@@ -83,7 +83,7 @@ public function testManStringWithInvalidValues($value): void
8383
*
8484
* @dataProvider validManStringCases
8585
*/
86-
public function testManStringWithValidValues($value, string $expected): void
86+
public function testManStringWithValidValues(mixed $value, string $expected): void
8787
{
8888
$test = Cast::isManString($value);
8989
self::assertTrue($test);
@@ -119,7 +119,7 @@ public function testOptStringWithDefault()
119119
*
120120
* @dataProvider invalidOptStringCases
121121
*/
122-
public function testOptStringWithInvalidValues($value): void
122+
public function testOptStringWithInvalidValues(mixed $value): void
123123
{
124124
$test = Cast::isOptString($value);
125125
self::assertFalse($test);
@@ -137,7 +137,7 @@ public function testOptStringWithInvalidValues($value): void
137137
*
138138
* @dataProvider validOptStringCases
139139
*/
140-
public function testOptStringWithValidValues($value, ?string $expected): void
140+
public function testOptStringWithValidValues(mixed $value, ?string $expected): void
141141
{
142142
$test = Cast::isOptString($value);
143143
self::assertTrue($test);

0 commit comments

Comments
 (0)