Use assertStringContainsString for asserting strings

Author: Naktibalda

src/Codeception/Module/REST.php

@@ -750,7 +750,7 @@ public function seeResponseIsJson()
      */
     public function seeResponseContains($text)
     {
-        $this->assertContains($text, $this->connectionModule->_getResponseContent(), "REST response contains");
+        $this->assertStringContainsString($text, $this->connectionModule->_getResponseContent(), "REST response contains");
     }
 
     /**
@@ -762,7 +762,7 @@ public function seeResponseContains($text)
      */
     public function dontSeeResponseContains($text)
     {
-        $this->assertNotContains($text, $this->connectionModule->_getResponseContent(), "REST response contains");
+        $this->assertStringNotContainsString($text, $this->connectionModule->_getResponseContent(), "REST response contains");
     }
 
     /**
@@ -1347,7 +1347,7 @@ public function dontSeeXmlResponseEquals($xml)
      */
     public function seeXmlResponseIncludes($xml)
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             XmlUtils::toXml($xml)->C14N(),
             XmlUtils::toXml($this->connectionModule->_getResponseContent())->C14N(),
             "found in XML Response"
@@ -1364,7 +1364,7 @@ public function seeXmlResponseIncludes($xml)
      */
     public function dontSeeXmlResponseIncludes($xml)
     {
-        $this->assertNotContains(
+        $this->assertStringNotContainsString(
             XmlUtils::toXml($xml)->C14N(),
             XmlUtils::toXml($this->connectionModule->_getResponseContent())->C14N(),
             "found in XML Response"

tests/unit/Codeception/Util/JsonArrayTest.php

@@ -18,7 +18,7 @@ protected function _before()
 
     public function testXmlConversion()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ticket><title>Bug should be fixed</title><user><name>Davert</name></user><labels></labels></ticket>',
             $this->jsonArray->toXml()->saveXML()
         );
@@ -30,7 +30,7 @@ public function testXmlArrayConversion2()
             '[{"user":"Blacknoir","age":27,"tags":["wed-dev","php"]},'
             . '{"user":"John Doe","age":27,"tags":["web-dev","java"]}]'
         );
-        $this->assertContains('<tags>wed-dev</tags>', $jsonArray->toXml()->saveXML());
+        $this->assertStringContainsString('<tags>wed-dev</tags>', $jsonArray->toXml()->saveXML());
         $this->assertEquals(2, $jsonArray->filterByXPath('//user')->length);
     }
 
@@ -76,7 +76,7 @@ public function testInvalidXmlTag()
         $jsonArray = new JsonArray('{"a":{"foo/bar":1,"":2},"b":{"foo/bar":1,"":2},"baz":2}');
         $expectedXml = '<a><invalidTag1>1</invalidTag1><invalidTag2>2</invalidTag2></a>'
             . '<b><invalidTag1>1</invalidTag1><invalidTag2>2</invalidTag2></b><baz>2</baz>';
-        $this->assertContains($expectedXml, $jsonArray->toXml()->saveXML());
+        $this->assertStringContainsString($expectedXml, $jsonArray->toXml()->saveXML());
     }
 
     public function testConvertsArrayHavingSingleElement()

tests/unit/Codeception/Util/JsonTypeTest.php

@@ -35,14 +35,14 @@ public function testNotMatchesBasicType()
     {
         $this->data['in_reply_to_screen_name'] = true;
         $jsonType = new JsonType($this->data);
-        $this->assertContains('`in_reply_to_screen_name: true` is of type', $jsonType->matches($this->types));
+        $this->assertStringContainsString('`in_reply_to_screen_name: true` is of type', $jsonType->matches($this->types));
     }
 
     public function testIntegerFilter()
     {
         $jsonType = new JsonType($this->data);
-        $this->assertContains('`id: 11` is of type', $jsonType->matches(['id' => 'integer:<5']));
-        $this->assertContains('`id: 11` is of type', $jsonType->matches(['id' => 'integer:>15']));
+        $this->assertStringContainsString('`id: 11` is of type', $jsonType->matches(['id' => 'integer:<5']));
+        $this->assertStringContainsString('`id: 11` is of type', $jsonType->matches(['id' => 'integer:>15']));
         $this->assertTrue($jsonType->matches(['id' => 'integer:=11']));
         $this->assertTrue($jsonType->matches(['id' => 'integer:>5']));
         $this->assertTrue($jsonType->matches(['id' => 'integer:>5:<12']));
@@ -195,8 +195,8 @@ public function testCollection()
             'id' => 'integer:<3'
         ]));
 
-        $this->assertContains('3` is of type `integer:<3', $res);
-        $this->assertContains('5` is of type `integer:<3', $res);
+        $this->assertStringContainsString('3` is of type `integer:<3', $res);
+        $this->assertStringContainsString('5` is of type `integer:<3', $res);
     }
 
     /**