From 67447abdd0c3b96b056419ed52c37903df51ac0e Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Sat, 10 Apr 2021 18:58:46 -0700 Subject: [PATCH] Enabled phpunit polyfills --- composer.json | 4 +- composer.lock | 94 ++++++++++++++++++++++++++++++++++++++-------- tests/TestCase.php | 4 +- 3 files changed, 82 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 2ee09d1..bccda55 100644 --- a/composer.json +++ b/composer.json @@ -38,10 +38,10 @@ "friendsofphp/php-cs-fixer": "^2.3", "johnkary/phpunit-speedtrap": "^3.2", "phlak/coding-standards": "^1.1", - "phpunit/phpunit": "^8.0 || ~9.0 <9.5", "psy/psysh": "^0.10", "symfony/var-dumper": "^5.0", - "vimeo/psalm": "^4.3" + "vimeo/psalm": "^4.3", + "yoast/phpunit-polyfills": "^0.2.0" }, "suggest": { "ext-apcu": "Required to use the APCu cache driver", diff --git a/composer.lock b/composer.lock index 1e905c5..78df575 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "35dc2af14f1a13efae64d07b146d247a", + "content-hash": "3e2471da9047c1459430acf13385c2ef", "packages": [ { "name": "erusev/parsedown", @@ -4719,16 +4719,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.4.4", + "version": "9.5.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e" + "reference": "c73c6737305e779771147af66c96ca6a7ed8a741" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6535e637961f0829832621dc1b7308c2d24a799e", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741", + "reference": "c73c6737305e779771147af66c96ca6a7ed8a741", "shasum": "" }, "require": { @@ -4744,7 +4744,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2", + "phpunit/php-code-coverage": "^9.2.3", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -4775,7 +4775,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.4-dev" + "dev-master": "9.5-dev" } }, "autoload": { @@ -4806,7 +4806,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4" }, "funding": [ { @@ -4818,7 +4818,7 @@ "type": "github" } ], - "time": "2020-12-01T04:58:47+00:00" + "time": "2021-03-23T07:16:29+00:00" }, { "name": "psr/event-dispatcher", @@ -4872,20 +4872,19 @@ }, { "name": "psy/psysh", - "version": "v0.10.7", + "version": "v0.10.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a395af46999a12006213c0c8346c9445eb31640c" + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c", - "reference": "a395af46999a12006213c0c8346c9445eb31640c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", @@ -4942,9 +4941,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" }, - "time": "2021-03-14T02:14:56+00:00" + "time": "2021-04-10T16:23:39+00:00" }, { "name": "sebastian/cli-parser", @@ -7159,6 +7158,69 @@ "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, "time": "2015-12-17T08:42:14+00:00" + }, + { + "name": "yoast/phpunit-polyfills", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", + "reference": "c48e4cf0c44b2d892540846aff19fb0468627bab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/c48e4cf0c44b2d892540846aff19fb0468627bab", + "reference": "c48e4cf0c44b2d892540846aff19fb0468627bab", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "require-dev": { + "php-parallel-lint/php-console-highlighter": "^0.5", + "php-parallel-lint/php-parallel-lint": "^1.2.0", + "yoast/yoastcs": "^2.1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev", + "dev-develop": "1.x-dev" + } + }, + "autoload": { + "files": [ + "phpunitpolyfills-autoload.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Team Yoast", + "email": "support@yoast.com", + "homepage": "https://yoast.com" + }, + { + "name": "Contributors", + "homepage": "https://github.com/Yoast/PHPUnit-Polyfills/graphs/contributors" + } + ], + "description": "Set of polyfills for changed PHPUnit functionality to allow for creating PHPUnit cross-version compatible tests", + "homepage": "https://github.com/Yoast/PHPUnit-Polyfills", + "keywords": [ + "phpunit", + "polyfill", + "testing" + ], + "support": { + "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", + "source": "https://github.com/Yoast/PHPUnit-Polyfills" + }, + "time": "2020-11-25T02:59:57+00:00" } ], "aliases": [], diff --git a/tests/TestCase.php b/tests/TestCase.php index 2fbb4c0..d2ea616 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -6,11 +6,11 @@ use App\Config; use DI\Container; use DI\ContainerBuilder; use Dotenv\Dotenv; -use PHPUnit\Framework\TestCase as PHPUnitTestCase; use Symfony\Component\Cache\Adapter\ArrayAdapter; use Symfony\Contracts\Cache\CacheInterface; +use Yoast\PHPUnitPolyfills\TestCases\TestCase as BaseTestCase; -class TestCase extends PHPUnitTestCase +class TestCase extends BaseTestCase { /** @var Container The test container */ protected $container;