From 7a7cb25d7a5e24819c7f087b7e0b5ff68a3b6788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 27 Dec 2014 16:10:23 +0100 Subject: [PATCH] update Fixtures app config --- Tests/Fixtures/App/app/config/config.yml | 9 +++++++++ Tests/Fixtures/App/app/config/routing.yml | 3 +++ composer.json | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Tests/Fixtures/App/app/config/config.yml b/Tests/Fixtures/App/app/config/config.yml index 30e547831..9fdeaf68d 100644 --- a/Tests/Fixtures/App/app/config/config.yml +++ b/Tests/Fixtures/App/app/config/config.yml @@ -26,6 +26,15 @@ doctrine: auto_generate_proxy_classes: "%kernel.debug%" auto_mapping: true +# Assetic Configuration +assetic: + debug: "%kernel.debug%" + use_controller: false + bundles: [ ] + #java: /usr/bin/java + filters: + cssrewrite: ~ + chill_main: available_languages: [ fr, nl, en ] diff --git a/Tests/Fixtures/App/app/config/routing.yml b/Tests/Fixtures/App/app/config/routing.yml index 7698f5065..7f31da766 100644 --- a/Tests/Fixtures/App/app/config/routing.yml +++ b/Tests/Fixtures/App/app/config/routing.yml @@ -1,6 +1,9 @@ cl_custom_fields: resource: . type: chill_routes + +chill_main: + resource: "@ChillMainBundle/Resources/config/routing.yml" test_custom_field_form_render: path: /customfieldsgroup/test/render/{id} diff --git a/composer.json b/composer.json index 0f7dc365e..1e292bc81 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,9 @@ "require": { "php": "~5.5", "symfony/symfony": "2.5.*", - "doctrine/orm": "~2.5@dev", - "doctrine/dbal" : "~2.5@dev", + "doctrine/orm": "2.5.x-dev@dev", + "doctrine/dbal" : "~2.5@RC", + "doctrine/common": "~2.4", "doctrine/doctrine-bundle": "~1.2@dev", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3",