Support doctrine/mongodb-odm ^2.x & doctrine/mongodb-odm-bundle ^4.x

composer.json

@@ -26,8 +26,8 @@
     ],
     "require": {
         "php": "^7.1",
-        "doctrine/mongodb-odm": "^1.0",
-        "doctrine/mongodb-odm-bundle": "^3.0",
+        "doctrine/mongodb-odm": "^1.0 || ^2.0",
+        "doctrine/mongodb-odm-bundle": "^3.0 || ^4.0",
         "sonata-project/admin-bundle": "^3.31",
         "sonata-project/core-bundle": "^3.8",
         "symfony/config": "^2.8 || ^3.2 || ^4.0",

src/Builder/FormContractor.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Builder;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Builder\FormContractorInterface;
@@ -74,7 +74,7 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
         $fieldDescription->setAdmin($admin);
         $fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'standard'));
 
-        if (\in_array($fieldDescription->getMappingType(), [ClassMetadataInfo::ONE, ClassMetadataInfo::MANY], true)) {
+        if (\in_array($fieldDescription->getMappingType(), [ClassMetadata::ONE, ClassMetadata::MANY], true)) {
             $admin->attachAdminClass($fieldDescription);
         }
     }
@@ -142,7 +142,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
                 ));
             }
 
-            if (!\in_array($fieldDescription->getMappingType(), [ClassMetadataInfo::ONE, ClassMetadataInfo::MANY], true)) {
+            if (!\in_array($fieldDescription->getMappingType(), [ClassMetadata::ONE, ClassMetadata::MANY], true)) {
                 throw new \RuntimeException(sprintf(
                     'You are trying to add `sonata_type_admin` field `%s` which is not One-To-One or  Many-To-One.'
                     .' Maybe you want `sonata_type_collection` instead?',

src/Builder/ListBuilder.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Builder;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
@@ -118,17 +118,17 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
             $template = $this->getTemplate($fieldDescription->getType());
 
             if (null === $template) {
-                if (ClassMetadataInfo::ONE === $fieldDescription->getMappingType()) {
+                if (ClassMetadata::ONE === $fieldDescription->getMappingType()) {
                     $template = '@SonataAdmin/CRUD/Association/list_many_to_one.html.twig';
-                } elseif (ClassMetadataInfo::MANY === $fieldDescription->getMappingType()) {
+                } elseif (ClassMetadata::MANY === $fieldDescription->getMappingType()) {
                     $template = '@SonataAdmin/CRUD/Association/list_many_to_many.html.twig';
                 }
             }
 
             $fieldDescription->setTemplate($template);
         }
 
-        if (\in_array($fieldDescription->getMappingType(), [ClassMetadataInfo::ONE, ClassMetadataInfo::MANY], true)) {
+        if (\in_array($fieldDescription->getMappingType(), [ClassMetadata::ONE, ClassMetadata::MANY], true)) {
             $admin->attachAdminClass($fieldDescription);
         }
     }

src/Builder/ShowBuilder.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Builder;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
@@ -101,17 +101,17 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
             $template = $this->getTemplate($fieldDescription->getType());
 
             if (null === $template) {
-                if (ClassMetadataInfo::ONE === $fieldDescription->getMappingType()) {
+                if (ClassMetadata::ONE === $fieldDescription->getMappingType()) {
                     $template = '@SonataAdmin/CRUD/Association/show_many_to_one.html.twig';
-                } elseif (ClassMetadataInfo::MANY === $fieldDescription->getMappingType()) {
+                } elseif (ClassMetadata::MANY === $fieldDescription->getMappingType()) {
                     $template = '@SonataAdmin/CRUD/Association/show_many_to_many.html.twig';
                 }
             }
 
             $fieldDescription->setTemplate($template);
         }
 
-        if (\in_array($fieldDescription->getMappingType(), [ClassMetadataInfo::ONE, ClassMetadataInfo::MANY], true)) {
+        if (\in_array($fieldDescription->getMappingType(), [ClassMetadata::ONE, ClassMetadata::MANY], true)) {
             $admin->attachAdminClass($fieldDescription);
         }
     }

src/Filter/AbstractDateFilter.php

@@ -58,14 +58,14 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
                 return $this->applyTypeIsEqual($queryBuilder, $field, $data);
 
             case DateType::TYPE_GREATER_THAN:
-                if (!array_key_exists('value', $data) || !$data['value']) {
+                if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 
                 return $this->applyTypeIsGreaterThan($queryBuilder, $field, $data);
 
             case DateType::TYPE_LESS_EQUAL:
-                if (!array_key_exists('value', $data) || !$data['value']) {
+                if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 

src/Filter/BooleanFilter.php

@@ -27,7 +27,7 @@ class BooleanFilter extends Filter
      */
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
     {
-        if (!$data || !\is_array($data) || !array_key_exists('type', $data) || !array_key_exists('value', $data)) {
+        if (!$data || !\is_array($data) || !\array_key_exists('type', $data) || !\array_key_exists('value', $data)) {
             return;
         }
 

src/Filter/ChoiceFilter.php

@@ -27,7 +27,7 @@ class ChoiceFilter extends Filter
      */
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
     {
-        if (!$data || !\is_array($data) || !array_key_exists('type', $data) || !array_key_exists('value', $data)) {
+        if (!$data || !\is_array($data) || !\array_key_exists('type', $data) || !\array_key_exists('value', $data)) {
             return;
         }
 

src/Filter/ModelFilter.php

@@ -28,7 +28,7 @@ class ModelFilter extends Filter
      */
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
     {
-        if (!$data || !\is_array($data) || !array_key_exists('value', $data)) {
+        if (!$data || !\is_array($data) || !\array_key_exists('value', $data)) {
             return;
         }
 

src/Filter/NumberFilter.php

@@ -25,7 +25,7 @@ class NumberFilter extends Filter
      */
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
     {
-        if (!$data || !\is_array($data) || !array_key_exists('value', $data) || !is_numeric($data['value'])) {
+        if (!$data || !\is_array($data) || !\array_key_exists('value', $data) || !is_numeric($data['value'])) {
             return;
         }
 

src/Filter/StringFilter.php

@@ -24,7 +24,7 @@ class StringFilter extends Filter
      */
     public function filter(ProxyQueryInterface $queryBuilder, $name, $field, $data)
     {
-        if (!$data || !\is_array($data) || !array_key_exists('value', $data) || null === $data['value']) {
+        if (!$data || !\is_array($data) || !\array_key_exists('value', $data) || null === $data['value']) {
             return;
         }
 

src/Guesser/FilterTypeGuesser.php

@@ -14,7 +14,7 @@
 namespace Sonata\DoctrineMongoDBAdminBundle\Guesser;
 
 use Doctrine\Bundle\MongoDBBundle\Form\Type\DocumentType;
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\CoreBundle\Form\Type\BooleanType;
 use Sonata\CoreBundle\Form\Type\EqualType;
@@ -49,11 +49,8 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
             $mapping = $metadata->fieldMappings[$propertyName];
 
             switch ($mapping['type']) {
-                case ClassMetadataInfo::ONE:
-                case ClassMetadataInfo::MANY:
-                    //case ClassMetadataInfo::MANY_TO_ONE:
-                    //case ClassMetadataInfo::MANY_TO_MANY:
-
+                case ClassMetadata::ONE:
+                case ClassMetadata::MANY:
                     $options['operator_type'] = EqualType::class;
                     $options['operator_options'] = [];
 
@@ -69,7 +66,7 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
             }
         }
 
-        if (!array_key_exists($propertyName, $metadata->fieldMappings)) {
+        if (!\array_key_exists($propertyName, $metadata->fieldMappings)) {
             throw new MissingPropertyMetadataException($class, $property);
         }
 

src/Guesser/TypeGuesser.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Guesser;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\TypeGuess;
@@ -35,10 +35,10 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
             $mapping = $metadata->fieldMappings[$propertyName];
 
             switch ($mapping['type']) {
-                case ClassMetadataInfo::ONE:
+                case ClassMetadata::ONE:
                     return new TypeGuess('mongo_one', [], Guess::HIGH_CONFIDENCE);
 
-                case ClassMetadataInfo::MANY:
+                case ClassMetadata::MANY:
                     return new TypeGuess('mongo_many', [], Guess::HIGH_CONFIDENCE);
             }
         }

src/Model/ModelManager.php

@@ -430,10 +430,10 @@ public function modelReverseTransform($class, array $array = [])
         foreach ($array as $name => $value) {
             $reflection_property = false;
             // property or association ?
-            if (array_key_exists($name, $metadata->fieldMappings)) {
+            if (\array_key_exists($name, $metadata->fieldMappings)) {
                 $property = $metadata->fieldMappings[$name]['fieldName'];
                 $reflection_property = $metadata->reflFields[$name];
-            } elseif (array_key_exists($name, $metadata->associationMappings)) {
+            } elseif (\array_key_exists($name, $metadata->associationMappings)) {
                 $property = $metadata->associationMappings[$name]['fieldName'];
             } else {
                 $property = $name;

tests/Admin/FieldDescriptionTest.php

@@ -201,7 +201,7 @@ public function testGetValue()
             ->getMock();
         $mockedObject->expects($this->once())
             ->method('myMethod')
-            ->will($this->returnValue('myMethodValue'));
+            ->willReturn('myMethodValue');
 
         $field = new FieldDescription();
         $field->setOption('code', 'myMethod');
@@ -218,7 +218,7 @@ public function testGetValueWhenCannotRetrieve()
             ->getMock();
         $mockedObject->expects($this->never())
             ->method('myMethod')
-            ->will($this->returnValue('myMethodValue'));
+            ->willReturn('myMethodValue');
 
         $field = new FieldDescription();
 

tests/Builder/FormContractorTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Tests\Builder;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
@@ -107,7 +107,7 @@ public function testDefaultOptionsForSonataFormTypes()
         }
 
         // admin type
-        $fieldDescription->method('getMappingType')->willReturn(ClassMetadataInfo::ONE);
+        $fieldDescription->method('getMappingType')->willReturn(ClassMetadata::ONE);
         foreach ($adminTypes as $formType) {
             $options = $this->formContractor->getDefaultOptions($formType, $fieldDescription);
             $this->assertSame($fieldDescription, $options['sonata_field_description']);
@@ -117,7 +117,7 @@ public function testDefaultOptionsForSonataFormTypes()
         }
 
         // collection type
-        $fieldDescription->method('getMappingType')->willReturn(ClassMetadataInfo::MANY);
+        $fieldDescription->method('getMappingType')->willReturn(ClassMetadata::MANY);
         foreach ($collectionTypes as $index => $formType) {
             $options = $this->formContractor->getDefaultOptions($formType, $fieldDescription);
             $this->assertSame($fieldDescription, $options['sonata_field_description']);

tests/Filter/FilterWithQueryBuilderTest.php

@@ -26,18 +26,18 @@ public function setUp()
         $this->queryBuilder
                 ->expects($this->any())
                 ->method('field')
-                ->will($this->returnSelf())
+                ->willReturnSelf()
         ;
         $this->expr = $this->createMock('Doctrine\ODM\MongoDB\Query\Expr');
         $this->expr
             ->expects($this->any())
             ->method('field')
-            ->will($this->returnSelf())
+            ->willReturnSelf()
         ;
         $this->queryBuilder
             ->expects($this->any())
             ->method('expr')
-            ->will($this->returnValue($this->expr))
+            ->willReturn($this->expr)
         ;
     }
 

tests/Filter/ModelFilterTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\DoctrineMongoDBAdminBundle\Tests\Filter;
 
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Sonata\CoreBundle\Form\Type\EqualType;
 use Sonata\DoctrineMongoDBAdminBundle\Datagrid\ProxyQuery;
 use Sonata\DoctrineMongoDBAdminBundle\Filter\ModelFilter;
@@ -34,8 +34,8 @@ class ModelFilterTest extends FilterWithQueryBuilderTest
     public function getFieldDescription(array $options)
     {
         $fieldDescription = $this->createMock('Sonata\AdminBundle\Admin\FieldDescriptionInterface');
-        $fieldDescription->expects($this->once())->method('getOptions')->will($this->returnValue($options));
-        $fieldDescription->expects($this->once())->method('getName')->will($this->returnValue('field_name'));
+        $fieldDescription->expects($this->once())->method('getOptions')->willReturn($options);
+        $fieldDescription->expects($this->once())->method('getName')->willReturn('field_name');
 
         return $fieldDescription;
     }
@@ -98,7 +98,7 @@ public function testAssociationWithValidMappingAndEmptyFieldName()
         $this->expectException(\RuntimeException::class);
 
         $filter = new ModelFilter();
-        $filter->initialize('field_name', ['mapping_type' => ClassMetadataInfo::ONE, 'field_mapping' => true]);
+        $filter->initialize('field_name', ['mapping_type' => ClassMetadata::ONE, 'field_mapping' => true]);
 
         $builder = new ProxyQuery($this->getQueryBuilder());
 
@@ -110,7 +110,7 @@ public function testAssociationWithValidMapping()
     {
         $filter = new ModelFilter();
         $filter->initialize('field_name', [
-            'mapping_type' => ClassMetadataInfo::ONE,
+            'mapping_type' => ClassMetadata::ONE,
             'field_name' => 'field_name',
             'association_mapping' => [
                 'fieldName' => 'association_mapping',
@@ -128,7 +128,7 @@ public function testAssociationWithValidParentAssociationMappings()
     {
         $filter = new ModelFilter();
         $filter->initialize('field_name', [
-            'mapping_type' => ClassMetadataInfo::ONE,
+            'mapping_type' => ClassMetadata::ONE,
             'field_name' => 'field_name',
             'parent_association_mappings' => [
                 [

tests/Guesser/FilterTypeGuesserTest.php

@@ -35,6 +35,9 @@ public function testThrowsOnMissingField()
 
         $class = 'My\Model';
         $property = 'whatever';
+
+        $this->metadata->hasAssociation($property)->willReturn(false);
+
         $this->modelManager->getParentMetadataForProperty($class, $property)->willReturn([
             $this->metadata->reveal(),
             $property,