fix test fail for AudienceTargetingBundle

sulu · Jun 26, 2018 · ebaa4aa · ebaa4aa
1 parent 0ef11c6
commit ebaa4aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@ CHANGELOG for Sulu
 ==================
 
 * dev-master
+    * BUGFIX      #4042 [AudienceTargetingBundle] Fix failings tests for 3.4.12
     * HOTFIX      #4019 [Component]               Fix handling of authored date on safari
     * HOTFIX      #4017 [SnippetBundle]           Fix snippet conflict overlay
 

diff --git a/composer.json b/composer.json
@@ -65,7 +65,7 @@
         "phpdocumentor/reflection-docblock": "~3.1"
     },
     "conflict": {
-        "symfony/symfony": "2.8.10",
+        "symfony/symfony": "2.8.10 || 3.4.12",
         "symfony/phpunit-bridge": "2.8.10",
         "symfony/monolog-bundle": "2.8.10",
         "jackalope/jackalope": "1.2.8 || 1.3.0 || 1.3.1",