From bc68d4d1e1f79a6f751fed5bf6b715019e3b1ab9 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Sun, 12 Oct 2014 08:09:22 -0400
Subject: [PATCH] fix test setup, added php 5.6, hhvm no longer allowed to fail
---
.travis.yml | 2 +-
Tests/Resources/app/config/config.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index aae6203..ec9744b 100644
--- 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
index 83a6169..8e64755 100644
--- 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');