minor #32878 [PhpUnitBridge] added polyfill for assertStringContainsString*() (Tobias Weichart)

nicolas-grekas · nicolas-grekas · commit d01ec68bd9bd · 2019-08-03T17:04:24.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] added polyfill for assertStringContainsString*() | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32844 | License | MIT | Doc PR | - this PR provides a polyfill for methods assertStringContainsString and assertStringContainsStringIgnoringCase in preparation for the PHPUnit 9 deprecations. PR follows the pattern of [this PR](#32869), hence the PR to master Commits ------- 1602441 [PhpUnitBridge] added polyfill for assertStringContainsString*()
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use PHPUnit\Framework\Constraint\StringContains;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -51,33 +52,21 @@ protected function tearDown()
         self::doTearDown();
     }
 
-    /**
-     * @return void
-     */
     private static function doSetUpBeforeClass()
     {
         parent::setUpBeforeClass();
     }
 
-    /**
-     * @return void
-     */
     private static function doTearDownAfterClass()
     {
         parent::tearDownAfterClass();
     }
 
-    /**
-     * @return void
-     */
     private function doSetUp()
     {
         parent::setUp();
     }
 
-    /**
-     * @return void
-     */
     private function doTearDown()
     {
         parent::tearDown();
@@ -233,6 +222,32 @@ public static function assertIsIterable($actual, $message = '')
         static::assertInternalType('iterable', $actual, $message);
     }
 
+    /**
+     * @param string $needle
+     * @param string $haystack
+     * @param string $message
+     *
+     * @return void
+     */
+    public static function assertStringContainsString($needle, $haystack, $message = '')
+    {
+        $constraint = new StringContains($needle, false);
+        static::assertThat($haystack, $constraint, $message);
+    }
+
+    /**
+     * @param string $needle
+     * @param string $haystack
+     * @param string $message
+     *
+     * @return void
+     */
+    public static function assertStringContainsStringIgnoringCase($needle, $haystack, $message = '')
+    {
+        $constraint = new StringContains($needle, true);
+        static::assertThat($haystack, $constraint, $message);
+    }
+
     /**
      * @param string $message
      *
@@ -303,6 +318,8 @@ public function expectException($exception)
     }
 
     /**
+     * @param int|string $code
+     *
      * @return void
      */
     public function expectExceptionCode($code)
@@ -315,7 +332,7 @@ public function expectExceptionCode($code)
 
         $property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionCode');
         $property->setAccessible(true);
-        $property->setValue($this, $exception);
+        $property->setValue($this, $code);
     }
 
     /**
@@ -333,7 +350,7 @@ public function expectExceptionMessage($message)
 
         $property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionMessage');
         $property->setAccessible(true);
-        $property->setValue($this, $exception);
+        $property->setValue($this, $message);
     }
 
     /**
@@ -351,6 +368,6 @@ public function expectExceptionMessageRegExp($messageRegExp)
 
         $property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionMessageRegExp');
         $property->setAccessible(true);
-        $property->setValue($this, $exception);
+        $property->setValue($this, $messageRegExp);
     }
 }
