Skip to content

Commit

Permalink
Merge pull request #207 from Sebbo94BY/Apply-php-cs-fixer-with-newer-…
Browse files Browse the repository at this point in the history 
…version

Apply PHP CS Fixer rules with newer version
  • Loading branch information
@Sebbo94BY
Sebbo94BY committed Aug 15, 2023
2 parents 64aa90a + df3d449 commit adbe553
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/Helper/Uri.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ public function checkHost(string $host = null): bool
}

switch ($host) {
case filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4|FILTER_FLAG_IPV6):
case filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6):
// Valid IPv4 or IPv6 address
break;
case !preg_match("/^(([0-9]{1,3})\.){3}([0-9]{1,3})$/", $host) and preg_match("/^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$/i", $host):
Expand Down
48 changes: 24 additions & 24 deletions tests/Helper/ConvertTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ public function testConvertBytesToHumanReadableWithFactor1000()
$this->assertEquals('1000 B', $output);
$this->assertIsString($output);

$output = Convert::bytes(1000*1000);
$output = Convert::bytes(1000 * 1000);
$this->assertEquals('976.5625 KiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1000*1000*1000);
$output = Convert::bytes(1000 * 1000 * 1000);
$this->assertEquals('953.6743164063 MiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1000*1000*1000*1000);
$output = Convert::bytes(1000 * 1000 * 1000 * 1000);
$this->assertEquals('931.3225746155 GiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1000*1000*1000*1000*1000);
$output = Convert::bytes(1000 * 1000 * 1000 * 1000 * 1000);
$this->assertEquals('909.4947017729 TiB', $output);
$this->assertIsString($output);
}
Expand All @@ -44,19 +44,19 @@ public function testConvertBytesToHumanReadableWithFactor1024()
$this->assertEquals('1 KiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024);
$output = Convert::bytes(1024 * 1024);
$this->assertEquals('1 MiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024);
$output = Convert::bytes(1024 * 1024 * 1024);
$this->assertEquals('1 GiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024*1024);
$output = Convert::bytes(1024 * 1024 * 1024 * 1024);
$this->assertEquals('1 TiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024*1024*1024);
$output = Convert::bytes(1024 * 1024 * 1024 * 1024 * 1024);
$this->assertEquals('1 PiB', $output);
$this->assertIsString($output);
}
Expand All @@ -67,23 +67,23 @@ public function testConvertBytesToHumanReadableWithOddNumbers()
$this->assertEquals('1 B', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024+256);
$output = Convert::bytes(1024 + 256);
$this->assertEquals('1.25 KiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024+256);
$output = Convert::bytes(1024 * 1024 + 256);
$this->assertEquals('1.0002441406 MiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024+256);
$output = Convert::bytes(1024 * 1024 * 1024 + 256);
$this->assertEquals('1.0000002384 GiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024*1024+256);
$output = Convert::bytes(1024 * 1024 * 1024 * 1024 + 256);
$this->assertEquals('1.0000000002 TiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(1024*1024*1024*1024*1024+(256*1024*1024*1024));
$output = Convert::bytes(1024 * 1024 * 1024 * 1024 * 1024 + (256 * 1024 * 1024 * 1024));
$this->assertEquals('1.0002441406 PiB', $output);
$this->assertIsString($output);
}
Expand All @@ -102,27 +102,27 @@ public function testConvertBytesToHumanReadableWithNegativeNumbers()
$this->assertEquals('-1 KiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1000*1000);
$output = Convert::bytes(-1000 * 1000);
$this->assertEquals('-976.5625 KiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1000*1000*1000);
$output = Convert::bytes(-1000 * 1000 * 1000);
$this->assertEquals('-953.6743164063 MiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1024*1024);
$output = Convert::bytes(-1024 * 1024);
$this->assertEquals('-1 MiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1024*1024*1024);
$output = Convert::bytes(-1024 * 1024 * 1024);
$this->assertEquals('-1 GiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1024*1024*1024*1024);
$output = Convert::bytes(-1024 * 1024 * 1024 * 1024);
$this->assertEquals('-1 TiB', $output);
$this->assertIsString($output);

$output = Convert::bytes(-1024*1024*1024*1024-256);
$output = Convert::bytes(-1024 * 1024 * 1024 * 1024 - 256);
$this->assertEquals('-1.0000000002 TiB', $output);
$this->assertIsString($output);
}
Expand All @@ -146,29 +146,29 @@ public function testConvertSecondsToHumanReadable()
$this->assertIsString($output);


$output = Convert::seconds((59*60) + 59);
$output = Convert::seconds((59 * 60) + 59);
$this->assertEquals('0D 00:59:59', $output);
$this->assertIsString($output);

$output = Convert::seconds((59*60) + 60);
$output = Convert::seconds((59 * 60) + 60);
$this->assertEquals('0D 01:00:00', $output);
$this->assertIsString($output);

$output = Convert::seconds(
(23*(60**2)) + (59*60) + 59
(23 * (60 ** 2)) + (59 * 60) + 59
);
$this->assertEquals('0D 23:59:59', $output);
$this->assertIsString($output);

$output = Convert::seconds(
(23*(60**2)) + (59*60) + 60
(23 * (60 ** 2)) + (59 * 60) + 60
);
$this->assertEquals('1D 00:00:00', $output);
$this->assertIsString($output);


$output = Convert::seconds(
(47*(60**2)) + (59*60) + 59
(47 * (60 ** 2)) + (59 * 60) + 59
);
$this->assertEquals('1D 23:59:59', $output);
$this->assertIsString($output);
Expand Down

0 comments on commit adbe553

Please sign in to comment.