Merge pull request #53 from szymach/development

Expanded Travis' testing matrix, streamlining dependencies
fsi-open · Feb 2, 2016 · 039d4aa · 039d4aa
2 parents 4a1cdfb + 3fbbf05
commit 039d4aa
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,32 +1,34 @@
 language: php
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-env:
-  - SYMFONY_VERSION=2.6.*
-  - SYMFONY_VERSION=2.7.*
-  - SYMFONY_VERSION=2.8.*@dev
-  - SYMFONY_VERSION=dev-master
-
 sudo: false
 
+cache:
+    directories:
+        - $HOME/.composer/cache
+
 matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master
-    - php: 7.0
-    - php: hhvm
-  exclude:
-    - env: SYMFONY_VERSION=dev-master
-      php: 5.4
+    include:
+        - php: 5.4
+          env:
+              - DEPENDENCIES='low'
+        - php: 5.5
+        - php: 5.6
+          env:
+              - SYMFONY_VERSION=2.6.*
+        - php: 5.6
+          env:
+              - SYMFONY_VERSION=2.7.*
+        - php: 5.6
+          env:
+              - SYMFONY_VERSION=2.8.*
+        - php: 7.0
 
 before_install:
+    - phpenv config-rm xdebug.ini
     - composer self-update
-    - composer require symfony/symfony:${SYMFONY_VERSION} -n --prefer-source
+    - if [[ "$DEPENDENCIES" != "low" && ! $SYMFONY_VERSION ]]; then composer update -n --prefer-source; fi;
+    - if [[ "$DEPENDENCIES" != "low" && $SYMFONY_VERSION ]]; then composer require symfony/symfony:${SYMFONY_VERSION} -n --prefer-source; fi;
+    - if [[ "$DEPENDENCIES" == "low" ]]; then composer update --prefer-lowest -n --prefer-source; fi;
 
 install:
     - wget http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar
@@ -39,7 +41,7 @@ before_script:
     - java -jar selenium-server-standalone-2.46.0.jar > /dev/null 2>&1 &
     - sleep 5
 
-script:    
+script:
     - bin/phpspec run -f progress -vvv
     - bin/behat --no-snippets --verbose --profile=travis -vvv
 

diff --git a/behat.yml.dist → behat.yml b/behat.yml.dist → behat.yml
diff --git a/composer.json b/composer.json
@@ -12,26 +12,30 @@
     ],
     "require": {
         "php": ">=5.4",
-        "symfony/framework-bundle": "~2.6",
-        "symfony/options-resolver": "~2.6",
+        "symfony/framework-bundle": "^2.6",
+        "symfony/options-resolver": "^2.6",
+        "symfony/routing": "^2.4",
+        "symfony/translation": "^2.6",
+        "symfony/validator": "^2.5",
         "fsi/admin-bundle": "~1.1@dev",
-        "fsi/doctrine-extensions-bundle": "~1.1,>=1.1.3",
-        "fsi/doctrine-extensions": "~1.1,>=1.1.2"
+        "fsi/data-indexer": "^0.9.5",
+        "fsi/doctrine-extensions-bundle": "^1.1.3",
+        "fsi/doctrine-extensions": "^1.1.3"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "doctrine/doctrine-bundle": "~1.4",
-        "phpspec/phpspec": "~2.2",
-        "behat/behat": "~3.0",
-        "behat/symfony2-extension": "~2.0",
-        "behat/mink": "~1.6",
-        "behat/mink-extension": "~2.0",
-        "behat/mink-browserkit-driver": "~1.2",
-        "behat/mink-selenium2-driver": "~1.2",
+        "doctrine/doctrine-bundle": "^1.6",
+        "phpspec/phpspec": "^2.4",
+        "behat/behat": "^3.0.15",
+        "behat/symfony2-extension": "^2.1",
+        "behat/mink": "^1.7",
+        "behat/mink-extension": "^2.1",
+        "behat/mink-browserkit-driver": "^1.3",
+        "behat/mink-selenium2-driver": "^1.3",
         "sensiolabs/behat-page-object-extension": "~2.0@dev",
-        "bossa/phpspec2-expect": "~1.0",
-        "fsi/resource-repository-bundle": "~1.1,>=1.1.2",
-        "egeloen/ckeditor-bundle": "~2.0"
+        "bossa/phpspec2-expect": "^1.0",
+        "fsi/resource-repository-bundle": "^1.1.2",
+        "egeloen/ckeditor-bundle": "^3.0"
     },
     "config": {
         "bin-dir": "bin"