Skip to content

Commit

Permalink
Remove media integration
Browse files Browse the repository at this point in the history
The media integration was previously removed by #196.
A bad merge introduce this issue.
  • Loading branch information
VincentLanglet authored and jordisala1991 committed Aug 22, 2020
1 parent 4595d63 commit aa05164
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
4 changes: 1 addition & 3 deletions composer.json
Expand Up @@ -42,8 +42,7 @@
"sonata-project/admin-bundle": "<3.68",
"sonata-project/block-bundle": "<3.19 || >=4.0",
"sonata-project/core-bundle": "<3.20",
"sonata-project/doctrine-orm-admin-bundle": "<3.16",
"sonata-project/media-bundle": "<3.20 || >=4.0"
"sonata-project/doctrine-orm-admin-bundle": "<3.16"
},
"require-dev": {
"doctrine/mongodb-odm": "^2.0",
Expand All @@ -54,7 +53,6 @@
"sonata-project/admin-bundle": "^3.68",
"sonata-project/block-bundle": "^3.19",
"sonata-project/doctrine-orm-admin-bundle": "^3.16",
"sonata-project/media-bundle": "^3.20",
"symfony/phpunit-bridge": "^5.1"
},
"suggest": {
Expand Down
15 changes: 1 addition & 14 deletions src/DependencyInjection/SonataClassificationExtension.php
Expand Up @@ -219,7 +219,7 @@ public function registerDoctrineMapping(array $config): void
private function registerSonataDoctrineMapping(array $config): void
{
foreach ($config['class'] as $type => $class) {
if ('media' !== $type && !class_exists($class)) {
if (!class_exists($class)) {
return;
}
}
Expand Down Expand Up @@ -262,18 +262,5 @@ private function registerSonataDoctrineMapping(array $config): void

$collector->addUnique($config['class']['tag'], 'tag_context', ['slug', 'context']);
$collector->addUnique($config['class']['collection'], 'tag_collection', ['slug', 'context']);

if (null !== $config['class']['media']) {
$mediaOptions = OptionsBuilder::createManyToOne('media', $config['class']['media'])
->cascade(['persist'])
->addJoin([
'name' => 'media_id',
'referencedColumnName' => 'id',
'onDelete' => 'SET NULL',
]);

$collector->addAssociation($config['class']['collection'], 'mapManyToOne', $mediaOptions);
$collector->addAssociation($config['class']['category'], 'mapManyToOne', $mediaOptions);
}
}
}

0 comments on commit aa05164

Please sign in to comment.