update composer.json for migrating to SF2.2

.travis.yml

@@ -25,7 +25,7 @@ before_script:
        
         ' > ./Tests/Functional/app/config/parameters.yml
     - curl -s http://getcomposer.org/installer | php
-    - php composer.phar --dev install --prefer-dist
+    - php composer.phar install --dev --prefer-dist
     - php ./Tests/Functional/app/console doctrine:schema:create
     - php ./Tests/Functional/app/console doctrine:schema:update --force
 

composer.json

@@ -19,7 +19,7 @@
         "doctrine/orm": "~2.2,>=2.2.3",
         "doctrine/doctrine-bundle": "1.2.*",
         "twig/extensions": "1.0.*",
-        "knplabs/knp-paginator-bundle": "2.3.*@dev"
+        "knplabs/knp-paginator-bundle": "dev-master"
     },
     "require-dev": {
         "symfony/swiftmailer-bundle": "2.2.*",
@@ -28,10 +28,12 @@
         "doctrine/doctrine-fixtures-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "v2.1.0",
         "behat/behat": "2.4.*@stable",
-        "behat/mink": "1.4@stable",
+        "behat/mink": "v1.5.0",
         "behat/mink-goutte-driver": "*",
+
         "behat/mink-browserkit-driver": "*",
         "behat/mink-selenium2-driver": "*",
+
         "behat/mink-extension": "*",
         "behat/symfony2-extension": "*",
         "phpunit/phpunit": "3.7.*",

script_behat.sh

@@ -5,17 +5,17 @@ rm -rRf ./Tests/Functional/app/logs/*
 
 rm -f ./Tests/Functional/app/config/parameters.yml
 echo 'parameters:
-    database_driver: pdo_mysql
-    database_host: 127.0.0.1
-    database_port: null
-    database_name: ccdn_test
-    database_user: ccdnroot
+    database_driver:   pdo_mysql
+    database_host:     127.0.0.1
+    database_port:     null
+    database_name:     ccdn_test
+    database_user:     ccdnroot
     database_password: root
-    locale: en
+    locale:            en
 
 ' > ./Tests/Functional/app/config/parameters.yml
 
-composer install --dev
+composer install --dev --prefer-dist
 
 php ./Tests/Functional/app/console --env=test doctrine:database:drop --force
 php ./Tests/Functional/app/console --env=test doctrine:database:create

script_phpunit.sh

@@ -5,17 +5,17 @@ rm -rRf ./Tests/Functional/app/logs/*
 
 rm -f ./Tests/Functional/app/config/parameters.yml
 echo 'parameters:
-    database_driver: pdo_mysql
-    database_host: 127.0.0.1
-    database_port: null
-    database_name: ccdn_test
-    database_user: ccdnroot
+    database_driver:   pdo_mysql
+    database_host:     127.0.0.1
+    database_port:     null
+    database_name:     ccdn_test
+    database_user:     ccdnroot
     database_password: root
-    locale: en
+    locale:            en
 
 ' > ./Tests/Functional/app/config/parameters.yml
 
-composer install --dev
+composer install --dev --prefer-dist
 
 php ./Tests/Functional/app/console --env=test doctrine:database:drop --force
 php ./Tests/Functional/app/console --env=test doctrine:database:create