Strings::contains null support

kapxapot · Feb 28, 2020 · f779603 · f779603
1 parent 60231b4
commit f779603
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Util/Strings.php b/src/Util/Strings.php
@@ -432,12 +432,16 @@ public static function trimEnd(string $str, string $end) : string
     /**
      * Checks if the string contains the mask.
      *
-     * @param string $str
+     * @param string|null $str
      * @param string $mask
      * @return boolean
      */
-    public static function contains(string $str, string $mask) : bool
+    public static function contains(?string $str, string $mask) : bool
     {
+        if (is_null($str)) {
+            return false;
+        }
+
         return strpos($str, $mask) !== false;
     }
 }
diff --git a/tests/Util/StringsTest.php b/tests/Util/StringsTest.php
@@ -217,12 +217,12 @@ public function trimEndProvider() : array
     /**
      * @dataProvider containsProvider
      *
-     * @param string $original
+     * @param string|null $original
      * @param string $mask
      * @param boolean $expected
      * @return void
      */
-    public function testContains(string $original, string $mask, bool $expected) : void
+    public function testContains(?string $original, string $mask, bool $expected) : void
     {
         $this->assertEquals(
             $expected,
@@ -243,6 +243,11 @@ public function containsProvider() : array
                 'sux',
                 false
             ],
+            [
+                null,
+                'sux',
+                false
+            ],
         ];
     }
 }