From 81d70c81f863a53fcbd3d418d7e6578c5e360855 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Mon, 6 Apr 2020 16:16:04 -0700 Subject: [PATCH] Bumped minimum phpunit version to 9.1 and fixed deprecation warnings --- composer.json | 2 +- composer.lock | 183 ++++++++++++++++++--- tests/Controllers/SearchControllerTest.php | 6 +- tests/TemporaryFileTest.php | 2 +- 4 files changed, 165 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index 5359793..4e803ca 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.3", "johnkary/phpunit-speedtrap": "^3.2", - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^9.1", "psy/psysh": "^0.10", "vimeo/psalm": "^3.6" }, diff --git a/composer.lock b/composer.lock index fe4b972..12455b5 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": "f042f93618b1656473c06ddb772d3155", + "content-hash": "3e0a1a732068e697d1183c2c359466ae", "packages": [ { "name": "erusev/parsedown", @@ -627,6 +627,16 @@ "ioc", "psr11" ], + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/php-di/php-di", + "type": "tidelift" + } + ], "time": "2020-04-06T09:54:49+00:00" }, { @@ -1420,6 +1430,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -1478,6 +1502,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -1537,6 +1575,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -1593,6 +1645,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -1645,6 +1711,20 @@ "polyfill", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-02T11:55:35+00:00" }, { @@ -1722,6 +1802,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -1854,6 +1948,20 @@ "debug", "dump" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -1913,6 +2021,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -2089,22 +2211,28 @@ "env", "environment" ], + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-03-27T23:37:15+00:00" } ], "packages-dev": [ { "name": "amphp/amp", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4" + "reference": "feca077369a47263b22156b3c6389e55f3809f24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/2ac3b550c4997f2ec304faa63c8b2885079a2dc4", - "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4", + "url": "https://api.github.com/repos/amphp/amp/zipball/feca077369a47263b22156b3c6389e55f3809f24", + "reference": "feca077369a47263b22156b3c6389e55f3809f24", "shasum": "" }, "require": { @@ -2114,14 +2242,15 @@ "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "ext-json": "*", - "phpstan/phpstan": "^0.8.5", + "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^6.0.9 | ^7", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.9@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2168,20 +2297,20 @@ "non-blocking", "promise" ], - "time": "2020-02-10T18:10:57+00:00" + "time": "2020-04-04T15:05:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.7.2", + "version": "v1.7.3", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832" + "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/1e52f1752b2e20e2a7e464476ef887a2388e3832", - "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/b867505edb79dda8f253ca3c3a2bbadae4b16592", + "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592", "shasum": "" }, "require": { @@ -2191,10 +2320,16 @@ "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "friendsofphp/php-cs-fixer": "^2.3", - "infection/infection": "^0.9.3", - "phpunit/phpunit": "^6" + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "vimeo/psalm": "^3.9@dev" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { "Amp\\ByteStream\\": "lib" @@ -2227,7 +2362,7 @@ "non-blocking", "stream" ], - "time": "2020-01-29T18:22:23+00:00" + "time": "2020-04-04T16:56:54+00:00" }, { "name": "composer/semver", @@ -2369,20 +2504,21 @@ }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5eb79f3dbdffed6544e1fc287572c0f462bd29bb", + "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb", "shasum": "" }, "require": { "doctrine/lexer": "1.*", + "ext-tokenizer": "*", "php": "^7.1" }, "require-dev": { @@ -2392,7 +2528,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -2433,7 +2569,7 @@ "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "time": "2020-04-02T12:33:25+00:00" }, { "name": "doctrine/instantiator", @@ -5490,5 +5626,6 @@ "ext-fileinfo": "*", "ext-zip": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/tests/Controllers/SearchControllerTest.php b/tests/Controllers/SearchControllerTest.php index 33ff00c..f51587d 100644 --- a/tests/Controllers/SearchControllerTest.php +++ b/tests/Controllers/SearchControllerTest.php @@ -29,7 +29,7 @@ class SearchControllerTest extends TestCase $this->assertInstanceOf(ResponseInterface::class, $response); $this->assertEquals(200, $response->getStatusCode()); - $this->assertNotRegExp('/No results found/', (string) $response->getBody()); + $this->assertDoesNotMatchRegularExpression('/No results found/', (string) $response->getBody()); } public function test_it_returns_no_results_found_when_there_are_no_results(): void @@ -48,7 +48,7 @@ class SearchControllerTest extends TestCase $this->assertInstanceOf(ResponseInterface::class, $response); $this->assertEquals(200, $response->getStatusCode()); - $this->assertRegExp('/No results found/', (string) $response->getBody()); + $this->assertMatchesRegularExpression('/No results found/', (string) $response->getBody()); } public function test_it_returns_no_results_found_for_a_blank_search(): void @@ -67,6 +67,6 @@ class SearchControllerTest extends TestCase $this->assertInstanceOf(ResponseInterface::class, $response); $this->assertEquals(200, $response->getStatusCode()); - $this->assertRegExp('/No results found/', (string) $response->getBody()); + $this->assertMatchesRegularExpression('/No results found/', (string) $response->getBody()); } } diff --git a/tests/TemporaryFileTest.php b/tests/TemporaryFileTest.php index 4add98d..e306df4 100644 --- a/tests/TemporaryFileTest.php +++ b/tests/TemporaryFileTest.php @@ -32,6 +32,6 @@ class TemporaryFileTest extends TestCase unset($tempFile); - $this->assertFileNotExists($filePath); + $this->assertFileDoesNotExist($filePath); } }