diff --git a/composer.json b/composer.json
index 65d0718f7f..2d09887ce4 100644
--- a/composer.json
+++ b/composer.json
@@ -41,9 +41,8 @@
"doctrine/coding-standard": "^6.0",
"jetbrains/phpstorm-stubs": "^2019.1",
"phpstan/phpstan": "^0.11.3",
- "phpunit/phpunit": "^8.2.1",
- "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
- "symfony/phpunit-bridge": "^3.4.5|^4.0.5|^5.0"
+ "phpunit/phpunit": "^8.3.3",
+ "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
diff --git a/composer.lock b/composer.lock
index 579ac1b883..75dc9e0be1 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": "a386165fd4eb85610333facec8026438",
+ "content-hash": "1d397d6d064efda6d4150edce78e283a",
"packages": [
{
"name": "doctrine/cache",
@@ -1355,16 +1355,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.8.0",
+ "version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+ "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
- "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+ "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
"shasum": ""
},
"require": {
@@ -1385,8 +1385,8 @@
}
},
"autoload": {
- "psr-0": {
- "Prophecy\\": "src/"
+ "psr-4": {
+ "Prophecy\\": "src/Prophecy"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1414,7 +1414,7 @@
"spy",
"stub"
],
- "time": "2018-08-05T17:53:17+00:00"
+ "time": "2019-06-13T12:50:23+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -1537,16 +1537,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "7.0.5",
+ "version": "7.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "aed67b57d459dcab93e84a5c9703d3deb5025dff"
+ "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aed67b57d459dcab93e84a5c9703d3deb5025dff",
- "reference": "aed67b57d459dcab93e84a5c9703d3deb5025dff",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
+ "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
"shasum": ""
},
"require": {
@@ -1555,17 +1555,17 @@
"php": "^7.2",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^3.0.1",
+ "phpunit/php-token-stream": "^3.1.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^4.1",
+ "sebastian/environment": "^4.2.2",
"sebastian/version": "^2.0.1",
- "theseer/tokenizer": "^1.1"
+ "theseer/tokenizer": "^1.1.3"
},
"require-dev": {
- "phpunit/phpunit": "^8.0"
+ "phpunit/phpunit": "^8.2.2"
},
"suggest": {
- "ext-xdebug": "^2.6.1"
+ "ext-xdebug": "^2.7.2"
},
"type": "library",
"extra": {
@@ -1585,8 +1585,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -1596,7 +1596,7 @@
"testing",
"xunit"
],
- "time": "2019-06-06T12:28:18+00:00"
+ "time": "2019-07-25T05:31:54+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -1740,16 +1740,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "3.0.1",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
+ "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
- "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a",
+ "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a",
"shasum": ""
},
"require": {
@@ -1762,7 +1762,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.1-dev"
}
},
"autoload": {
@@ -1785,20 +1785,20 @@
"keywords": [
"tokenizer"
],
- "time": "2018-10-30T05:52:18+00:00"
+ "time": "2019-07-25T05:29:42+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "8.2.1",
+ "version": "8.3.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "047f771e34dccacb6c432a1a70e9980e087eac92"
+ "reference": "c319d08ebd31e137034c84ad7339054709491485"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/047f771e34dccacb6c432a1a70e9980e087eac92",
- "reference": "047f771e34dccacb6c432a1a70e9980e087eac92",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c319d08ebd31e137034c84ad7339054709491485",
+ "reference": "c319d08ebd31e137034c84ad7339054709491485",
"shasum": ""
},
"require": {
@@ -1813,8 +1813,8 @@
"phar-io/manifest": "^1.0.3",
"phar-io/version": "^2.0.1",
"php": "^7.2",
- "phpspec/prophecy": "^1.8.0",
- "phpunit/php-code-coverage": "^7.0.5",
+ "phpspec/prophecy": "^1.8.1",
+ "phpunit/php-code-coverage": "^7.0.7",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.1.2",
@@ -1825,7 +1825,7 @@
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
- "sebastian/type": "^1.1.0",
+ "sebastian/type": "^1.1.3",
"sebastian/version": "^2.0.1"
},
"require-dev": {
@@ -1842,7 +1842,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.2-dev"
+ "dev-master": "8.3-dev"
}
},
"autoload": {
@@ -1857,8 +1857,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
"description": "The PHP Unit Testing framework.",
@@ -1868,7 +1868,7 @@
"testing",
"xunit"
],
- "time": "2019-06-07T14:04:13+00:00"
+ "time": "2019-08-03T15:41:47+00:00"
},
{
"name": "psr/log",
@@ -2445,16 +2445,16 @@
},
{
"name": "sebastian/type",
- "version": "1.1.1",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "b2a7f9aac51ce18cd7ac8b31e37c8ce5646fc741"
+ "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b2a7f9aac51ce18cd7ac8b31e37c8ce5646fc741",
- "reference": "b2a7f9aac51ce18cd7ac8b31e37c8ce5646fc741",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
+ "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
"shasum": ""
},
"require": {
@@ -2481,13 +2481,13 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "role": "lead",
+ "email": "sebastian@phpunit.de"
}
],
"description": "Collection of value objects that represent the types of the PHP type system",
"homepage": "https://github.com/sebastianbergmann/type",
- "time": "2019-06-08T04:53:27+00:00"
+ "time": "2019-07-02T08:10:15+00:00"
},
{
"name": "sebastian/version",
@@ -2868,72 +2868,6 @@
"homepage": "https://symfony.com",
"time": "2019-02-23T15:42:05+00:00"
},
- {
- "name": "symfony/phpunit-bridge",
- "version": "v4.0.6",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "14ffbbe2a72d0f6339b24eb830dd38cf63ba6630"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/14ffbbe2a72d0f6339b24eb830dd38cf63ba6630",
- "reference": "14ffbbe2a72d0f6339b24eb830dd38cf63ba6630",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "conflict": {
- "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
- },
- "suggest": {
- "ext-zip": "Zip support is required when using bin/simple-phpunit",
- "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
- },
- "bin": [
- "bin/simple-phpunit"
- ],
- "type": "symfony-bridge",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- },
- "thanks": {
- "name": "phpunit/phpunit",
- "url": "https://github.com/sebastianbergmann/phpunit"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Bridge\\PhpUnit\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony PHPUnit Bridge",
- "homepage": "https://symfony.com",
- "time": "2018-02-19T16:50:22+00:00"
- },
{
"name": "symfony/polyfill-ctype",
"version": "v1.11.0",
@@ -3053,16 +2987,16 @@
},
{
"name": "theseer/tokenizer",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
+ "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
- "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+ "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
"shasum": ""
},
"require": {
@@ -3089,7 +3023,7 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2019-04-04T09:56:43+00:00"
+ "time": "2019-06-13T22:48:21+00:00"
},
{
"name": "webmozart/assert",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b212ccf7e0..f62532ed9f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -60,7 +60,6 @@
-
diff --git a/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php b/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
index 0997ce2631..32e4568ed0 100644
--- a/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
+++ b/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
@@ -66,6 +66,8 @@ public function testToArray() : void
*/
public function testSettingUnknownOptionIsStillSupported() : void
{
+ $this->expectNotToPerformAssertions();
+
new Column('foo', $this->createMock(Type::class), ['unknown_option' => 'bar']);
}
diff --git a/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
index 712a8029ad..ef358c2d3b 100644
--- a/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
index 9195c5aaa8..68b1f31dae 100644
--- a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
index 281955abb1..4ed5302262 100644
--- a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
index 6818a6320d..8670263771 100644
--- a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
+++ b/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/continuousphp/oci8.phpunit.continuousphp.xml b/tests/continuousphp/oci8.phpunit.continuousphp.xml
index 4b3740936d..4a2de46824 100644
--- a/tests/continuousphp/oci8.phpunit.continuousphp.xml
+++ b/tests/continuousphp/oci8.phpunit.continuousphp.xml
@@ -39,10 +39,6 @@
-
-
-
-
performance
diff --git a/tests/continuousphp/pdo-oci.phpunit.xml b/tests/continuousphp/pdo-oci.phpunit.xml
index ef145a990d..b25e0c0274 100644
--- a/tests/continuousphp/pdo-oci.phpunit.xml
+++ b/tests/continuousphp/pdo-oci.phpunit.xml
@@ -37,8 +37,4 @@
-
-
-
-
diff --git a/tests/travis/ibm_db2.travis.xml b/tests/travis/ibm_db2.travis.xml
index b58f3451bc..e841a8ce25 100644
--- a/tests/travis/ibm_db2.travis.xml
+++ b/tests/travis/ibm_db2.travis.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mariadb.mysqli.travis.xml b/tests/travis/mariadb.mysqli.travis.xml
index 46e7ea4853..dfc62d307c 100644
--- a/tests/travis/mariadb.mysqli.travis.xml
+++ b/tests/travis/mariadb.mysqli.travis.xml
@@ -37,10 +37,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mariadb.travis.xml b/tests/travis/mariadb.travis.xml
index 132c27f3da..0d4e2c43c9 100644
--- a/tests/travis/mariadb.travis.xml
+++ b/tests/travis/mariadb.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mysql.docker.travis.xml b/tests/travis/mysql.docker.travis.xml
index 21fae6f35e..fa6617c094 100644
--- a/tests/travis/mysql.docker.travis.xml
+++ b/tests/travis/mysql.docker.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mysql.travis.xml b/tests/travis/mysql.travis.xml
index 132c27f3da..0d4e2c43c9 100644
--- a/tests/travis/mysql.travis.xml
+++ b/tests/travis/mysql.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mysqli.docker.travis.xml b/tests/travis/mysqli.docker.travis.xml
index 935815e9cf..679415d7a1 100644
--- a/tests/travis/mysqli.docker.travis.xml
+++ b/tests/travis/mysqli.docker.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/mysqli.travis.xml b/tests/travis/mysqli.travis.xml
index 8348cab634..b8bd9be01c 100644
--- a/tests/travis/mysqli.travis.xml
+++ b/tests/travis/mysqli.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/pdo_sqlsrv.travis.xml b/tests/travis/pdo_sqlsrv.travis.xml
index 31de675b01..07f947600e 100644
--- a/tests/travis/pdo_sqlsrv.travis.xml
+++ b/tests/travis/pdo_sqlsrv.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml
index 27a671b8b2..5215f2e6f1 100644
--- a/tests/travis/pgsql.travis.xml
+++ b/tests/travis/pgsql.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance
diff --git a/tests/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml
index bfc18433db..c6e3e291fc 100644
--- a/tests/travis/sqlite.travis.xml
+++ b/tests/travis/sqlite.travis.xml
@@ -23,10 +23,6 @@
-
-
-
-
performance
diff --git a/tests/travis/sqlsrv.travis.xml b/tests/travis/sqlsrv.travis.xml
index f5ca622d3a..6c642e58e9 100644
--- a/tests/travis/sqlsrv.travis.xml
+++ b/tests/travis/sqlsrv.travis.xml
@@ -36,10 +36,6 @@
-
-
-
-
performance