updated dependencies

Author: lsmith77

app/AppKernel.php

@@ -34,6 +34,7 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
             new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
             new FM\ElfinderBundle\FMElfinderBundle(),
+            new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),

app/config/config.yml

@@ -304,12 +304,6 @@ liip_imagine:
             filters:
                 thumbnail: { size: [50, 50], mode: outbound }
 
-cmf_media:
-    upload_file_role:        ROLE_CAN_UPLOAD_FILE
-    use_jms_serializer:      auto
-    use_elfinder:            auto
-    use_imagine:             auto
-
 fm_elfinder:
     locale: %locale%
     editor: ckeditor
@@ -331,7 +325,7 @@ doctrine_cache:
 fos_rest:
     view:
         force_redirects:
-          html: true
+            html: true
         formats:
             json: true
             xml: true

app/config/routing.yml

@@ -41,9 +41,8 @@ sonata_admin:
     type: sonata_admin
     prefix: /{_locale}/admin
 
-_imagine:
-    resource: .
-    type:     imagine
+_liip_imagine:
+    resource: "@LiipImagineBundle/Resources/config/routing.xml"
 
 fos_js_routing:
     resource: @FOSJsRoutingBundle/Resources/config/routing/routing.xml

composer.json

@@ -22,32 +22,33 @@
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "1.1.*",
-        "symfony-cmf/simple-cms-bundle": "1.1.*",
-        "symfony-cmf/search-bundle": "1.0.*",
-        "symfony-cmf/create-bundle": "1.1.*",
-        "symfony-cmf/seo-bundle": "1.0.*",
+        "symfony-cmf/symfony-cmf": "1.2.*",
+        "symfony-cmf/simple-cms-bundle": "1.2.*",
+        "symfony-cmf/search-bundle": "1.1.*",
+        "symfony-cmf/create-bundle": "1.2.*",
+        "symfony-cmf/seo-bundle": "1.1.*",
+        "symfony-cmf/routing-auto-bundle": "1.0.*",
         "jackalope/jackalope-doctrine-dbal": "1.1.*",
         "jackalope/jackalope-jackrabbit": "1.1.*",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/doctrine-cache-bundle": "1.0.*",
         "sonata-project/cache-bundle": "2.1.*",
-        "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*",
+        "sonata-project/doctrine-phpcr-admin-bundle": "1.2.*",
         "sonata-project/jquery-bundle": "1.8.3",
-        "symfony-cmf/block-bundle": "1.1.*",
+        "symfony-cmf/block-bundle": "1.2.*",
         "eko/feedbundle": "1.0.*",
         "lunetics/locale-bundle": "2.3.*",
-        "liip/imagine-bundle": "0.21.*",
+        "liip/imagine-bundle": "1.0.*",
         "wjzijderveld/check-bundles": "1.1.*",
         "helios-ag/fm-elfinder-bundle": "1.4.*",
         "burgov/key-value-form-bundle": "1.0.*"
     },
     "require-dev": {
         "liip/functional-test-bundle": "1.0.*",
-        "symfony-cmf/testing": "1.1.*"
+        "symfony-cmf/testing": "1.2.*"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "scripts": {
         "post-install-cmd": [
             "WillemJan\\CheckBundles\\Composer\\CheckBundles::postPackageUpdate",
@@ -64,13 +65,21 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets"
         ]
     },
+    "config": {
+        "bin-dir": "bin"
+    },
     "extra": {
         "checkbundles-ignore": [
             "Liip\\FunctionalTestBundle\\LiipFunctionalTestBundle",
             "Sensio\\Bundle\\DistributionBundle\\SensioDistributionBundle"
         ],
         "symfony-app-dir": "app",
         "symfony-web-dir": "web",
-        "symfony-assets-install": "symlink"
+        "incenteev-parameters": {
+            "file": "app/config/parameters.yml"
+        },
+        "branch-alias": {
+            "dev-master": "1.2-dev"
+        }
     }
 }