Merge pull request #359 from WouterJ/sf_3

Allow Symfony 3 to be installed

.travis.yml

@@ -33,19 +33,15 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
     - php: 5.6
-      env: SYMFONY_VERSION="3.0.x-dev as 2.8"
-  allow_failures:
-    - php: 7.0
-    - php: hhvm
-    - env: SYMFONY_VERSION="3.0.x-dev as 2.8"
+      env: SYMFONY_VERSION=3.0.*
 
 before_script:
-  - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d && echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - 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 selfupdate
   - composer config -q github-oauth.github.com $GITHUB_OAUTH_TOKEN
-  - if [ "$SYMFONY_VERSION" = "2.8.*@dev" ] || [ "$SYMFONY_VERSION" = "3.0.x-dev as 2.8" ]; then SYMFONY_DEPRECATIONS_HELPER=strict; fi;
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-  - travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+  - composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
   - export PATH=$HOME/.local/bin:$PATH
   - pip install -r Resources/doc/requirements.txt --user `whoami`
 

composer.json

@@ -16,11 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": "~5.5|~7.0",
         "sonata-project/admin-bundle": "~2.4",
         "sonata-project/block-bundle": "^2.3.2",
-        "symfony/framework-bundle": "~2.3",
-        "symfony/property-access": "~2.2",
+        "symfony/framework-bundle": "~2.3|~3.0",
+        "symfony/property-access": "~2.2|~3.0",
         "doctrine/phpcr-odm": "~1.1",
         "doctrine/phpcr-bundle": "~1.1",
         "symfony-cmf/tree-browser-bundle": "~2.0",
@@ -29,7 +29,7 @@
     "require-dev": {
         "jackalope/jackalope-jackrabbit": "~1.0",
         "symfony/phpunit-bridge": "~2.7|~3.0",
-        "symfony/security-acl": "~2.4",
+        "symfony/security-acl": "~2.4|~3.0",
         "fabpot/php-cs-fixer": "~0.1|~1.0"
     },
     "provide": {