diff --git a/composer.json b/composer.json index c6ae58806da..b0614e13f26 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/collections": "^1.5", "doctrine/common": "^2.9", "doctrine/data-fixtures": "^1.3", - "doctrine/dbal": "^2.8", + "doctrine/dbal": "^2.9", "doctrine/doctrine-bundle": "^1.9", "doctrine/doctrine-cache-bundle": "^1.3", "doctrine/doctrine-fixtures-bundle": "^3.0", @@ -109,7 +109,7 @@ "bheller/images-generator": "^1.0", "captbaritone/mailcatcher-codeception-module": "^1.2", "codeception/codeception": "~2.4.5", - "dama/doctrine-test-bundle": "^4.0", + "dama/doctrine-test-bundle": "^5.0", "easycorp/easy-log-handler": "^1.0", "fzaninotto/faker": "^1.7", "mikey179/vfsstream": "^1.6", diff --git a/composer.lock b/composer.lock index b179d5cf69a..f1263f8287a 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": "54f828784a479f284e3802f7e7ddfab1", + "content-hash": "1c7efc44402b4eb643446b45fbc2d105", "packages": [ { "name": "composer/ca-bundle", @@ -664,16 +664,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.9.2", + "version": "v2.9.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9" + "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7345cd59edfa2036eb0fa4264b77ae2576842035", + "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035", "shasum": "" }, "require": { @@ -713,6 +713,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -721,10 +725,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -742,7 +742,7 @@ "php", "queryobject" ], - "time": "2018-12-31T03:27:51+00:00" + "time": "2019-11-02T22:19:34+00:00" }, { "name": "doctrine/doctrine-bundle", @@ -5384,7 +5384,7 @@ }, { "name": "Gert de Pagter", - "email": "backendtea@gmail.com" + "email": "BackEndTea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", @@ -7840,32 +7840,33 @@ }, { "name": "dama/doctrine-test-bundle", - "version": "v4.0.2", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/dmaicher/doctrine-test-bundle.git", - "reference": "438346b3380cc7675e37fbcdca912fdc33471d32" + "reference": "a60b0712f4659eab710c49783713b4b43e3c3149" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/438346b3380cc7675e37fbcdca912fdc33471d32", - "reference": "438346b3380cc7675e37fbcdca912fdc33471d32", + "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/a60b0712f4659eab710c49783713b4b43e3c3149", + "reference": "a60b0712f4659eab710c49783713b4b43e3c3149", "shasum": "" }, "require": { - "doctrine/dbal": "~2.5", - "doctrine/doctrine-bundle": "~1.4", - "php": ">=5.5.0", - "symfony/framework-bundle": "~2.7|~3.0|~4.0" + "doctrine/dbal": "^2.9,>=2.9.3", + "doctrine/doctrine-bundle": "~1.4|~2.0", + "php": "^7.1", + "symfony/framework-bundle": "~3.4|~4.0" }, "require-dev": { - "phpunit/phpunit": "^5.4.4|~6.0", - "symfony/yaml": "~2.7|~3.0" + "phpunit/phpunit": "~7.0|~8.0", + "symfony/phpunit-bridge": "^4.3", + "symfony/yaml": "~2.8|~3.0|~4.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1.x-dev" + "dev-master": "5.1.x-dev" } }, "autoload": { @@ -7883,9 +7884,10 @@ "email": "mail@dmaicher.de" } ], - "description": "Symfony 2/3 bundle to isolate doctrine database tests and improve test performance", + "description": "Symfony bundle to isolate doctrine database tests and improve test performance", "keywords": [ "Symfony 3", + "Symfony 4", "doctrine", "isolation", "performance", @@ -7893,7 +7895,7 @@ "symfony 2", "tests" ], - "time": "2018-01-13T13:14:27+00:00" + "time": "2019-11-25T10:12:28+00:00" }, { "name": "facebook/webdriver", diff --git a/tests/Eccube/Tests/Doctrine/ORM/Tools/PaginationTest.php b/tests/Eccube/Tests/Doctrine/ORM/Tools/PaginationTest.php index 216c580e5e8..c389ef82f3c 100644 --- a/tests/Eccube/Tests/Doctrine/ORM/Tools/PaginationTest.php +++ b/tests/Eccube/Tests/Doctrine/ORM/Tools/PaginationTest.php @@ -71,7 +71,13 @@ public function setUp() /** @var EntityManager $em */ $em = $this->entityManager; $conn = $em->getConnection(); - $conn->rollback(); + if (!$conn->isConnected()) { + $conn->connect(); + } + if ($conn->isTransactionActive()) { + $conn->rollback(); + } + $this->dropTable($conn->getWrappedConnection()); $this->createTable($conn->getWrappedConnection()); $conn->beginTransaction();