From 1602441b22f19a999ed5e78f52621e24f71a191c Mon Sep 17 00:00:00 2001 From: Tobias Weichart Date: Fri, 2 Aug 2019 08:37:57 +0100 Subject: [PATCH] [PhpUnitBridge] added polyfill for assertStringContainsString*() --- .../Legacy/ForwardCompatTestTraitForV5.php | 47 +++++++++++++------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php index ac76f95f2f..994a83d3d2 100644 --- 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 @@ trait ForwardCompatTestTraitForV5 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 @@ trait ForwardCompatTestTraitForV5 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 @@ trait ForwardCompatTestTraitForV5 } /** + * @param int|string $code + * * @return void */ public function expectExceptionCode($code) @@ -315,7 +332,7 @@ trait ForwardCompatTestTraitForV5 $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 @@ trait ForwardCompatTestTraitForV5 $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 @@ trait ForwardCompatTestTraitForV5 $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); } }