Merge branch '1.x'

Conflicts:
	.travis.yml

Author: stof

.travis.yml

@@ -9,15 +9,22 @@ php:
 
 matrix:
   include:
-    - php: 5.5
+    - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
-    - php: 5.5
-      env: SYMFONY_VERSION='dev-master'
+    - php: 5.6
+      env: SYMFONY_VERSION='2.5.*'
 
-before_script:
-  - composer self-update
+sudo: false
+
+cache:
+  directory:
+    - $HOME/.composer/cache
+
+before_install:
   - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
-  - composer install --prefer-source
+
+install:
+  - composer install
 
 script:
   - phpunit --coverage-text

composer.json

@@ -22,10 +22,12 @@
         "symfony/console": "~2.3",
         "willdurand/jsonp-callback-validator": "~1.0"
     },
+    "require-dev": {
+        "symfony/expression-language": "~2.4"
+    },
     "autoload": {
-        "psr-0": { "FOS\\JsRoutingBundle": "" }
+        "psr-4": { "FOS\\JsRoutingBundle\\": "" }
     },
-    "target-dir": "FOS/JsRoutingBundle",
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"