Merge branch 'hotfix/config-inheritance'

.travis.yml

@@ -24,7 +24,9 @@ php:
 before_script: ./tests/beforetests.sh
 
 after_script:
-    - cat /tmp/http_log
+    - ./tests/travis_print_logs.sh
+    - cat app/logs/admin/prod/prod.log
+    - cat app/logs/website/prod/prod.log
 
 notifications:
     slack:

CHANGELOG.md

@@ -1,6 +1,9 @@
 CHANGELOG for Sulu CMF
 ======================
 
+* dev-master
+    * HOTFIX      #475  [All]            Fixed inheritance of configs and moved liip-theme config
+
 * 1.0.0 (2015-07-01)
     * ENHANCEMENT #471  [SULU-STANDARD]  Cleanup config to reduce merge conflicts
     * ENHANCEMENT #1319 [ContentBundle]  Fixed location of cached structures

app/config/admin/config.yml

@@ -1,7 +1,7 @@
 imports:
-    - { resource: ../config.yml }
     - { resource: sulu.yml }
     - { resource: security.yml }
+    - { resource: ../config.yml }
     - { resource: ../widgets.yml }
 
 # Assetic Configuration

app/config/admin/sulu.yml

@@ -1,6 +1,3 @@
-imports:
-    - { resource: ../sulu.yml }
-
 framework:
     router:
         resource: "%kernel.root_dir%/config/admin/routing.yml"

app/config/config.yml

@@ -1,13 +1,13 @@
 imports:
     - { resource: parameters.yml }
     - { resource: services.yml }
+    - { resource: sulu.yml }
 
 framework:
     #esi:             ~
     #translator:      { fallbacks: ["%locale%"] }
     secret:          "%secret%"
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
         strict_requirements: ~
     form:            ~
     csrf_protection: ~
@@ -70,3 +70,9 @@ swiftmailer:
     username:  "%mailer_user%"
     password:  "%mailer_password%"
     spool:     { type: memory }
+
+# LIIP Theme Configuration
+liip_theme:
+    themes: ["default"]
+    active_theme: "default"
+    load_controllers: false

app/config/sulu.yml

@@ -42,12 +42,6 @@ fos_rest:
     routing_loader:
         default_format: "json"
 
-# LIIP Theme Configuration
-liip_theme:
-    themes: ["default"]
-    active_theme: "default"
-    load_controllers: false
-
 # JMS Serializer
 jms_serializer:
     metadata:

app/config/website/config.yml

@@ -1,7 +1,7 @@
 imports:
-    - { resource: ../config.yml }
     - { resource: sulu.yml }
     - { resource: security.yml }
+    - { resource: ../config.yml }
 
 # Assetic Configuration
 assetic:

app/config/website/sulu.yml

@@ -1,6 +1,3 @@
-imports:
-    - { resource: ../sulu.yml }
-
 framework:
     router:
         resource: "%kernel.root_dir%/config/website/routing.yml"

tests/beforetests.sh

@@ -28,6 +28,7 @@ composer selfupdate
 composer install --no-interaction
 cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml
 cp app/Resources/pages/overview.xml.dist app/Resources/pages/overview.xml
+cp app/Resources/pages/default.xml.dist app/Resources/pages/default.xml
 
 php app/console sulu:build dev --no-interaction