Skip to content

Commit c34ddd9

Browse files
author
Bjorn Van Acker
committed
Fix composer conflicts for framework
1 parent 6834ea8 commit c34ddd9

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"twig/extra-bundle": "^3.3",
3737
"symfony/ux-autocomplete": "^2.8",
3838
"doctrine/doctrine-bundle": "^2.11",
39-
"doctrine/orm": "^3.0"
39+
"doctrine/orm": "^2.0"
4040
},
4141
"require-dev": {
4242
"roave/security-advisories": "dev-master",

config/services.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
use SumoCoders\FrameworkCoreBundle\Command\SecretsGetCommand;
66
use SumoCoders\FrameworkCoreBundle\Command\TranslateCommand;
7+
use SumoCoders\FrameworkCoreBundle\DoctrineListener\DoctrineAuditListener;
78
use SumoCoders\FrameworkCoreBundle\EventListener\TitleListener;
9+
use SumoCoders\FrameworkCoreBundle\Logger\AuditLogger;
810
use SumoCoders\FrameworkCoreBundle\Service\PageTitle;
911
use SumoCoders\FrameworkCoreBundle\Twig\ContentExtension;
1012
use Symfony\Component\Form\Extension\Core\Type\TimeType;
@@ -163,5 +165,8 @@
163165
->args([
164166
service('secrets.vault')
165167
])
166-
->tag('console.command');
168+
->tag('console.command')
169+
170+
->set(DoctrineAuditListener::class)
171+
->set(AuditLogger::class);
167172
};

0 commit comments

Comments
 (0)