Merge branch '7.4' into 7.5

Author: sebastianbergmann

tests/unit/Framework/AssertTest.php

@@ -113,6 +113,20 @@ public function testAssertContainsEmptyStringInString(): void
         $this->assertContains('', 'test');
     }
 
+    public function testAssertStringContainsNonString(): void
+    {
+        $this->expectException(Exception::class);
+
+        $this->assertContains(null, '');
+    }
+
+    public function testAssertStringNotContainsNonString(): void
+    {
+        $this->expectException(Exception::class);
+
+        $this->assertNotContains(null, '');
+    }
+
     public function testAssertArrayHasKeyThrowsExceptionForInvalidFirstArgument(): void
     {
         $this->expectException(Exception::class);