From 3990c460c16177afe6cfa6da13a11b6823bc8d81 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Wed, 10 Feb 2016 20:29:54 +0100
Subject: [PATCH 1/2] Improve test setup

---
 .travis.yml   | 28 ++++++++++++++--------------
 composer.json |  7 +++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9f02d2a..9660e234 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,35 +13,35 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache/files
-
+ 
 env:
-  - SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
+  global:
+    - SYMFONY_DEPRECATIONS_HELPER=1457
 
 matrix:
   include:
-    - php: 5.3
-      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
-      env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
+      env: DEPS=dev
+    - php: 5.3
+      env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
+      env: SYMFONY_VERSION=2.3.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-  allow_failures:
-    - env: SYMFONY_VERSION=2.8.*
-    - env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.7.*
   fast_finish: true
 
 before_install:
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
   - composer self-update
-  - sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
-  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
   
-install: composer update $COMPOSER_FLAGS --prefer-dist
+install: composer update --prefer-dist $COMPOSER_FLAGS
 
 before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit --coverage-text
+script: phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
diff --git a/composer.json b/composer.json
index 45c2b374..633e8efe 100644
--- a/composer.json
+++ b/composer.json
@@ -11,21 +11,20 @@
             "homepage": "https://github.com/symfony-cmf/BlockBundle/contributors"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "^2.3",
         "doctrine/phpcr-bundle" :"^1.0",
         "doctrine/phpcr-odm": "^1.0",
-        "sonata-project/block-bundle": ">=2.3,<2.5",
+        "sonata-project/block-bundle": ">=2.2.12,<2.5",
         "symfony-cmf/core-bundle": "^1.1"
     },
     "conflict": {
         "symfony/framework-bundle": ">=2.3.0,<2.3.2"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.2.6",
-        "symfony-cmf/menu-bundle": "^1.1",
+        "symfony-cmf/testing": "^1.3@RC",
+        "symfony-cmf/menu-bundle": "^1.1|^2.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
         "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1",
         "sonata-project/cache-bundle": ">=2.1.3,<2.1.6",

From 86478f6c016035f4d3df53a76396f02454af305f Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Wed, 10 Feb 2016 22:51:57 +0100
Subject: [PATCH 2/2] Removed BlogBundle submodule

---
 BlogBundle | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 BlogBundle

diff --git a/BlogBundle b/BlogBundle
deleted file mode 160000
index e49d93a1..00000000
--- a/BlogBundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e49d93a19327ca9a2f45fd838adf341ec78cc980