move trim type constants to TrimParser, add tests for all trim types,…

… remove TrimType
mpscholten · Feb 17, 2017 · c5b1e15 · c5b1e15
1 parent 2d21825
commit c5b1e15
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/src/StringParser.php b/src/StringParser.php
@@ -56,16 +56,16 @@ public function email()
 
     public function trim()
     {
-        return new TrimParser($this->config, $this->name, $this->value, TrimType::TRIM);
+        return new TrimParser($this->config, $this->name, $this->value, TrimParser::TRIM);
     }
 
     public function leftTrim()
     {
-        return new TrimParser($this->config, $this->name, $this->value, TrimType::LEFT_TRIM);
+        return new TrimParser($this->config, $this->name, $this->value, TrimParser::LEFT_TRIM);
     }
 
     public function rightTrim()
     {
-        return new TrimParser($this->config, $this->name, $this->value, TrimType::RIGHT_TRIM);
+        return new TrimParser($this->config, $this->name, $this->value, TrimParser::RIGHT_TRIM);
     }
 }
diff --git a/src/TrimParser.php b/src/TrimParser.php
@@ -4,6 +4,10 @@
 
 class TrimParser extends AbstractValueParser
 {
+    const TRIM = 'trim';
+    const LEFT_TRIM = 'left_trim';
+    const RIGHT_TRIM = 'right_trim';
+
     private $trimType;
 
     public function __construct(Config $config, $name, $value, $trimType)
@@ -19,11 +23,11 @@ protected function describe()
 
     protected function parse($value)
     {
-        if ($this->trimType === TrimType::TRIM) {
+        if ($this->trimType === self::TRIM) {
             return trim((string) $value);
-        } elseif ($this->trimType === TrimType::LEFT_TRIM) {
+        } elseif ($this->trimType === self::LEFT_TRIM) {
             return ltrim((string) $value);
-        } elseif ($this->trimType === TrimType::RIGHT_TRIM) {
+        } elseif ($this->trimType === self::RIGHT_TRIM) {
             return rtrim((string) $value);
         }
         return (string) $value;

diff --git a/src/TrimType.php b/src/TrimType.php
diff --git a/tests/ParserSpecTest.php b/tests/ParserSpecTest.php
@@ -14,7 +14,6 @@
 use MPScholten\RequestParser\StringParser;
 use MPScholten\RequestParser\EmailParser;
 use MPScholten\RequestParser\UrlParser;
-use MPScholten\RequestParser\TrimType;
 use MPScholten\RequestParser\TrimParser;
 
 class ParserSpecTest extends \PHPUnit_Framework_TestCase
@@ -47,7 +46,9 @@ public function specWithValueAndDefaultValue()
             [new StringParser(new Config(), 'name', 'quintly'), '', 'quintly'],
             [new UrlParser(new Config(), 'referrer', 'https://www.quintly.com/'), 'https://www.quintly.com/blog/', 'https://www.quintly.com/'],
             [new EmailParser(new Config(), 'emailAddress', '[email protected]'), '', '[email protected]'],
-            [new TrimParser(new Config(), 'emailAddress', '  [email protected]  ', TrimType::TRIM), '', '[email protected]'],
+            [new TrimParser(new Config(), 'emailAddress', '  [email protected]  ', TrimParser::TRIM), '', '[email protected]'],
+            [new TrimParser(new Config(), 'emailAddress', '  [email protected]', TrimParser::LEFT_TRIM), '', '[email protected]'],
+            [new TrimParser(new Config(), 'emailAddress', '[email protected]  ', TrimParser::RIGHT_TRIM), '', '[email protected]'],
             [new OneOfParser(new Config(), 'type', 'a', ['a', 'b']), 'b', 'a'],
             [new DateTimeParser(new Config(), 'createdAt', '2015-02-02'), new \DateTime('2015-01-01'), new \DateTime('2015-02-02')],
             [new JsonParser(new Config(), 'config', '{"value":false}'), ['value' => true], ['value' => false]]

diff --git a/tests/TypeSpecTest.php b/tests/TypeSpecTest.php
@@ -64,6 +64,18 @@ public function testTrim()
         $this->assertInstanceOf(TrimParser::class, $spec->string()->trim());
     }
 
+    public function testLeftTrim()
+    {
+        $spec = new TypeParser(new Config(), 'emailAddress', '   [email protected]');
+        $this->assertInstanceOf(TrimParser::class, $spec->string()->leftTrim());
+    }
+
+    public function testRightTrim()
+    {
+        $spec = new TypeParser(new Config(), 'emailAddress', '[email protected]   ');
+        $this->assertInstanceOf(TrimParser::class, $spec->string()->rightTrim());
+    }
+
     public function testOneOf()
     {
         $spec = new TypeParser(new Config(), 'type', 'b');