Merge pull request #31 from Ingewikkeld/null-value-handling

make StripHtml and Trim return a null value if a null value is passed to it
particle-php · Jun 30, 2015 · dc448b0 · dc448b0
2 parents 57fe150 + 27f1bbc
commit dc448b0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/FilterRule/StripHtml.php b/src/FilterRule/StripHtml.php
@@ -40,6 +40,10 @@ public function __construct($excludeTags = null)
      */
     public function filter($value)
     {
+        if ($value === null) {
+            return $value;
+        }
+
         return strip_tags($value, $this->excludeTags);
     }
 }
diff --git a/src/FilterRule/Trim.php b/src/FilterRule/Trim.php
@@ -40,6 +40,10 @@ public function __construct($characters = null)
      */
     public function filter($value)
     {
+        if ($value === null) {
+            return $value;
+        }
+
         if ($this->characters === null) {
             return trim($value);
         }

diff --git a/tests/FilterRule/StripHtmlTest.php b/tests/FilterRule/StripHtmlTest.php
@@ -32,7 +32,7 @@ public function testStripHtmlFilterRule($value, $excludeTags, $filteredValue)
             'test' => $value
         ]);
 
-        $this->assertEquals($filteredValue, $result['test']);
+        $this->assertSame($filteredValue, $result['test']);
     }
 
     /**
@@ -44,6 +44,7 @@ public function getStripHtmlResults()
             ['', '', ''],
             ['<p><strong>t</strong>ext</p>', null, 'text'],
             ['<p><strong>t</strong>ext</p>', '<p>', '<p>text</p>'],
+            [null, null, null],
         ];
     }
 }
diff --git a/tests/FilterRule/TrimTest.php b/tests/FilterRule/TrimTest.php
@@ -36,7 +36,7 @@ public function testTrimFilterRule($value, $filteredValue, $characters)
             'test' => $value
         ]);
 
-        $this->assertEquals($filteredValue, $result['test']);
+        $this->assertSame($filteredValue, $result['test']);
     }
 
     /**
@@ -54,6 +54,7 @@ public function getTrimResults()
             ['   abc      ', 'abc', null],
             ['  !~! ', '!~!', null],
             ['	 tabtab 	', ' tabtab ', "\t"],
+            [null, null, null],
         ];
     }
 }