Skip to content

D
doctrine-dbal
Unverified Commit 438befbc authored by Sergei Morozov's avatar Sergei Morozov Committed by GitHub
Browse files
Options

Merge pull request #3946 from morozov/phpunit-9.1 

Upgrade PHPUnit to 9.1
parents 4c258314 9652a550
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 32 deletions
composer.lock
View file @ 438befbc
......@@ -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": "194abb042dbd3732c1da46cf05ad7a07",
"content-hash": "fcb001569e84ed2311da0ce1b4d4d7fc",
"packages": [
{
"name": "doctrine/cache",
......@@ -1256,16 +1256,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.0.1",
"version": "9.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "68d7e5b17a6b9461e17c00446caa409863154f76"
"reference": "848f6521c906500e66229668768576d35de0227e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68d7e5b17a6b9461e17c00446caa409863154f76",
"reference": "68d7e5b17a6b9461e17c00446caa409863154f76",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/848f6521c906500e66229668768576d35de0227e",
"reference": "848f6521c906500e66229668768576d35de0227e",
"shasum": ""
},
"require": {
......@@ -1281,14 +1281,15 @@
"phar-io/version": "^2.0.1",
"php": "^7.3",
"phpspec/prophecy": "^1.8.1",
"phpunit/php-code-coverage": "^8.0",
"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": "^3.0",
"sebastian/code-unit": "^1.0",
"sebastian/comparator": "^4.0",
"sebastian/diff": "^4.0",
"sebastian/environment": "^5.0",
"sebastian/environment": "^5.0.1",
"sebastian/exporter": "^4.0",
"sebastian/global-state": "^4.0",
"sebastian/object-enumerator": "^4.0",
......@@ -1309,7 +1310,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "9.0-dev"
"dev-master": "9.1-dev"
}
},
"autoload": {
......@@ -1338,7 +1339,7 @@
"testing",
"xunit"
],
"time": "2020-02-13T07:30:12+00:00"
"time": "2020-04-03T14:40:04+00:00"
},
{
"name": "psr/log",
......@@ -1387,6 +1388,52 @@
],
"time": "2020-03-23T09:12:05+00:00"
},
{
"name": "sebastian/code-unit",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
"reference": "8d8f09bd47c75159921e6e84fdef146343962866"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/8d8f09bd47c75159921e6e84fdef146343962866",
"reference": "8d8f09bd47c75159921e6e84fdef146343962866",
"shasum": ""
},
"require": {
"php": "^7.3"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
},
"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": "Collection of value objects that represent the PHP code units",
"homepage": "https://github.com/sebastianbergmann/code-unit",
"time": "2020-03-30T11:59:20+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
"version": "2.0.0",
......@@ -1554,16 +1601,16 @@
},
{
"name": "sebastian/environment",
"version": "5.0.1",
"version": "5.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "9bffdefa7810031a165ddd6275da6a2c1f6f2dfb"
"reference": "c39c1db0a5cffc98173f3de5a17d489d1043fd7b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/9bffdefa7810031a165ddd6275da6a2c1f6f2dfb",
"reference": "9bffdefa7810031a165ddd6275da6a2c1f6f2dfb",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c39c1db0a5cffc98173f3de5a17d489d1043fd7b",
"reference": "c39c1db0a5cffc98173f3de5a17d489d1043fd7b",
"shasum": ""
},
"require": {
......@@ -1603,7 +1650,7 @@
"environment",
"hhvm"
],
"time": "2020-02-19T13:40:20+00:00"
"time": "2020-03-31T12:14:15+00:00"
},
{
"name": "sebastian/exporter",
......@@ -2294,16 +2341,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"shasum": ""
},
"require": {
......@@ -2315,7 +2362,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
......@@ -2348,7 +2395,21 @@
"polyfill",
"portable"
],
"time": "2020-01-13T11:15:53+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/polyfill-mbstring",
......
tests/Functional/Schema/SQLAnywhereSchemaManagerTest.php
View file @ 438befbc
......@@ -24,7 +24,10 @@ class SQLAnywhereSchemaManagerTest extends SchemaManagerFunctionalTestCase
self::assertCount(1, $views, 'Database has to have one view.');
self::assertInstanceOf(View::class, $views[$name]);
self::assertEquals($name, $views[$name]->getName());
self::assertRegExp('/^SELECT \* from "?DBA"?\."?view_test_table"?$/', $views[$name]->getSql());
self::assertMatchesRegularExpression(
'/^SELECT \* from "?DBA"?\."?view_test_table"?$/',
$views[$name]->getSql()
);
}
public function testDropAndCreateAdvancedIndex() : void
......
tests/Functional/Schema/SqliteSchemaManagerTest.php
View file @ 438befbc
......@@ -34,7 +34,7 @@ class SqliteSchemaManagerTest extends SchemaManagerFunctionalTestCase
$this->schemaManager->createDatabase($path);
self::assertFileExists($path);
$this->schemaManager->dropDatabase($path);
self::assertFileNotExists($path);
self::assertFileDoesNotExist($path);
}
/**
......@@ -58,7 +58,7 @@ class SqliteSchemaManagerTest extends SchemaManagerFunctionalTestCase
$this->schemaManager->dropDatabase('test_drop_database');
self::assertFileNotExists('test_drop_database');
self::assertFileDoesNotExist('test_drop_database');
unset($connection);
}
......
tests/Tools/Console/RunSqlCommandTest.php
View file @ 438befbc
......@@ -76,8 +76,8 @@ class RunSqlCommandTest extends TestCase
]);
self::assertSame(0, $exitCode);
self::assertRegExp('@int.*1.*@', $this->commandTester->getDisplay());
self::assertRegExp('@array.*1.*@', $this->commandTester->getDisplay());
self::assertMatchesRegularExpression('@int.*1.*@', $this->commandTester->getDisplay());
self::assertMatchesRegularExpression('@array.*1.*@', $this->commandTester->getDisplay());
}
public function testUpdateStatementsPrintsAffectedLines() : void
......@@ -89,8 +89,8 @@ class RunSqlCommandTest extends TestCase
'sql' => 'UPDATE foo SET bar = 42',
]);
self::assertRegExp('@int.*42.*@', $this->commandTester->getDisplay());
self::assertNotRegExp('@array.*1.*@', $this->commandTester->getDisplay());
self::assertMatchesRegularExpression('@int.*42.*@', $this->commandTester->getDisplay());
self::assertDoesNotMatchRegularExpression('@array.*1.*@', $this->commandTester->getDisplay());
}
private function expectConnectionExecuteUpdate() : void
......@@ -123,7 +123,7 @@ class RunSqlCommandTest extends TestCase
'--force-fetch' => true,
]);
self::assertRegExp('@int.*1.*@', $this->commandTester->getDisplay());
self::assertRegExp('@array.*1.*@', $this->commandTester->getDisplay());
self::assertMatchesRegularExpression('@int.*1.*@', $this->commandTester->getDisplay());
self::assertMatchesRegularExpression('@array.*1.*@', $this->commandTester->getDisplay());
}
}
tests/Types/ConversionExceptionTest.php
View file @ 438befbc
......@@ -30,7 +30,7 @@ class ConversionExceptionTest extends TestCase
$exception = ConversionException::conversionFailedInvalidType($scalarValue, 'foo', ['bar', 'baz']);
self::assertInstanceOf(ConversionException::class, $exception);
self::assertRegExp(
self::assertMatchesRegularExpression(
'/^Could not convert PHP value \'.*\' of type \'(string|boolean|float|double|integer)\' to type \'foo\'. '
. 'Expected one of the following types: bar, baz$/',
$exception->getMessage()
......@@ -47,7 +47,7 @@ class ConversionExceptionTest extends TestCase
$exception = ConversionException::conversionFailedInvalidType($nonScalar, 'foo', ['bar', 'baz']);
self::assertInstanceOf(ConversionException::class, $exception);
self::assertRegExp(
self::assertMatchesRegularExpression(
'/^Could not convert PHP value of type \'(.*)\' to type \'foo\'. '
. 'Expected one of the following types: bar, baz$/',
$exception->getMessage()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment