Merge pull request #33 from symfony-cmf/prepare-next-version

[WIP] prepare for the next release
symfony-cmf · Aug 22, 2013 · da2c10f · da2c10f
2 parents 44f06c1 + 59ed9f0
commit da2c10f
Show file tree

Hide file tree

Showing 6 changed files with 444 additions and 311 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,11 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 
 before_script:
   - composer self-update
-  - composer install
+  - composer install --prefer-source
   - php app/console doctrine:database:create -e=test
   - php app/console doctrine:phpcr:init:dbal -e=test
   - php app/console doctrine:phpcr:workspace:create standard_test -e=test

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -21,13 +21,15 @@ public function registerBundles()
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
             new FOS\RestBundle\FOSRestBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new Liip\ImagineBundle\LiipImagineBundle(),
 
             // enable cmf bundles
             new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
             new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
             new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
             new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(),
             new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
+            new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
             new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
 
             // and the sandbox bundle

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -80,17 +80,12 @@ cmf_core:
     multilang:
         locales: %locales%
 
-cmf_create:
-    phpcr_odm: true
-
 cmf_simple_cms:
     routing:
         templates_by_class:
-            Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  CmfSimpleCmsBundle:Page:index.html.twig
+            Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig
         controllers_by_class:
-            Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
-    multilang:
-        locales: %locales%
+            Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction
 
 knp_menu:
     twig: true

diff --git a/composer.json b/composer.json
@@ -14,16 +14,17 @@
         "symfony/monolog-bundle": "2.3.*",
         "symfony/assetic-bundle": "2.3.*",
         "sensio/distribution-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "1.0.0-beta3",
-        "symfony-cmf/simple-cms-bundle": "1.0.0-beta3",
-        "symfony-cmf/create-bundle": "1.0.0-beta3",
+        "symfony-cmf/symfony-cmf": "1.0.0-beta6",
+        "symfony-cmf/simple-cms-bundle": "1.0.0-RC2",
+        "symfony-cmf/create-bundle": "1.0.0-beta4",
         "jackalope/jackalope-doctrine-dbal":"1.0.0-beta3",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/doctrine-fixtures-bundle": "2.1.*",
         "liip/functional-test-bundle": "1.0.*",
         "lunetics/locale-bundle": "2.2.*",
         "liip/doctrine-cache-bundle": "1.0.*",
-        "incenteev/composer-parameter-handler": "~2.0"
+        "incenteev/composer-parameter-handler": "~2.0",
+        "liip/imagine-bundle": "~0.12"
     },
     "scripts": {
         "post-install-cmd": [