aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Parsers/IntegerParser.php6
-rw-r--r--src/Parsers/StringParser.php10
-rw-r--r--tests/Parsers/IntegerParserTest.php4
-rw-r--r--tests/Parsers/StringParserTest.php2
4 files changed, 7 insertions, 15 deletions
diff --git a/src/Parsers/IntegerParser.php b/src/Parsers/IntegerParser.php
index 95df2dd..3eb4ea1 100644
--- a/src/Parsers/IntegerParser.php
+++ b/src/Parsers/IntegerParser.php
@@ -28,9 +28,9 @@ final class IntegerParser {
/**
* @param mixed $value
*
- * @return int|null
+ * @return int
*/
- public static function get($value): ?int {
- return filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE);
+ public static function get($value): int {
+ return filter_var($value, FILTER_VALIDATE_INT);
}
}
diff --git a/src/Parsers/StringParser.php b/src/Parsers/StringParser.php
index 1bc7a60..c22d8f1 100644
--- a/src/Parsers/StringParser.php
+++ b/src/Parsers/StringParser.php
@@ -19,8 +19,6 @@ declare(strict_types = 1);
namespace EPGService\Parsers;
-use function is_string;
-
/**
* @copyright Copyright © 2020 “Valentin Popov” <info@valentineus.link>
* @license http://www.apache.org/licenses/LICENSE-2.0
@@ -30,11 +28,9 @@ final class StringParser {
/**
* @param $value
*
- * @return string|null
+ * @return string
*/
- public static function get($value): ?string {
- $result = filter_var($value, FILTER_SANITIZE_STRING, FILTER_NULL_ON_FAILURE);
-
- return is_string($result) ? trim($result) : null;
+ public static function get($value): string {
+ return filter_var($value, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
}
}
diff --git a/tests/Parsers/IntegerParserTest.php b/tests/Parsers/IntegerParserTest.php
index 7f5cce7..56c13ce 100644
--- a/tests/Parsers/IntegerParserTest.php
+++ b/tests/Parsers/IntegerParserTest.php
@@ -29,10 +29,6 @@ use PHPUnit\Framework\TestCase;
* @package Tests\Parsers
*/
final class IntegerParserTest extends TestCase {
- public function testInvalid(): void {
- self::assertNull(IntegerParser::get(null));
- }
-
public function testValid(): void {
$number = Faker::create()->numberBetween(100, 200);
self::assertEquals($number, IntegerParser::get((string) $number));
diff --git a/tests/Parsers/StringParserTest.php b/tests/Parsers/StringParserTest.php
index 518defb..5c1a82b 100644
--- a/tests/Parsers/StringParserTest.php
+++ b/tests/Parsers/StringParserTest.php
@@ -29,7 +29,7 @@ use PHPUnit\Framework\TestCase;
*/
final class StringParserTest extends TestCase {
public function testValid(): void {
- $string = '<h1>Hello WorldÆØÅ!</h1>';
+ $string = '<h1>Hello World!</h1>';
self::assertEquals('Hello World!', StringParser::get($string));
}
}