Upgrade PHPUnit to v7

This commit is contained in:
PJ Dietz 2018-06-21 10:18:00 -04:00
parent cd9cc09afe
commit 04c7b100db
4 changed files with 104 additions and 157 deletions

View File

@ -18,7 +18,7 @@
"psr/http-server-middleware": "~1.0" "psr/http-server-middleware": "~1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6" "phpunit/phpunit": "^7"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

240
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a5dd658181aa761fd65b76469bed3998", "content-hash": "d2595b7145f9ead3d0bb778b41d664cc",
"packages": [ "packages": [
{ {
"name": "psr/http-message", "name": "psr/http-message",
@ -220,25 +220,28 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.7.0", "version": "1.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.6 || ^7.0" "php": "^7.1"
},
"replace": {
"myclabs/deep-copy": "self.version"
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "^1.0", "doctrine/collections": "^1.0",
"doctrine/common": "^2.6", "doctrine/common": "^2.6",
"phpunit/phpunit": "^4.1" "phpunit/phpunit": "^7.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -261,7 +264,7 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2017-10-19T19:58:43+00:00" "time": "2018-06-11T23:09:50+00:00"
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",
@ -519,23 +522,23 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "1.7.5", "version": "1.7.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0", "php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0", "sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0" "sebastian/recursion-context": "^1.0|^2.0|^3.0"
}, },
"require-dev": { "require-dev": {
@ -578,44 +581,44 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2018-02-19T10:16:54+00:00" "time": "2018-04-18T13:57:24+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "5.3.0", "version": "6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a",
"reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": "^7.0", "php": "^7.1",
"phpunit/php-file-iterator": "^1.4.2", "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-token-stream": "^2.0.1", "phpunit/php-token-stream": "^3.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1",
"sebastian/environment": "^3.0", "sebastian/environment": "^3.1",
"sebastian/version": "^2.0.1", "sebastian/version": "^2.0.1",
"theseer/tokenizer": "^1.1" "theseer/tokenizer": "^1.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^7.0"
}, },
"suggest": { "suggest": {
"ext-xdebug": "^2.5.5" "ext-xdebug": "^2.6.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.3.x-dev" "dev-master": "6.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -641,29 +644,29 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-12-06T09:29:45+00:00" "time": "2018-06-01T07:51:50+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
"version": "1.4.5", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c",
"reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": "^7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -678,7 +681,7 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
@ -688,7 +691,7 @@
"filesystem", "filesystem",
"iterator" "iterator"
], ],
"time": "2017-11-27T13:52:08+00:00" "time": "2018-06-11T11:44:00+00:00"
}, },
{ {
"name": "phpunit/php-text-template", "name": "phpunit/php-text-template",
@ -733,28 +736,28 @@
}, },
{ {
"name": "phpunit/php-timer", "name": "phpunit/php-timer",
"version": "1.0.9", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git", "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" "phpunit/phpunit": "^7.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "2.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -769,7 +772,7 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
@ -778,33 +781,33 @@
"keywords": [ "keywords": [
"timer" "timer"
], ],
"time": "2017-02-26T11:10:40+00:00" "time": "2018-02-01T13:07:23+00:00"
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",
"version": "2.0.2", "version": "3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git", "url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "791198a2c6254db10131eecfe8c06670700904db" "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
"reference": "791198a2c6254db10131eecfe8c06670700904db", "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.2.4" "phpunit/phpunit": "^7.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0-dev" "dev-master": "3.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -827,40 +830,40 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"time": "2017-11-27T05:48:46+00:00" "time": "2018-02-01T13:16:43+00:00"
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "6.5.7", "version": "7.2.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "6bd77b57707c236833d2b57b968e403df060c9d9" "reference": "00bc0b93f0ff4f557e9ea766557fde96da9a03dd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00bc0b93f0ff4f557e9ea766557fde96da9a03dd",
"reference": "6bd77b57707c236833d2b57b968e403df060c9d9", "reference": "00bc0b93f0ff4f557e9ea766557fde96da9a03dd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.1",
"ext-dom": "*", "ext-dom": "*",
"ext-json": "*", "ext-json": "*",
"ext-libxml": "*", "ext-libxml": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-xml": "*", "ext-xml": "*",
"myclabs/deep-copy": "^1.6.1", "myclabs/deep-copy": "^1.7",
"phar-io/manifest": "^1.0.1", "phar-io/manifest": "^1.0.1",
"phar-io/version": "^1.0", "phar-io/version": "^1.0",
"php": "^7.0", "php": "^7.1",
"phpspec/prophecy": "^1.7", "phpspec/prophecy": "^1.7",
"phpunit/php-code-coverage": "^5.3", "phpunit/php-code-coverage": "^6.0.7",
"phpunit/php-file-iterator": "^1.4.3", "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^1.0.9", "phpunit/php-timer": "^2.0",
"phpunit/phpunit-mock-objects": "^5.0.5", "sebastian/comparator": "^3.0",
"sebastian/comparator": "^2.1", "sebastian/diff": "^3.0",
"sebastian/diff": "^2.0",
"sebastian/environment": "^3.1", "sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1", "sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0", "sebastian/global-state": "^2.0",
@ -869,15 +872,15 @@
"sebastian/version": "^2.0.1" "sebastian/version": "^2.0.1"
}, },
"conflict": { "conflict": {
"phpdocumentor/reflection-docblock": "3.0.2", "phpunit/phpunit-mock-objects": "*"
"phpunit/dbunit": "<3.0"
}, },
"require-dev": { "require-dev": {
"ext-pdo": "*" "ext-pdo": "*"
}, },
"suggest": { "suggest": {
"ext-soap": "*",
"ext-xdebug": "*", "ext-xdebug": "*",
"phpunit/php-invoker": "^1.1" "phpunit/php-invoker": "^2.0"
}, },
"bin": [ "bin": [
"phpunit" "phpunit"
@ -885,7 +888,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "6.5.x-dev" "dev-master": "7.2-dev"
} }
}, },
"autoload": { "autoload": {
@ -911,66 +914,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-02-26T07:01:09+00:00" "time": "2018-06-05T03:40:05+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "5.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf",
"reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.5",
"php": "^7.0",
"phpunit/php-text-template": "^1.2.1",
"sebastian/exporter": "^3.1"
},
"conflict": {
"phpunit/phpunit": "<6.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5"
},
"suggest": {
"ext-soap": "*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Mock Object library for PHPUnit",
"homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
"keywords": [
"mock",
"xunit"
],
"time": "2018-01-06T05:45:45+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@ -1019,30 +963,30 @@
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",
"version": "2.1.3", "version": "3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git", "url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" "reference": "591a30922f54656695e59b1f39501aec513403da"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9", "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
"reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", "reference": "591a30922f54656695e59b1f39501aec513403da",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0", "php": "^7.1",
"sebastian/diff": "^2.0 || ^3.0", "sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1" "sebastian/exporter": "^3.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.4" "phpunit/phpunit": "^7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1.x-dev" "dev-master": "3.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -1079,32 +1023,33 @@
"compare", "compare",
"equality" "equality"
], ],
"time": "2018-02-01T13:46:46+00:00" "time": "2018-06-14T15:05:28+00:00"
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
"version": "2.0.1", "version": "3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/diff.git", "url": "https://github.com/sebastianbergmann/diff.git",
"reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" "reference": "366541b989927187c4ca70490a35615d3fef2dce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
"reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "reference": "366541b989927187c4ca70490a35615d3fef2dce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.2" "phpunit/phpunit": "^7.0",
"symfony/process": "^2 || ^3.3 || ^4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0-dev" "dev-master": "3.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -1129,9 +1074,12 @@
"description": "Diff implementation", "description": "Diff implementation",
"homepage": "https://github.com/sebastianbergmann/diff", "homepage": "https://github.com/sebastianbergmann/diff",
"keywords": [ "keywords": [
"diff" "diff",
"udiff",
"unidiff",
"unified diff"
], ],
"time": "2017-08-03T08:09:46+00:00" "time": "2018-06-10T07:54:39+00:00"
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",

