Merge pull request #120 from symfony-cmf/fix_tests

fix test setup, added php 5.6
symfony-cmf · Oct 12, 2014 · 862cae0 · 862cae0
2 parents 552c982 + bc68d4d
commit 862cae0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
     - hhvm
 
 env:
@@ -12,7 +13,6 @@ env:
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
-    - php: hhvm
   include:
     - php: 5.5
       env: SYMFONY_VERSION=2.3.*

diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
@@ -1,6 +1,6 @@
 <?php
-// Tests/Resources/app/config/config.php
 
+$container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\ContentBundle');
 $loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');