diff --git a/composer.json b/composer.json index 3bb2b9db4c..e750714623 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,6 @@ "behat/transliterator": "^1.3", "doctrine/collections": "^1.6", "doctrine/doctrine-bundle": "^1.12 || ^2.0", - "doctrine/doctrine-cache-bundle": "^1.4", "doctrine/doctrine-migrations-bundle": "^3.0", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/migrations": "^3.0", diff --git a/config/bundles.php b/config/bundles.php index d0f1af6d43..3fd77597e9 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -7,7 +7,6 @@ return [ Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], - Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true], Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true], Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true], Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true], diff --git a/src/Sylius/Bundle/AdminApiBundle/composer.json b/src/Sylius/Bundle/AdminApiBundle/composer.json index 1ddab68a7c..20c9df47c7 100644 --- a/src/Sylius/Bundle/AdminApiBundle/composer.json +++ b/src/Sylius/Bundle/AdminApiBundle/composer.json @@ -32,7 +32,7 @@ "symfony/validator": "^4.4" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.12", + "doctrine/doctrine-bundle": "^1.12 || ^2.0", "doctrine/orm": "^2.7", "matthiasnoback/symfony-config-test": "^4.2", "matthiasnoback/symfony-dependency-injection-test": "^4.2", diff --git a/src/Sylius/Bundle/CoreBundle/Tests/TestKernel.php b/src/Sylius/Bundle/CoreBundle/Tests/TestKernel.php index 981fce2771..cceb2af3e5 100644 --- a/src/Sylius/Bundle/CoreBundle/Tests/TestKernel.php +++ b/src/Sylius/Bundle/CoreBundle/Tests/TestKernel.php @@ -16,7 +16,6 @@ namespace Sylius\Bundle\CoreBundle\Tests; use BabDev\PagerfantaBundle\BabDevPagerfantaBundle; use Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; -use Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle; use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle; use FOS\RestBundle\FOSRestBundle; use JMS\SerializerBundle\JMSSerializerBundle; diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index 67dd31291b..b9c49e4d34 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -71,7 +71,7 @@ "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.3" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.12", + "doctrine/doctrine-bundle": "^1.12 || ^2.0", "hwi/oauth-bundle": "^1.1", "matthiasnoback/symfony-config-test": "^4.2", "matthiasnoback/symfony-dependency-injection-test": "^4.2", diff --git a/symfony.lock b/symfony.lock index 1ffc02747e..e7245e20ab 100644 --- a/symfony.lock +++ b/symfony.lock @@ -103,9 +103,6 @@ "src/Repository/.gitignore" ] }, - "doctrine/doctrine-cache-bundle": { - "version": "1.4.0" - }, "doctrine/doctrine-migrations-bundle": { "version": "2.2", "recipe": { @@ -143,6 +140,9 @@ "doctrine/reflection": { "version": "1.2.1" }, + "doctrine/sql-formatter": { + "version": "1.1.1" + }, "egulias/email-validator": { "version": "2.1.19" }, @@ -197,9 +197,6 @@ ".php_cs.dist" ] }, - "friendsofphp/proxy-manager-lts": { - "version": "v1.0.1" - }, "friendsofsymfony/oauth-server-bundle": { "version": "1.6.2" }, @@ -245,9 +242,6 @@ "instaclick/php-webdriver": { "version": "1.4.7" }, - "jdorn/sql-formatter": { - "version": "v1.2.17" - }, "jean85/pretty-package-versions": { "version": "1.5.0" }, @@ -393,6 +387,9 @@ "nikic/php-parser": { "version": "v4.6.0" }, + "ocramius/proxy-manager": { + "version": "2.10.1" + }, "openlss/lib-array2xml": { "version": "1.0.0" }, @@ -1069,6 +1066,9 @@ "vimeo/psalm": { "version": "3.11.6" }, + "webimpress/safe-writer": { + "version": "2.1.0" + }, "webmozart/assert": { "version": "1.9.1" },