View File

@ -7,7 +7,6 @@
convertWarningsToExceptions="true" convertWarningsToExceptions="true"
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false"
syntaxCheck="false"
verbose="true" verbose="true"
> >
<testsuites> <testsuites>
@ -24,6 +23,6 @@
</whitelist> </whitelist>
</filter> </filter>
<logging> <logging>
<log type="coverage-html" target="./public/coverage" charset="UTF-8" hightlight="true" /> <log type="coverage-html" target="./public/coverage" />
</logging> </logging>
</phpunit> </phpunit>

View File

@ -13,7 +13,7 @@ class ServerRequestTest extends TestCase
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Construction and Marshalling // Construction and Marshalling
/** @preserveGlobalState disabled */ /** @backupGlobals enabled */
public function testGetServerRequestReadsFromRequest() public function testGetServerRequestReadsFromRequest()
{ {
$_SERVER = [ $_SERVER = [
@ -39,7 +39,7 @@ class ServerRequestTest extends TestCase
// Marshalling Request Information // Marshalling Request Information
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider protocolVersionProvider * @dataProvider protocolVersionProvider
*/ */
public function testGetServerRequestReadsProtocolVersion($expectedProtocol, $serverProtocol) public function testGetServerRequestReadsProtocolVersion($expectedProtocol, $serverProtocol)
@ -64,7 +64,7 @@ class ServerRequestTest extends TestCase
} }
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider methodProvider * @dataProvider methodProvider
*/ */
public function testGetServerRequestReadsMethod($expectedMethod, $serverMethod) public function testGetServerRequestReadsMethod($expectedMethod, $serverMethod)
@ -90,7 +90,7 @@ class ServerRequestTest extends TestCase
} }
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider requestTargetProvider * @dataProvider requestTargetProvider
*/ */
public function testGetServerRequestReadsRequestTargetFromRequest($expectedRequestTarget, $serverRequestUri) public function testGetServerRequestReadsRequestTargetFromRequest($expectedRequestTarget, $serverRequestUri)
@ -142,7 +142,7 @@ class ServerRequestTest extends TestCase
} }
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider uriProvider * @dataProvider uriProvider
*/ */
public function testGetServerRequestReadsUri($expected, $server) public function testGetServerRequestReadsUri($expected, $server)
@ -210,7 +210,7 @@ class ServerRequestTest extends TestCase
} }
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider uploadedFileProvider * @dataProvider uploadedFileProvider
*/ */
public function testGetServerRequestReadsUploadedFiles($file, $path) public function testGetServerRequestReadsUploadedFiles($file, $path)
@ -313,7 +313,7 @@ class ServerRequestTest extends TestCase
} }
/** /**
* @preserveGlobalState disabled * @backupGlobals enabled
* @dataProvider formContentTypeProvider * @dataProvider formContentTypeProvider
*/ */
public function testGetServerRequestParsesFormBody($contentType) public function testGetServerRequestParsesFormBody($contentType)
@ -402,7 +402,7 @@ class ServerRequestTest extends TestCase
$this->assertEquals([], $request->getUploadedFiles()); $this->assertEquals([], $request->getUploadedFiles());
} }
/** @preserveGlobalState disabled */ /** @backupGlobals enabled */
public function testGetUploadedFilesReturnsEmptyArrayWhenNoFilesAreUploaded() public function testGetUploadedFilesReturnsEmptyArrayWhenNoFilesAreUploaded()
{ {
$_SERVER = [ $_SERVER = [