Merge 462e086 into e999a4f

sonata-project · Jan 29, 2020 · 970a5c2 · 970a5c2
2 parents e999a4f + 462e086
commit 970a5c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -43,7 +43,7 @@ public function getConfigTreeBuilder()
                         ->scalarNode('category')->defaultValue('Application\\Sonata\\ClassificationBundle\\Entity\\Category')->end()
                         ->scalarNode('collection')->defaultValue('Application\\Sonata\\ClassificationBundle\\Entity\\Collection')->end()
                         ->scalarNode('context')->defaultValue('Application\\Sonata\\ClassificationBundle\\Entity\\Context')->end()
-                        ->scalarNode('media')->defaultValue('Application\\Sonata\\MediaBundle\\Entity\\Media')->end()
+                        ->scalarNode('media')->defaultNull()->end()
                     ->end()
                 ->end()
 

diff --git a/src/DependencyInjection/SonataClassificationExtension.php b/src/DependencyInjection/SonataClassificationExtension.php
@@ -14,7 +14,6 @@
 namespace Sonata\ClassificationBundle\DependencyInjection;
 
 use Sonata\EasyExtendsBundle\Mapper\DoctrineCollector;
-use Sonata\MediaBundle\Model\MediaInterface;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -197,7 +196,7 @@ public function registerDoctrineMapping(array $config)
 
         $collector->addUnique($config['class']['collection'], 'tag_collection', ['slug', 'context']);
 
-        if (interface_exists(MediaInterface::class)) {
+        if (null === $config['class']['media']) {
             $collector->addAssociation($config['class']['collection'], 'mapManyToOne', [
                 'fieldName' => 'media',
                 'targetEntity' => $config['class']['media'],