Make base code compatible with Symfony3

egeloen · Dec 12, 2015 · e61dbf2 · e61dbf2
1 parent 3d787b8
commit e61dbf2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,23 +6,21 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
-    - hhvm-nightly
 
 env:
     global:
         - COMPOSER_PREFER_LOWEST=false
+        - SYMFONY_DEPRECATIONS_HELPER=weak
         - SYMFONY_VERSION=2.3.*
-
-cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
+        - SYMFONY_PHPUNIT_BRIDGE_VERSION=2.7.*
 
 install:
     - composer self-update
     - composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}
     - composer require --no-update symfony/filesystem:${SYMFONY_VERSION}
+    - composer require --dev --no-update symfony/phpunit-bridge:${SYMFONY_PHPUNIT_BRIDGE_VERSION}
     - if [[ "$SYMFONY_VERSION" = *dev* ]]; then sed -i "s/\"MIT\"/\"MIT\",\"minimum-stability\":\"dev\"/g" composer.json; fi
     - composer update --prefer-source `if [[ $COMPOSER_PREFER_LOWEST = true ]]; then echo "--prefer-lowest --prefer-stable"; fi`
 
@@ -33,24 +31,25 @@ after_script: bin/coveralls -v
 matrix:
     include:
         - php: 5.6
-          env: COMPOSER_PREFER_LOWEST=true
-        - php: 5.6
-          env: SYMFONY_VERSION=2.0.*
-        - php: 5.6
-          env: SYMFONY_VERSION=2.1.*
+          env: SYMFONY_VERSION=2.3.* COMPOSER_PREFER_LOWEST=true
         - php: 5.6
-          env: SYMFONY_VERSION=2.2.*
+          env: SYMFONY_VERSION=3.0.* SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.* COMPOSER_PREFER_LOWEST=true
         - php: 5.6
           env: SYMFONY_VERSION=2.4.*
         - php: 5.6
           env: SYMFONY_VERSION=2.5.*
         - php: 5.6
           env: SYMFONY_VERSION=2.6.*
         - php: 5.6
-          env: SYMFONY_VERSION=2.7.*@dev
+          env: SYMFONY_VERSION=2.7.*
+        - php: 5.6
+          env: SYMFONY_VERSION=2.8.* SYMFONY_PHPUNIT_BRIDGE_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=strict
+        - php: 5.6
+          env: SYMFONY_VERSION=3.0.* SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.* SYMFONY_DEPRECATIONS_HELPER=strict
+        - php: 5.6
+          env: SYMFONY_VERSION=3.0.*@dev SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.*@dev SYMFONY_DEPRECATIONS_HELPER=strict
     allow_failures:
-        - php: hhvm-nightly
-        - env: SYMFONY_VERSION=2.7.*@dev
+        - env: SYMFONY_VERSION=3.0.*@dev SYMFONY_PHPUNIT_BRIDGE_VERSION=3.0.*@dev SYMFONY_DEPRECATIONS_HELPER=strict
 
 notifications:
     email: geloen.eric@gmail.com
diff --git a/composer.json b/composer.json
@@ -12,16 +12,17 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/config": "^2.0.5",
-        "symfony/dependency-injection": "^2.0.5",
-        "symfony/filesystem": "~2.0",
-        "symfony/framework-bundle": "~2.0",
-        "zendframework/zendsearch": "dev-master"
+        "symfony/config": "^2.3|^3.0",
+        "symfony/dependency-injection": "^2.3|^3.0",
+        "symfony/filesystem": "^2.3|^3.0",
+        "symfony/framework-bundle": "^2.3|^3.0",
+        "zendframework/zendsearch": "^2.0@rc"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "satooshi/php-coveralls": "~0.7@dev",
-        "symfony/yaml": "^2.0.5"
+        "symfony/phpunit-bridge": "^2.7|^3.0",
+        "symfony/yaml": "^2.3|^3.0"
     },
     "autoload": {
         "psr-4": { "Ivory\\LuceneSearchBundle\\": "" }