Merge pull request #20 from jakobbuis/feature/fix-string-contains-war…

…nings Fix PHPUnit warning with using assertContains on strings
stevegrunwell · May 17, 2020 · d79e2c4 · d79e2c4
2 parents 2f8890b + 8655ff6
commit d79e2c4
Showing 1 changed file with 27 additions and 10 deletions.
diff --git a/src/MarkupAssertionsTrait.php b/src/MarkupAssertionsTrait.php
@@ -114,11 +114,19 @@ public function assertNotHasElementWithAttributes($attributes = [], $output = ''
      */
     public function assertElementContains($contents, $selector = '', $output = '', $message = '')
     {
-        $this->assertContains(
-            $contents,
-            $this->getInnerHtmlOfMatchedElements($output, $selector),
-            $message
-        );
+        if (method_exists($this, 'assertStringContainsString')) {
+            $this->assertStringContainsString(
+                $contents,
+                $this->getInnerHtmlOfMatchedElements($output, $selector),
+                $message
+            );
+        } else {
+            $this->assertContains(
+                $contents,
+                $this->getInnerHtmlOfMatchedElements($output, $selector),
+                $message
+            );
+        }
     }
 
     /**
@@ -133,11 +141,20 @@ public function assertElementContains($contents, $selector = '', $output = '', $
      */
     public function assertElementNotContains($contents, $selector = '', $output = '', $message = '')
     {
-        $this->assertNotContains(
-            $contents,
-            $this->getInnerHtmlOfMatchedElements($output, $selector),
-            $message
-        );
+        if (method_exists($this, 'assertStringNotContainsString')) {
+            $this->assertStringNotContainsString(
+                $contents,
+                $this->getInnerHtmlOfMatchedElements($output, $selector),
+                $message
+            );
+        }
+        else {
+            $this->assertNotContains(
+                $contents,
+                $this->getInnerHtmlOfMatchedElements($output, $selector),
+                $message
+            );
+        }
     }
 
     /**