From fadf4797300c394082ac254a66d81a7eda9e473f Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Sat, 21 Mar 2026 17:30:15 +0100 Subject: [PATCH] use yoast/phpunit-polyfills --- composer.json | 3 ++- tests/Renderer/BinaryRendererTest.php | 36 ++++++++------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index 7474b89..86286da 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,8 @@ "phpstan/phpstan": "^0.12.0", "phpunit/phpunit": "^7.0|^8.0|^9.0", "matthiasnoback/symfony-config-test": "^4.1|^5.2|^6.1", - "symplify/easy-coding-standard": "^9.0" + "symplify/easy-coding-standard": "^9.0", + "yoast/phpunit-polyfills": "^3.0" }, "scripts": { "cs-check": "vendor/bin/ecs check tests src", diff --git a/tests/Renderer/BinaryRendererTest.php b/tests/Renderer/BinaryRendererTest.php index f07244a..c4e0c58 100644 --- a/tests/Renderer/BinaryRendererTest.php +++ b/tests/Renderer/BinaryRendererTest.php @@ -4,16 +4,19 @@ use NotFloran\MjmlBundle\Renderer\BinaryRenderer; use NotFloran\MjmlBundle\Tests\AbstractTestCase; +use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains; class BinaryRendererTest extends AbstractTestCase { + use AssertStringContains; + public function testBasicRender() { $renderer = new BinaryRenderer($this->getMjmlBinary(), false, 'strict'); $html = $renderer->render(file_get_contents(__DIR__.'/../fixtures/basic.mjml')); - $this->assertStringContains('html', $html); - $this->assertStringContains('Hello Floran from MJML and Symfony', $html); + self::assertStringContainsString('html', $html); + self::assertStringContainsString('Hello Floran from MJML and Symfony', $html); } public function testInvalidRender() @@ -29,7 +32,7 @@ public function testInvalidRenderWithSkipValidationLevel() $renderer = new BinaryRenderer($this->getMjmlBinary(), false, 'skip'); $html = $renderer->render(file_get_contents(__DIR__.'/../fixtures/invalid.mjml')); - $this->assertStringContains('html', $html); + self::assertStringContainsString('html', $html); } public function testInvalidRenderWithSoftValidationLevel() @@ -37,7 +40,7 @@ public function testInvalidRenderWithSoftValidationLevel() $renderer = new BinaryRenderer($this->getMjmlBinary(), false, 'soft'); $html = $renderer->render(file_get_contents(__DIR__.'/../fixtures/invalid.mjml')); - $this->assertStringContains('html', $html); + self::assertStringContainsString('html', $html); } public function testBinaryNotFound() @@ -53,7 +56,7 @@ public function testUseNode() $renderer = new BinaryRenderer($this->getMjmlBinary(), false, 'strict', $this->getNode()); $html = $renderer->render(file_get_contents(__DIR__.'/../fixtures/basic.mjml')); - $this->assertStringContains('html', $html); + self::assertStringContainsString('html', $html); } /** @@ -64,8 +67,8 @@ public function testUseMjmlVersion(int $mjmlVersion) $renderer = new BinaryRenderer($this->getMjmlBinary(), false, 'strict', null, $mjmlVersion); $html = $renderer->render(file_get_contents(__DIR__.'/../fixtures/basic.mjml')); - $this->assertStringContains('html', $html); - $this->assertStringContains('Hello Floran from MJML and Symfony', $html); + self::assertStringContainsString('html', $html); + self::assertStringContainsString('Hello Floran from MJML and Symfony', $html); } public function mjmlVersionDataProvider() @@ -73,23 +76,4 @@ public function mjmlVersionDataProvider() yield ['old version' => 3]; yield ['actual version' => 4]; } - - /** - * Allow to use PHPUnit < and > 9. - * - * @param $needle - * @param $haystack - * - * @return void - */ - public function assertStringContains($needle, $haystack) - { - if (method_exists($this, 'assertStringContainsString')) { - parent::assertStringContainsString($needle, $haystack); - - return; - } - - $this->assertContains($needle, $haystack); - } }