From a60a072281fdf40161222705655564f9e46d43c7 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 30 Sep 2019 11:30:19 +0200 Subject: [PATCH] Fix deprecations when running against ODM 1.3 --- .travis.yml | 1 + Repository/ContainerRepositoryFactory.php | 2 +- Tests/DependencyInjection/Fixtures/config/yml/full.yml | 2 +- Tests/Mapping/Driver/YamlDriverTest.php | 3 +++ Tests/TestCase.php | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da7f1464..2d3794b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - DRIVER_VERSION="stable" - ADAPTER_VERSION="^1.0.0" - COMPOSER_FLAGS="--prefer-dist" + - SYMFONY_DEPRECATIONS_HELPER="max[self]=0" matrix: include: diff --git a/Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php index ad94d4ec..0aaa9d07 100644 --- a/Repository/ContainerRepositoryFactory.php +++ b/Repository/ContainerRepositoryFactory.php @@ -71,7 +71,7 @@ private function getOrCreateRepository(DocumentManager $documentManager, ClassMe return $this->managedRepositories[$repositoryHash]; } - $repositoryClassName = $metadata->customRepositoryClassName ?: $documentManager->getConfiguration()->getDefaultRepositoryClassName(); + $repositoryClassName = $metadata->customRepositoryClassName ?: (method_exists($documentManager->getConfiguration(), 'getDefaultDocumentRepositoryClassName') ? $documentManager->getConfiguration()->getDefaultDocumentRepositoryClassName() : $documentManager->getConfiguration()->getDefaultRepositoryClassName()); return $this->managedRepositories[$repositoryHash] = new $repositoryClassName($documentManager, $documentManager->getUnitOfWork(), $metadata); } diff --git a/Tests/DependencyInjection/Fixtures/config/yml/full.yml b/Tests/DependencyInjection/Fixtures/config/yml/full.yml index cc2ee504..1a770cda 100644 --- a/Tests/DependencyInjection/Fixtures/config/yml/full.yml +++ b/Tests/DependencyInjection/Fixtures/config/yml/full.yml @@ -1,6 +1,6 @@ doctrine_mongodb: fixture_loader: Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader - auto_generate_proxy_classes: true + auto_generate_proxy_classes: 2 auto_generate_hydrator_classes: true auto_generate_persistent_collection_classes: 3 default_connection: conn1 diff --git a/Tests/Mapping/Driver/YamlDriverTest.php b/Tests/Mapping/Driver/YamlDriverTest.php index 7b20e131..f112daeb 100644 --- a/Tests/Mapping/Driver/YamlDriverTest.php +++ b/Tests/Mapping/Driver/YamlDriverTest.php @@ -5,6 +5,9 @@ use Doctrine\Bundle\MongoDBBundle\Mapping\Driver\YamlDriver; +/** + * @group legacy + */ class YamlDriverTest extends AbstractDriverTest { protected function getFileExtension() diff --git a/Tests/TestCase.php b/Tests/TestCase.php index a2c60e7f..40bb6717 100644 --- a/Tests/TestCase.php +++ b/Tests/TestCase.php @@ -4,6 +4,7 @@ namespace Doctrine\Bundle\MongoDBBundle\Tests; use Doctrine\Common\Annotations\AnnotationReader; +use Doctrine\Common\Proxy\AbstractProxyFactory; use Doctrine\MongoDB\Connection; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; @@ -17,7 +18,7 @@ class TestCase extends BaseTestCase public static function createTestDocumentManager($paths = []) { $config = new \Doctrine\ODM\MongoDB\Configuration(); - $config->setAutoGenerateProxyClasses(true); + $config->setAutoGenerateProxyClasses(AbstractProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS); $config->setProxyDir(\sys_get_temp_dir()); $config->setHydratorDir(\sys_get_temp_dir()); $config->setProxyNamespace('SymfonyTests\Doctrine');