Merge pull request #26 from jankramer/fix-dependencies

Updated dependencies

Author: dbu

.travis.yml

@@ -8,8 +8,8 @@ before_script:
   - composer install
   - php app/console doctrine:database:create -e=test
   - php app/console doctrine:phpcr:init:dbal -e=test
-  - app/console doctrine:phpcr:register-system-node-types -e=test
-  - app/console doctrine:phpcr:workspace:create standard_test -e=test
+  - php app/console doctrine:phpcr:workspace:create standard_test -e=test
+  - php app/console doctrine:phpcr:repository:init -e=test
 
 script: phpunit -c app
 

app/AppKernel.php

@@ -23,7 +23,7 @@ public function registerBundles()
             new JMS\SerializerBundle\JMSSerializerBundle($this),
 
             // enable cmf bundles
-            new Symfony\Cmf\Bundle\RoutingExtraBundle\SymfonyCmfRoutingExtraBundle(),
+            new Symfony\Cmf\Bundle\RoutingBundle\SymfonyCmfRoutingBundle(),
             new Symfony\Cmf\Bundle\CoreBundle\SymfonyCmfCoreBundle(),
             new Symfony\Cmf\Bundle\MenuBundle\SymfonyCmfMenuBundle(),
             new Symfony\Cmf\Bundle\ContentBundle\SymfonyCmfContentBundle(),

app/config/config.yml

@@ -58,10 +58,8 @@ doctrine_phpcr:
         auto_generate_proxy_classes: %kernel.debug%
         locales:
             en:
-                - en
                 - de
             de:
-                - de
                 - en
 
 liip_doctrine_cache:
@@ -71,7 +69,7 @@ liip_doctrine_cache:
         nodes:
             type: file_system
 
-symfony_cmf_routing_extra:
+symfony_cmf_routing:
     dynamic:
         enabled: true
 
@@ -80,7 +78,7 @@ symfony_cmf_simple_cms:
         templates_by_class:
             Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  SymfonyCmfSimpleCmsBundle:Page:index.html.twig
         controllers_by_class:
-            Symfony\Cmf\Bundle\RoutingExtraBundle\Document\RedirectRoute:  symfony_cmf_routing_extra.redirect_controller:redirectAction
+            Symfony\Cmf\Bundle\RoutingBundle\Document\RedirectRoute:  symfony_cmf_routing.redirect_controller:redirectAction
     multilang:
         locales: %locales%
     use_sonata_admin: false
@@ -101,4 +99,4 @@ lunetics_locale:
         - cookie
         - router
         - browser
-    allowed_locales: %locales%
+    allowed_locales: %locales%

composer.json

@@ -24,13 +24,13 @@
     },
     "scripts": {
         "post-install-cmd": [
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::initSubmodules",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::initSubmodules",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"