Change dependencies definitions. Tweak Travis

Benoît Burnichon · Benoît Burnichon · commit 529238b89b94 · 2016-01-25T12:27:53.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,12 @@ php:
 
 matrix:
   fast_finish: true
+  include:
+    - php: 5.3.3
+      env: PREFER_LOWEST="--prefer-lowest"
 
 pre_install:
   - phpenv config-rm xdebug.ini
 install:
-  - composer update --prefer-source
+  - composer update --prefer-source --no-interaction $PREFER_LOWEST
+  - if [ -n "$PREFER_LOWEST" ];then composer update phpunit/phpunit --prefer-source --no-interaction --with-dependencies;fi
diff --git a/composer.json b/composer.json
@@ -17,26 +17,26 @@
         }
     ],
     "require": {
-        "php"                  : ">=5.3.3",
-        "doctrine/collections" : "~1.0",
-        "doctrine/cache"       : "~1.0",
-        "monolog/monolog"      : "~1.3",
-        "phpexiftool/exiftool" : "10.07",
-        "symfony/process"      : "~2.0",
-        "symfony/console"      : "~2.0"
+        "php": ">=5.3.3",
+        "doctrine/cache": "^1.0",
+        "doctrine/collections": "^1.0",
+        "monolog/monolog": "^1.3",
+        "phpexiftool/exiftool": "10.10",
+        "symfony/console": "^2.1",
+        "symfony/process": "^2.1"
     },
     "suggest": {
-        "jms/serializer"       : "To serialize tags",
-        "symfony/yaml"         : "To serialize tags in Yaml format"
+        "jms/serializer": "To serialize tags",
+        "symfony/yaml": "To serialize tags in Yaml format"
     },
     "require-dev": {
-        "symfony/css-selector" : "~2.0",
-        "symfony/finder"       : "~2.0",
-        "symfony/dom-crawler"  : "~2.0",
-        "symfony/yaml"         : "~2.0",
-        "jms/serializer"       : "~0.10",
-        "sami/sami"            : "~1.0",
-        "silex/silex"          : "~1.0"
+        "jms/serializer": "~0.10|^1.0",
+        "phpunit/phpunit": "^4.0|^5.0",
+        "silex/silex": "~1.0",
+        "symfony/css-selector": "^2.1|^3.0",
+        "symfony/dom-crawler": "^2.1|^3.0",
+        "symfony/finder": "^2.1|^3.0",
+        "symfony/yaml": "^2.1|^3.0"
     },
     "replace": {
         "phpexiftool/phpexiftool" : "<0.5.0"
diff --git a/composer.lock b/composer.lock
