diff --git a/ci/github/phpunit.oci8.xml b/ci/github/phpunit.oci8.xml
index 34422a94211..f4454b2f9c4 100644
--- a/ci/github/phpunit.oci8.xml
+++ b/ci/github/phpunit.oci8.xml
@@ -1,6 +1,6 @@
-
-
- ../../lib
-
-
+
+
+ ../../lib/Doctrine
+
+
diff --git a/ci/github/phpunit.pdo-oci.xml b/ci/github/phpunit.pdo-oci.xml
index 4e899c10a22..900e5ce10b8 100644
--- a/ci/github/phpunit.pdo-oci.xml
+++ b/ci/github/phpunit.pdo-oci.xml
@@ -1,6 +1,6 @@
-
-
- ../../lib
-
-
+
+
+ ../../lib/Doctrine
+
+
diff --git a/composer.json b/composer.json
index 3c6e2abc437..1227ad25080 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"jetbrains/phpstorm-stubs": "^2019.1",
"nikic/php-parser": "^4.4",
"phpstan/phpstan": "^0.12.31",
- "phpunit/phpunit": "^9.2",
+ "phpunit/phpunit": "^9.3",
"psalm/plugin-phpunit": "^0.10.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "^3.11.4"
diff --git a/composer.lock b/composer.lock
index 1d893387a7f..8108036b477 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": "1bf73ef9ed03dfdeaedaf678dde8ba13",
+ "content-hash": "5f410c8c6508d1d55fe96b64ab5353e4",
"packages": [
{
"name": "doctrine/cache",
@@ -651,6 +651,10 @@
"constructor",
"instantiate"
],
+ "support": {
+ "issues": "https://github.com/doctrine/instantiator/issues",
+ "source": "https://github.com/doctrine/instantiator/tree/1.3.x"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -801,20 +805,20 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.9.5",
+ "version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"replace": {
"myclabs/deep-copy": "self.version"
@@ -845,7 +849,17 @@
"object",
"object graph"
],
- "time": "2020-01-17T21:11:47+00:00"
+ "support": {
+ "issues": "https://github.com/myclabs/DeepCopy/issues",
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
+ },
+ "funding": [
+ {
+ "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-29T13:22:24+00:00"
},
{
"name": "netresearch/jsonmapper",
@@ -895,16 +909,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.4.0",
+ "version": "v4.7.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120"
+ "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
- "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
+ "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
"shasum": ""
},
"require": {
@@ -921,7 +935,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.7-dev"
}
},
"autoload": {
@@ -943,7 +957,11 @@
"parser",
"php"
],
- "time": "2020-04-10T16:34:50+00:00"
+ "support": {
+ "issues": "https://github.com/nikic/PHP-Parser/issues",
+ "source": "https://github.com/nikic/PHP-Parser/tree/master"
+ },
+ "time": "2020-07-25T13:18:53+00:00"
},
{
"name": "openlss/lib-array2xml",
@@ -996,28 +1014,29 @@
},
{
"name": "phar-io/manifest",
- "version": "1.0.3",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "^2.0",
- "php": "^5.6 || ^7.0"
+ "ext-xmlwriter": "*",
+ "phar-io/version": "^3.0.1",
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -1047,24 +1066,28 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2018-07-08T19:23:20+00:00"
+ "support": {
+ "issues": "https://github.com/phar-io/manifest/issues",
+ "source": "https://github.com/phar-io/manifest/tree/master"
+ },
+ "time": "2020-06-27T14:33:11+00:00"
},
{
"name": "phar-io/version",
- "version": "2.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+ "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/c6bb6825def89e0a32220f88337f8ceaf1975fa0",
+ "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -1094,29 +1117,33 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2018-07-08T19:19:57+00:00"
+ "support": {
+ "issues": "https://github.com/phar-io/version/issues",
+ "source": "https://github.com/phar-io/version/tree/master"
+ },
+ "time": "2020-06-27T14:39:04+00:00"
},
{
"name": "phpdocumentor/reflection-common",
- "version": "2.1.0",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-2.x": "2.x-dev"
}
},
"autoload": {
@@ -1143,32 +1170,35 @@
"reflection",
"static analysis"
],
- "time": "2020-04-27T09:25:28+00:00"
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+ },
+ "time": "2020-06-27T09:03:43+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "5.1.0",
+ "version": "5.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
+ "reference": "3170448f5769fe19f456173d833734e0ff1b84df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
- "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df",
+ "reference": "3170448f5769fe19f456173d833734e0ff1b84df",
"shasum": ""
},
"require": {
- "ext-filter": "^7.1",
- "php": "^7.2",
- "phpdocumentor/reflection-common": "^2.0",
- "phpdocumentor/type-resolver": "^1.0",
- "webmozart/assert": "^1"
+ "ext-filter": "*",
+ "php": "^7.2 || ^8.0",
+ "phpdocumentor/reflection-common": "^2.2",
+ "phpdocumentor/type-resolver": "^1.3",
+ "webmozart/assert": "^1.9.1"
},
"require-dev": {
- "doctrine/instantiator": "^1",
- "mockery/mockery": "^1"
+ "mockery/mockery": "~1.3.2"
},
"type": "library",
"extra": {
@@ -1196,34 +1226,37 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2020-02-22T12:28:44+00:00"
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+ },
+ "time": "2020-07-20T20:05:34+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.1.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
"shasum": ""
},
"require": {
- "php": "^7.2",
+ "php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "^7.2",
- "mockery/mockery": "~1"
+ "ext-tokenizer": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-1.x": "1.x-dev"
}
},
"autoload": {
@@ -1242,37 +1275,41 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "time": "2020-02-18T18:59:58+00:00"
+ "support": {
+ "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.x"
+ },
+ "time": "2020-06-27T10:12:23+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.10.3",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "451c3cd1418cf640de218914901e51b064abb093"
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
- "reference": "451c3cd1418cf640de218914901e51b064abb093",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.0.2",
- "php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
- "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
- "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+ "doctrine/instantiator": "^1.2",
+ "php": "^7.2",
+ "phpdocumentor/reflection-docblock": "^5.0",
+ "sebastian/comparator": "^3.0 || ^4.0",
+ "sebastian/recursion-context": "^3.0 || ^4.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.5 || ^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+ "phpspec/phpspec": "^6.0",
+ "phpunit/phpunit": "^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.10.x-dev"
+ "dev-master": "1.11.x-dev"
}
},
"autoload": {
@@ -1305,7 +1342,11 @@
"spy",
"stub"
],
- "time": "2020-03-05T15:02:03+00:00"
+ "support": {
+ "issues": "https://github.com/phpspec/prophecy/issues",
+ "source": "https://github.com/phpspec/prophecy/tree/master"
+ },
+ "time": "2020-07-08T12:44:21+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -1414,32 +1455,35 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "8.0.2",
+ "version": "9.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc"
+ "reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc",
- "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ee24e82baca11d7d6fb3513e127d6000f541cf90",
+ "reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90",
"shasum": ""
},
"require": {
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-xmlwriter": "*",
- "php": "^7.3",
- "phpunit/php-file-iterator": "^3.0",
- "phpunit/php-text-template": "^2.0",
- "phpunit/php-token-stream": "^4.0",
- "sebastian/code-unit-reverse-lookup": "^2.0",
- "sebastian/environment": "^5.0",
- "sebastian/version": "^3.0",
- "theseer/tokenizer": "^1.1.3"
+ "nikic/php-parser": "^4.7",
+ "php": "^7.3 || ^8.0",
+ "phpunit/php-file-iterator": "^3.0.3",
+ "phpunit/php-text-template": "^2.0.2",
+ "sebastian/code-unit-reverse-lookup": "^2.0.2",
+ "sebastian/complexity": "^2.0",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/lines-of-code": "^1.0",
+ "sebastian/version": "^3.0.1",
+ "theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.0"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"ext-pcov": "*",
@@ -1448,7 +1492,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.0-dev"
+ "dev-master": "9.0-dev"
}
},
"autoload": {
@@ -1474,30 +1518,34 @@
"testing",
"xunit"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.0.0"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-05-23T08:02:54+00:00"
+ "time": "2020-08-07T04:12:30+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "3.0.2",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2"
+ "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2",
- "reference": "eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/25fefc5b19835ca653877fe081644a3f8c1d915e",
+ "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -1530,30 +1578,34 @@
"filesystem",
"iterator"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T12:54:35+00:00"
+ "time": "2020-07-11T05:18:21+00:00"
},
{
"name": "phpunit/php-invoker",
- "version": "3.0.1",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-invoker.git",
- "reference": "62f696ad0d140e0e513e69eaafdebb674d622b4c"
+ "reference": "7a85b66acc48cacffdf87dadd3694e7123674298"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/62f696ad0d140e0e513e69eaafdebb674d622b4c",
- "reference": "62f696ad0d140e0e513e69eaafdebb674d622b4c",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7a85b66acc48cacffdf87dadd3694e7123674298",
+ "reference": "7a85b66acc48cacffdf87dadd3694e7123674298",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"ext-pcntl": "*",
@@ -1565,7 +1617,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.1-dev"
}
},
"autoload": {
@@ -1589,30 +1641,34 @@
"keywords": [
"process"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+ "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.0"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:10:07+00:00"
+ "time": "2020-08-06T07:04:15+00:00"
},
{
"name": "phpunit/php-text-template",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "0c69cbf965d5317ba33f24a352539f354a25db09"
+ "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c69cbf965d5317ba33f24a352539f354a25db09",
- "reference": "0c69cbf965d5317ba33f24a352539f354a25db09",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
+ "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -1644,30 +1700,34 @@
"keywords": [
"template"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T12:52:43+00:00"
+ "time": "2020-06-26T11:55:37+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "5.0.0",
+ "version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "b0d089de001ba60ffa3be36b23e1b8150d072238"
+ "reference": "cc49734779cbb302bf51a44297dab8c4bbf941e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/b0d089de001ba60ffa3be36b23e1b8150d072238",
- "reference": "b0d089de001ba60ffa3be36b23e1b8150d072238",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/cc49734779cbb302bf51a44297dab8c4bbf941e7",
+ "reference": "cc49734779cbb302bf51a44297dab8c4bbf941e7",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.2"
@@ -1699,115 +1759,64 @@
"keywords": [
"timer"
],
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-06-07T12:05:53+00:00"
- },
- {
- "name": "phpunit/php-token-stream",
- "version": "4.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
},
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e61c593e9734b47ef462340c24fca8d6a57da14e",
- "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "php": "^7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Wrapper around PHP's tokenizer extension.",
- "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
- "keywords": [
- "tokenizer"
- ],
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-16T07:00:44+00:00"
+ "time": "2020-06-26T11:58:13+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "9.2.3",
+ "version": "9.3.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "c1b1d62095ef78427f112a7a1c1502d4607e3c00"
+ "reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1b1d62095ef78427f112a7a1c1502d4607e3c00",
- "reference": "c1b1d62095ef78427f112a7a1c1502d4607e3c00",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/eacb57f3857cb6706550bd39ea500f9b1097b0bf",
+ "reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.2.0",
+ "doctrine/instantiator": "^1.3.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.9.1",
- "phar-io/manifest": "^1.0.3",
- "phar-io/version": "^2.0.1",
- "php": "^7.3",
- "phpspec/prophecy": "^1.8.1",
- "phpunit/php-code-coverage": "^8.0.1",
- "phpunit/php-file-iterator": "^3.0",
- "phpunit/php-invoker": "^3.0",
- "phpunit/php-text-template": "^2.0",
- "phpunit/php-timer": "^5.0",
- "sebastian/code-unit": "^1.0.2",
- "sebastian/comparator": "^4.0",
- "sebastian/diff": "^4.0",
- "sebastian/environment": "^5.0.1",
- "sebastian/exporter": "^4.0",
- "sebastian/global-state": "^4.0",
- "sebastian/object-enumerator": "^4.0",
- "sebastian/resource-operations": "^3.0",
- "sebastian/type": "^2.1",
- "sebastian/version": "^3.0"
+ "myclabs/deep-copy": "^1.10.1",
+ "phar-io/manifest": "^2.0.1",
+ "phar-io/version": "^3.0.2",
+ "php": "^7.3 || ^8.0",
+ "phpspec/prophecy": "^1.11.1",
+ "phpunit/php-code-coverage": "^9.0",
+ "phpunit/php-file-iterator": "^3.0.4",
+ "phpunit/php-invoker": "^3.1",
+ "phpunit/php-text-template": "^2.0.2",
+ "phpunit/php-timer": "^5.0.1",
+ "sebastian/code-unit": "^1.0.5",
+ "sebastian/comparator": "^4.0.3",
+ "sebastian/diff": "^4.0.2",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/exporter": "^4.0.2",
+ "sebastian/global-state": "^5.0",
+ "sebastian/object-enumerator": "^4.0.2",
+ "sebastian/resource-operations": "^3.0.2",
+ "sebastian/type": "^2.2.1",
+ "sebastian/version": "^3.0.1"
},
"require-dev": {
"ext-pdo": "*",
- "phpspec/prophecy-phpunit": "^2.0"
+ "phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
"ext-soap": "*",
@@ -1819,7 +1828,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "9.2-dev"
+ "dev-master": "9.3-dev"
}
},
"autoload": {
@@ -1848,6 +1857,10 @@
"testing",
"xunit"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.3.2"
+ },
"funding": [
{
"url": "https://phpunit.de/donate.html",
@@ -1858,7 +1871,7 @@
"type": "github"
}
],
- "time": "2020-06-15T10:51:34+00:00"
+ "time": "2020-08-07T09:12:30+00:00"
},
{
"name": "psalm/plugin-phpunit",
@@ -2009,20 +2022,20 @@
},
{
"name": "sebastian/code-unit",
- "version": "1.0.3",
+ "version": "1.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
- "reference": "d650ef9b1fece15ed4d6eaed6e6b469b7b81183a"
+ "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/d650ef9b1fece15ed4d6eaed6e6b469b7b81183a",
- "reference": "d650ef9b1fece15ed4d6eaed6e6b469b7b81183a",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/c1e2df332c905079980b119c4db103117e5e5c90",
+ "reference": "c1e2df332c905079980b119c4db103117e5e5c90",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2051,30 +2064,34 @@
],
"description": "Collection of value objects that represent the PHP code units",
"homepage": "https://github.com/sebastianbergmann/code-unit",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+ "source": "https://github.com/sebastianbergmann/code-unit/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:11:26+00:00"
+ "time": "2020-06-26T12:50:45+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "c771130f0e8669104a4320b7101a81c2cc2963ef"
+ "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c771130f0e8669104a4320b7101a81c2cc2963ef",
- "reference": "c771130f0e8669104a4320b7101a81c2cc2963ef",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ee51f9bb0c6d8a43337055db3120829fa14da819",
+ "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2102,30 +2119,34 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+ "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T12:56:39+00:00"
+ "time": "2020-06-26T12:04:00+00:00"
},
{
"name": "sebastian/comparator",
- "version": "4.0.2",
+ "version": "4.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "266d85ef789da8c41f06af4093c43e9798af2784"
+ "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/266d85ef789da8c41f06af4093c43e9798af2784",
- "reference": "266d85ef789da8c41f06af4093c43e9798af2784",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+ "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
"shasum": ""
},
"require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8.0",
"sebastian/diff": "^4.0",
"sebastian/exporter": "^4.0"
},
@@ -2172,30 +2193,91 @@
"compare",
"equality"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/comparator/issues",
+ "source": "https://github.com/sebastianbergmann/comparator/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:05:46+00:00"
+ },
+ {
+ "name": "sebastian/complexity",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/complexity.git",
+ "reference": "33fcd6a26656c6546f70871244ecba4b4dced097"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/33fcd6a26656c6546f70871244ecba4b4dced097",
+ "reference": "33fcd6a26656c6546f70871244ecba4b4dced097",
+ "shasum": ""
+ },
+ "require": {
+ "nikic/php-parser": "^4.7",
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-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": "Library for calculating the complexity of PHP code units",
+ "homepage": "https://github.com/sebastianbergmann/complexity",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/complexity/issues",
+ "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.0"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T15:04:48+00:00"
+ "time": "2020-07-25T14:01:34+00:00"
},
{
"name": "sebastian/diff",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
+ "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
- "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+ "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0",
@@ -2234,30 +2316,34 @@
"unidiff",
"unified diff"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/diff/issues",
+ "source": "https://github.com/sebastianbergmann/diff/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-05-08T05:01:12+00:00"
+ "time": "2020-06-30T04:46:02+00:00"
},
{
"name": "sebastian/environment",
- "version": "5.1.1",
+ "version": "5.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "16eb0fa43e29c33d7f2117ed23072e26fc5ab34e"
+ "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/16eb0fa43e29c33d7f2117ed23072e26fc5ab34e",
- "reference": "16eb0fa43e29c33d7f2117ed23072e26fc5ab34e",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+ "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2293,35 +2379,39 @@
"environment",
"hhvm"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/environment/issues",
+ "source": "https://github.com/sebastianbergmann/environment/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:00:01+00:00"
+ "time": "2020-06-26T12:07:24+00:00"
},
{
"name": "sebastian/exporter",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "d12fbca85da932d01d941b59e4b71a0d559db091"
+ "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d12fbca85da932d01d941b59e4b71a0d559db091",
- "reference": "d12fbca85da932d01d941b59e4b71a0d559db091",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
+ "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
"shasum": ""
},
"require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8.0",
"sebastian/recursion-context": "^4.0"
},
"require-dev": {
"ext-mbstring": "*",
- "phpunit/phpunit": "^9.0"
+ "phpunit/phpunit": "^9.2"
},
"type": "library",
"extra": {
@@ -2366,36 +2456,40 @@
"export",
"exporter"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/exporter/issues",
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:12:44+00:00"
+ "time": "2020-06-26T12:08:55+00:00"
},
{
"name": "sebastian/global-state",
- "version": "4.0.0",
+ "version": "5.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72"
+ "reference": "22ae663c951bdc39da96603edc3239ed3a299097"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
- "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/22ae663c951bdc39da96603edc3239ed3a299097",
+ "reference": "22ae663c951bdc39da96603edc3239ed3a299097",
"shasum": ""
},
"require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8.0",
"sebastian/object-reflector": "^2.0",
"sebastian/recursion-context": "^4.0"
},
"require-dev": {
"ext-dom": "*",
- "phpunit/phpunit": "^9.0"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"ext-uopz": "*"
@@ -2403,7 +2497,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -2426,24 +2520,91 @@
"keywords": [
"global state"
],
- "time": "2020-02-07T06:11:37+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/global-state/issues",
+ "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-08-07T04:09:03+00:00"
+ },
+ {
+ "name": "sebastian/lines-of-code",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+ "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e02bf626f404b5daec382a7b8a6a4456e49017e5",
+ "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5",
+ "shasum": ""
+ },
+ "require": {
+ "nikic/php-parser": "^4.6",
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-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": "Library for counting the lines of code in PHP source code",
+ "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-22T18:33:42+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "15f319d67c49fc55ebcdbffb3377433125588455"
+ "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/15f319d67c49fc55ebcdbffb3377433125588455",
- "reference": "15f319d67c49fc55ebcdbffb3377433125588455",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
+ "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
"shasum": ""
},
"require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8.0",
"sebastian/object-reflector": "^2.0",
"sebastian/recursion-context": "^4.0"
},
@@ -2473,30 +2634,34 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+ "source": "https://github.com/sebastianbergmann/object-enumerator/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:15:25+00:00"
+ "time": "2020-06-26T12:11:32+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "14e04b3c25b821cc0702d4837803fe497680b062"
+ "reference": "127a46f6b057441b201253526f81d5406d6c7840"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/14e04b3c25b821cc0702d4837803fe497680b062",
- "reference": "14e04b3c25b821cc0702d4837803fe497680b062",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/127a46f6b057441b201253526f81d5406d6c7840",
+ "reference": "127a46f6b057441b201253526f81d5406d6c7840",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2524,30 +2689,34 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+ "source": "https://github.com/sebastianbergmann/object-reflector/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:08:02+00:00"
+ "time": "2020-06-26T12:12:55+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "a32789e5f0157c10cf216ce6c5136db12a12b847"
+ "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/a32789e5f0157c10cf216ce6c5136db12a12b847",
- "reference": "a32789e5f0157c10cf216ce6c5136db12a12b847",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/062231bf61d2b9448c4fa5a7643b5e1829c11d63",
+ "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2583,30 +2752,34 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:06:44+00:00"
+ "time": "2020-06-26T12:14:17+00:00"
},
{
"name": "sebastian/resource-operations",
- "version": "3.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "71421c1745788de4facae1b79af923650bd3ec15"
+ "reference": "0653718a5a629b065e91f774595267f8dc32e213"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/71421c1745788de4facae1b79af923650bd3ec15",
- "reference": "71421c1745788de4facae1b79af923650bd3ec15",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0653718a5a629b065e91f774595267f8dc32e213",
+ "reference": "0653718a5a629b065e91f774595267f8dc32e213",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
@@ -2634,30 +2807,34 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-15T13:17:14+00:00"
+ "time": "2020-06-26T12:16:22+00:00"
},
{
"name": "sebastian/type",
- "version": "2.1.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
+ "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
- "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+ "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.2"
@@ -2665,7 +2842,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -2686,30 +2863,34 @@
],
"description": "Collection of value objects that represent the types of the PHP type system",
"homepage": "https://github.com/sebastianbergmann/type",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/type/issues",
+ "source": "https://github.com/sebastianbergmann/type/tree/2.2.1"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-06-01T12:21:09+00:00"
+ "time": "2020-07-05T08:31:53+00:00"
},
{
"name": "sebastian/version",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
+ "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
- "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
+ "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
"shasum": ""
},
"require": {
- "php": "^7.3"
+ "php": "^7.3 || ^8.0"
},
"type": "library",
"extra": {
@@ -2735,7 +2916,17 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2020-01-21T06:36:37+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/version/issues",
+ "source": "https://github.com/sebastianbergmann/version/tree/3.0.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:18:43+00:00"
},
{
"name": "slevomat/coding-standard",
@@ -2993,16 +3184,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
"shasum": ""
},
"require": {
@@ -3014,7 +3205,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -3047,6 +3242,9 @@
"polyfill",
"portable"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.18.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -3061,7 +3259,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:14:59+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -3240,23 +3438,23 @@
},
{
"name": "theseer/tokenizer",
- "version": "1.1.3",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
- "php": "^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -3276,7 +3474,17 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2019-06-13T22:48:21+00:00"
+ "support": {
+ "issues": "https://github.com/theseer/tokenizer/issues",
+ "source": "https://github.com/theseer/tokenizer/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-12T23:59:07+00:00"
},
{
"name": "vimeo/psalm",
@@ -3377,23 +3585,24 @@
},
{
"name": "webmozart/assert",
- "version": "1.8.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
- "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0",
+ "php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
+ "phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1"
},
"require-dev": {
@@ -3421,7 +3630,11 @@
"check",
"validate"
],
- "time": "2020-04-18T12:12:48+00:00"
+ "support": {
+ "issues": "https://github.com/webmozart/assert/issues",
+ "source": "https://github.com/webmozart/assert/tree/master"
+ },
+ "time": "2020-07-08T17:02:28+00:00"
},
{
"name": "webmozart/glob",
@@ -3530,5 +3743,5 @@
"platform-overrides": {
"php": "7.3.0"
},
- "plugin-api-version": "1.1.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b093d11854f..6d693d9c924 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
Example: phpunit -c mysqlconf.xml
-->
-
-
- lib/Doctrine
-
-
+
+
+ lib/Doctrine
+
+
diff --git a/tests/Doctrine/Tests/DBAL/Connection/LoggingTest.php b/tests/Doctrine/Tests/DBAL/Connection/LoggingTest.php
index 9a9da438ab3..290624767ae 100644
--- a/tests/Doctrine/Tests/DBAL/Connection/LoggingTest.php
+++ b/tests/Doctrine/Tests/DBAL/Connection/LoggingTest.php
@@ -54,7 +54,7 @@ private function createConnection(DriverConnection $driverConnection, string $ex
$logger->expects($this->once())
->method('startQuery')
->with($this->equalTo($expectedSQL), $this->equalTo([]));
- $logger->expects($this->at(1))
+ $logger->expects($this->once())
->method('stopQuery');
$connection = new Connection([], $driver);
diff --git a/tests/Doctrine/Tests/DBAL/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/ConnectionTest.php
index fe5fd41fc09..1bbb900f598 100644
--- a/tests/Doctrine/Tests/DBAL/ConnectionTest.php
+++ b/tests/Doctrine/Tests/DBAL/ConnectionTest.php
@@ -152,7 +152,7 @@ public function testConnectDispatchEvent(): void
$eventManager->addEventListener([Events::postConnect], $listenerMock);
$driverMock = $this->createMock(Driver::class);
- $driverMock->expects($this->at(0))
+ $driverMock->expects($this->once())
->method('connect');
$conn = new Connection([], $driverMock, new Configuration(), $eventManager);
@@ -846,13 +846,11 @@ public function testRethrowsOriginalExceptionOnDeterminingPlatformWhenConnecting
$originalException = new Exception('Original exception');
$fallbackException = new Exception('Fallback exception');
- $driverMock->expects($this->at(0))
- ->method('connect')
- ->willThrowException($originalException);
-
- $driverMock->expects($this->at(1))
- ->method('connect')
- ->willThrowException($fallbackException);
+ $driverMock->method('connect')
+ ->will(self::onConsecutiveCalls(
+ self::throwException($originalException),
+ self::throwException($fallbackException)
+ ));
$this->expectExceptionMessage($originalException->getMessage());
diff --git a/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php b/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php
index ce1ce87a5a0..e79869cf821 100644
--- a/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php
+++ b/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php
@@ -33,23 +33,12 @@ public function testExecute(array $params): void
->disableOriginalConstructor()
->getMock();
- $statement->expects($this->at(0))
+ $statement->expects($this->exactly(3))
->method('bindValue')
- ->with(
- $this->equalTo(1),
- $this->equalTo($params[0])
- );
- $statement->expects($this->at(1))
- ->method('bindValue')
- ->with(
- $this->equalTo(2),
- $this->equalTo($params[1])
- );
- $statement->expects($this->at(2))
- ->method('bindValue')
- ->with(
- $this->equalTo(3),
- $this->equalTo($params[2])
+ ->withConsecutive(
+ [1, $params[0]],
+ [2, $params[1]],
+ [3, $params[2]],
);
// the return value is irrelevant to the test
diff --git a/tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php b/tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php
index f1138ca9070..f2a8ec2fd15 100644
--- a/tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php
+++ b/tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php
@@ -1174,29 +1174,17 @@ public function testComparesNamespaces(): void
->method('getNamespaces')
->will($this->returnValue(['foo', 'bar']));
- $fromSchema->expects($this->at(0))
- ->method('hasNamespace')
- ->with('bar')
- ->will($this->returnValue(true));
-
- $fromSchema->expects($this->at(1))
- ->method('hasNamespace')
- ->with('baz')
- ->will($this->returnValue(false));
+ $fromSchema->method('hasNamespace')
+ ->withConsecutive(['bar'], ['baz'])
+ ->willReturnOnConsecutiveCalls(true, false);
$toSchema->expects($this->once())
->method('getNamespaces')
->will($this->returnValue(['bar', 'baz']));
- $toSchema->expects($this->at(1))
- ->method('hasNamespace')
- ->with('foo')
- ->will($this->returnValue(false));
-
- $toSchema->expects($this->at(2))
- ->method('hasNamespace')
- ->with('bar')
- ->will($this->returnValue(true));
+ $toSchema->method('hasNamespace')
+ ->withConsecutive(['foo'], ['bar'])
+ ->willReturnOnConsecutiveCalls(false, true);
$expected = new SchemaDiff();
$expected->fromSchema = $fromSchema;
diff --git a/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php b/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php
index 9e700939c66..35d884a95ac 100644
--- a/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php
+++ b/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php
@@ -371,7 +371,7 @@ public function testVisitsVisitor(): void
[$schema->getSequence('war')]
);
- self::assertNull($schema->visit($visitor));
+ $schema->visit($visitor);
}
public function testVisitsNamespaceVisitor(): void
@@ -392,34 +392,24 @@ public function testVisitsNamespaceVisitor(): void
->method('acceptSchema')
->with($schema);
- $visitor->expects($this->at(1))
+ $visitor->expects($this->exactly(3))
->method('acceptNamespace')
- ->with('foo');
+ ->withConsecutive(['foo'], ['bar'], ['bla']);
- $visitor->expects($this->at(2))
- ->method('acceptNamespace')
- ->with('bar');
-
- $visitor->expects($this->at(3))
- ->method('acceptNamespace')
- ->with('bla');
-
- $visitor->expects($this->at(4))
+ $visitor->expects($this->exactly(2))
->method('acceptTable')
- ->with($schema->getTable('baz'));
-
- $visitor->expects($this->at(5))
- ->method('acceptTable')
- ->with($schema->getTable('bla.bloo'));
-
- $visitor->expects($this->at(6))
- ->method('acceptSequence')
- ->with($schema->getSequence('moo'));
+ ->withConsecutive(
+ [$schema->getTable('baz')],
+ [$schema->getTable('bla.bloo')]
+ );
- $visitor->expects($this->at(7))
+ $visitor->expects($this->exactly(2))
->method('acceptSequence')
- ->with($schema->getSequence('war'));
+ ->withConsecutive(
+ [$schema->getSequence('moo')],
+ [$schema->getSequence('war')]
+ );
- self::assertNull($schema->visit($visitor));
+ $schema->visit($visitor);
}
}
diff --git a/tests/Doctrine/Tests/DBAL/Schema/Visitor/CreateSchemaSqlCollectorTest.php b/tests/Doctrine/Tests/DBAL/Schema/Visitor/CreateSchemaSqlCollectorTest.php
index ae7ba2a1efc..4cf44892f7e 100644
--- a/tests/Doctrine/Tests/DBAL/Schema/Visitor/CreateSchemaSqlCollectorTest.php
+++ b/tests/Doctrine/Tests/DBAL/Schema/Visitor/CreateSchemaSqlCollectorTest.php
@@ -45,19 +45,20 @@ protected function setUp(): void
->willReturn(['foo']);
}
- public function testAcceptsNamespace(): void
+ public function testAcceptsNamespaceDoesNotSupportSchemas(): void
{
- $this->platformMock->expects($this->at(0))
- ->method('supportsSchemas')
- ->will($this->returnValue(false));
-
- $this->platformMock->expects($this->at(1))
- ->method('supportsSchemas')
- ->will($this->returnValue(true));
+ $this->platformMock->method('supportsSchemas')
+ ->willReturn(false);
$this->visitor->acceptNamespace('foo');
self::assertEmpty($this->visitor->getQueries());
+ }
+
+ public function testAcceptsNamespaceSupportsSchemas(): void
+ {
+ $this->platformMock->method('supportsSchemas')
+ ->willReturn(true);
$this->visitor->acceptNamespace('foo');
@@ -73,15 +74,10 @@ public function testAcceptsTable(): void
self::assertSame(['foo'], $this->visitor->getQueries());
}
- public function testAcceptsForeignKey(): void
+ public function testAcceptsForeignKeyDoesNotSupportCreateDropForeignKeyConstraints(): void
{
- $this->platformMock->expects($this->at(0))
- ->method('supportsCreateDropForeignKeyConstraints')
- ->will($this->returnValue(false));
-
- $this->platformMock->expects($this->at(1))
- ->method('supportsCreateDropForeignKeyConstraints')
- ->will($this->returnValue(true));
+ $this->platformMock->method('supportsCreateDropForeignKeyConstraints')
+ ->willReturn(false);
$table = $this->createTableMock();
$foreignKey = $this->createForeignKeyConstraintMock();
@@ -89,6 +85,15 @@ public function testAcceptsForeignKey(): void
$this->visitor->acceptForeignKey($table, $foreignKey);
self::assertEmpty($this->visitor->getQueries());
+ }
+
+ public function testAcceptsForeignKeySupportsCreateDropForeignKeyConstraints(): void
+ {
+ $this->platformMock->method('supportsCreateDropForeignKeyConstraints')
+ ->willReturn(true);
+
+ $table = $this->createTableMock();
+ $foreignKey = $this->createForeignKeyConstraintMock();
$this->visitor->acceptForeignKey($table, $foreignKey);
diff --git a/tests/Doctrine/Tests/DBAL/Sharding/PoolingShardManagerTest.php b/tests/Doctrine/Tests/DBAL/Sharding/PoolingShardManagerTest.php
index 37a7116ef15..d2ce7b7f94f 100644
--- a/tests/Doctrine/Tests/DBAL/Sharding/PoolingShardManagerTest.php
+++ b/tests/Doctrine/Tests/DBAL/Sharding/PoolingShardManagerTest.php
@@ -63,13 +63,11 @@ public function testSelectShard(): void
$shardId = 10;
$conn = $this->createConnectionMock();
- $conn->expects($this->at(0))
- ->method('getParams')
+ $conn->method('getParams')
->willReturn(['shardChoser' => $this->createPassthroughShardChoser()]);
- $conn->expects($this->at(1))
- ->method('connect')
- ->with($this->equalTo($shardId));
+ $conn->method('connect')
+ ->with($shardId);
$shardManager = new PoolingShardManager($conn);
$shardManager->selectShard($shardId);
@@ -99,22 +97,24 @@ public function testQueryAll(): void
$types = [1];
$conn = $this->createConnectionMock();
- $conn->expects($this->at(0))->method('getParams')->will($this->returnValue(
- ['shards' => [['id' => 1], ['id' => 2]], 'shardChoser' => $this->createPassthroughShardChoser()]
- ));
- $conn->expects($this->at(1))->method('getParams')->will($this->returnValue(
- ['shards' => [['id' => 1], ['id' => 2]], 'shardChoser' => $this->createPassthroughShardChoser()]
- ));
- $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1));
- $conn->expects($this->at(3))
- ->method('fetchAllAssociative')
- ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
- ->will($this->returnValue([['id' => 1]]));
- $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2));
- $conn->expects($this->at(5))
- ->method('fetchAllAssociative')
- ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
- ->will($this->returnValue([['id' => 2]]));
+
+ $conn->method('getParams')->willReturn([
+ 'shards' => [
+ ['id' => 1],
+ ['id' => 2],
+ ],
+ 'shardChoser' => $this->createPassthroughShardChoser(),
+ ]);
+
+ $conn->method('connect')
+ ->withConsecutive([1], [2]);
+
+ $conn->method('fetchAllAssociative')
+ ->with($sql, $params, $types)
+ ->willReturnOnConsecutiveCalls(
+ [['id' => 1]],
+ [['id' => 2]],
+ );
$shardManager = new PoolingShardManager($conn);
$result = $shardManager->queryAll($sql, $params, $types);
@@ -129,22 +129,24 @@ public function testQueryAllWithStaticShardChoser(): void
$types = [1];
$conn = $this->createConnectionMock();
- $conn->expects($this->at(0))->method('getParams')->will($this->returnValue(
- ['shards' => [['id' => 1], ['id' => 2]], 'shardChoser' => $this->createStaticShardChooser()]
- ));
- $conn->expects($this->at(1))->method('getParams')->will($this->returnValue(
- ['shards' => [['id' => 1], ['id' => 2]], 'shardChoser' => $this->createStaticShardChooser()]
- ));
- $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1));
- $conn->expects($this->at(3))
- ->method('fetchAllAssociative')
- ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
- ->will($this->returnValue([['id' => 1]]));
- $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2));
- $conn->expects($this->at(5))
- ->method('fetchAllAssociative')
- ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
- ->will($this->returnValue([['id' => 2]]));
+
+ $conn->method('getParams')->willReturn([
+ 'shards' => [
+ ['id' => 1],
+ ['id' => 2],
+ ],
+ 'shardChoser' => $this->createStaticShardChooser(),
+ ]);
+
+ $conn->method('connect')
+ ->withConsecutive([1], [2]);
+
+ $conn->method('fetchAllAssociative')
+ ->with($sql, $params, $types)
+ ->willReturnOnConsecutiveCalls(
+ [['id' => 1]],
+ [['id' => 2]],
+ );
$shardManager = new PoolingShardManager($conn);
$result = $shardManager->queryAll($sql, $params, $types);
diff --git a/tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/SQLAzureShardManagerTest.php b/tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/SQLAzureShardManagerTest.php
index 55e54ac9b54..09a8f933a37 100644
--- a/tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/SQLAzureShardManagerTest.php
+++ b/tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/SQLAzureShardManagerTest.php
@@ -60,7 +60,8 @@ public function testSelectGlobalTransactionActive(): void
],
]);
- $conn->expects($this->at(1))->method('isTransactionActive')->will($this->returnValue(true));
+ $conn->method('isTransactionActive')
+ ->willReturn(true);
$this->expectException(ShardingException::class);
$this->expectExceptionMessage('Cannot switch shard during an active transaction.');
@@ -79,8 +80,12 @@ public function testSelectGlobal(): void
],
]);
- $conn->expects($this->at(1))->method('isTransactionActive')->will($this->returnValue(false));
- $conn->expects($this->at(2))->method('exec')->with($this->equalTo('USE FEDERATION ROOT WITH RESET'));
+ $conn->method('isTransactionActive')
+ ->willReturn(false);
+
+ $conn->expects($this->once())
+ ->method('exec')
+ ->with('USE FEDERATION ROOT WITH RESET');
$sm = new SQLAzureShardManager($conn);
$sm->selectGlobal();
@@ -96,7 +101,8 @@ public function testSelectShard(): void
],
]);
- $conn->expects($this->at(1))->method('isTransactionActive')->will($this->returnValue(true));
+ $conn->method('isTransactionActive')
+ ->willReturn(true);
$this->expectException(ShardingException::class);
$this->expectExceptionMessage('Cannot switch shard during an active transaction.');
@@ -118,7 +124,9 @@ private function createConnection(array $params): Connection
->onlyMethods(['getParams', 'exec', 'isTransactionActive'])
->disableOriginalConstructor()
->getMock();
- $conn->expects($this->at(0))->method('getParams')->will($this->returnValue($params));
+
+ $conn->method('getParams')
+ ->willReturn($params);
return $conn;
}
diff --git a/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
index cacadae2cb5..0b53d9dfffe 100644
--- a/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
@@ -1,8 +1,7 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
index 9fea8d86683..f2b353ad94f 100644
--- a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
@@ -1,8 +1,7 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
index 88a1ea41b43..9b3f53bb246 100644
--- a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -1,8 +1,7 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
index ac1cfd08342..2f314611ff4 100644
--- a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -1,8 +1,7 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/ibm_db2.travis.xml b/tests/travis/ibm_db2.travis.xml
index 8e81125da6e..30d3157cc61 100644
--- a/tests/travis/ibm_db2.travis.xml
+++ b/tests/travis/ibm_db2.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/mariadb.docker.travis.xml b/tests/travis/mariadb.docker.travis.xml
index 6805a5cce84..85c681c6f0d 100644
--- a/tests/travis/mariadb.docker.travis.xml
+++ b/tests/travis/mariadb.docker.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/mariadb.mysqli.docker.travis.xml b/tests/travis/mariadb.mysqli.docker.travis.xml
index bfb147b7fd9..5c2ed041e37 100644
--- a/tests/travis/mariadb.mysqli.docker.travis.xml
+++ b/tests/travis/mariadb.mysqli.docker.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/mysql.docker.travis.xml b/tests/travis/mysql.docker.travis.xml
index 6805a5cce84..85c681c6f0d 100644
--- a/tests/travis/mysql.docker.travis.xml
+++ b/tests/travis/mysql.docker.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/mysqli.docker.travis.xml b/tests/travis/mysqli.docker.travis.xml
index bfb147b7fd9..5c2ed041e37 100644
--- a/tests/travis/mysqli.docker.travis.xml
+++ b/tests/travis/mysqli.docker.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/pdo_sqlsrv.travis.xml b/tests/travis/pdo_sqlsrv.travis.xml
index 35ba2624cc6..4b813c1a21a 100644
--- a/tests/travis/pdo_sqlsrv.travis.xml
+++ b/tests/travis/pdo_sqlsrv.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml
index 7fb828fc7fe..2f9042034f5 100644
--- a/tests/travis/pgsql.travis.xml
+++ b/tests/travis/pgsql.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml
index c6e3e291fce..6eacf80bbcc 100644
--- a/tests/travis/sqlite.travis.xml
+++ b/tests/travis/sqlite.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+
diff --git a/tests/travis/sqlsrv.travis.xml b/tests/travis/sqlsrv.travis.xml
index 890fb9d442a..7004fa993d8 100644
--- a/tests/travis/sqlsrv.travis.xml
+++ b/tests/travis/sqlsrv.travis.xml
@@ -1,6 +1,6 @@
-
-
+
+
../../lib/Doctrine
-
-
+
+