Merge branch 'master' of github.com:BrandEmbassy/query-language-parser

BrandEmbassy · May 15, 2021 · 1cecb7f · 1cecb7f
2 parents 2e03713 + d5920b2
commit 1cecb7f
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 5 deletions.
diff --git a/examples/Car/QueryLanguage/CarColorQueryLanguageField.php b/examples/Car/QueryLanguage/CarColorQueryLanguageField.php
@@ -8,7 +8,7 @@
 use BrandEmbassy\QueryLanguageParser\Operator\EqualTo\QueryLanguageFieldSupportingEqualToOperator;
 use BrandEmbassy\QueryLanguageParser\Operator\In\QueryLanguageFieldSupportingInOperator;
 use BrandEmbassy\QueryLanguageParser\Operator\IsNotNull\QueryLanguageFieldSupportingIsNotNullOperator;
-use BrandEmbassy\QueryLanguageParser\Operator\IsNull\QueryLanguageFieldSupportIsNullOperator;
+use BrandEmbassy\QueryLanguageParser\Operator\IsNull\QueryLanguageFieldSupportingIsNullOperator;
 use BrandEmbassy\QueryLanguageParser\Operator\NotEqualTo\QueryLanguageFieldSupportingNotEqualToOperator;
 use BrandEmbassy\QueryLanguageParser\Operator\NotIn\QueryLanguageFieldSupportingNotInOperator;
 use BrandEmbassy\QueryLanguageParser\Value\MultipleValuesExpressionParserCreator;
@@ -22,7 +22,7 @@ final class CarColorQueryLanguageField
     QueryLanguageFieldSupportingNotEqualToOperator,
     QueryLanguageFieldSupportingInOperator,
     QueryLanguageFieldSupportingNotInOperator,
-    QueryLanguageFieldSupportIsNullOperator,
+    QueryLanguageFieldSupportingIsNullOperator,
     QueryLanguageFieldSupportingIsNotNullOperator
 {
     public function getFieldIdentifier(): string

diff --git a/src/Operator/IsNull/IsNullQueryLanguageOperator.php b/src/Operator/IsNull/IsNullQueryLanguageOperator.php
@@ -32,13 +32,13 @@ public function createOperatorParser(): MonoParser
 
     public function isFieldSupported(QueryLanguageField $field): bool
     {
-        return $field instanceof QueryLanguageFieldSupportIsNullOperator;
+        return $field instanceof QueryLanguageFieldSupportingIsNullOperator;
     }
 
 
     public function createFieldExpressionParser(QueryLanguageField $field): MonoParser
     {
-        assert($field instanceof QueryLanguageFieldSupportIsNullOperator);
+        assert($field instanceof QueryLanguageFieldSupportingIsNullOperator);
 
         return new ConcParser(
             [

diff --git a/...eryLanguageFieldSupportIsNullOperator.php → ...LanguageFieldSupportingIsNullOperator.php b/...eryLanguageFieldSupportIsNullOperator.php → ...LanguageFieldSupportingIsNullOperator.php
@@ -4,7 +4,7 @@
 
 use BrandEmbassy\QueryLanguageParser\Field\QueryLanguageField;
 
-interface QueryLanguageFieldSupportIsNullOperator extends QueryLanguageField
+interface QueryLanguageFieldSupportingIsNullOperator extends QueryLanguageField
 {
     /**
      * @param mixed $fieldName output of field name parser

diff --git a/src/Value/TextValueParserCreator.php b/src/Value/TextValueParserCreator.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace BrandEmbassy\QueryLanguageParser\Value;
+
+use Ferno\Loco\GrammarException;
+use Ferno\Loco\MonoParser;
+use Ferno\Loco\RegexParser;
+use Nette\StaticClass;
+use function str_replace;
+
+final class TextValueParserCreator
+{
+    use StaticClass;
+
+    public const TEXT_VALUE_PARSER = '/^(["]{1}[^"]+["]{1})|([\']{1}[^\']+[\']{1})/';
+
+
+    /**
+     * @throws GrammarException
+     */
+    public static function create(): MonoParser
+    {
+        return new RegexParser(
+            self::TEXT_VALUE_PARSER,
+            static function ($value): string {
+                return str_replace(['"', '\''], '', (string)$value);
+            }
+        );
+    }
+}
diff --git a/src/Value/TextValueParserCreatorTest.php b/src/Value/TextValueParserCreatorTest.php
@@ -0,0 +1,71 @@
+<?php declare(strict_types = 1);
+
+namespace BrandEmbassy\QueryLanguageParser\Value;
+
+use Ferno\Loco\ParseFailureException;
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
+
+final class TextValueParserCreatorTest extends TestCase
+{
+    /**
+     * @dataProvider validTextValueProvider
+     */
+    public function testParsingValidTextValue(string $expectedParsedResult, string $valueToParse): void
+    {
+        $parser = TextValueParserCreator::create();
+
+        $actualValue = $parser->parse($valueToParse);
+
+        Assert::assertSame($expectedParsedResult, $actualValue);
+    }
+
+
+    /**
+     * @return string[][]
+     */
+    public function validTextValueProvider(): array
+    {
+        return [
+            [
+                'expectedParsedResult' => 'hello world',
+                'valueToParse' => '"hello world"',
+            ],
+            [
+                'expectedParsedResult' => 'foobar',
+                'valueToParse' => '\'foobar\'',
+            ],
+            [
+                'expectedParsedResult' => '1234',
+                'valueToParse' => '"1234"',
+            ],
+        ];
+    }
+
+
+    /**
+     * @dataProvider invalidTextValueProvider
+     */
+    public function testParsingInvalidTextValue(string $valueToParse): void
+    {
+        $parser = TextValueParserCreator::create();
+
+        $this->expectException(ParseFailureException::class);
+
+        $parser->parse($valueToParse);
+    }
+
+
+    /**
+     * @return string[][]
+     */
+    public function invalidTextValueProvider(): array
+    {
+        return [
+            ['valueToParse' => 'hello world'],
+            ['valueToParse' => '"foo bar'],
+            ['valueToParse' => 'foo bar\''],
+            ['valueToParse' => '"foo bar\''],
+        ];
+    }
+}