Merge branch '2.7' into 2.8

* 2.7:
  added automatic sort of Composer deps
  updated wording in comment

Author: fabpot

app/config/parameters.yml.dist

@@ -7,7 +7,7 @@ parameters:
     database_name:     symfony
     database_user:     root
     database_password: ~
-    # You should uncomment this if you want use pdo_sqlite
+    # You should uncomment this if you want to use pdo_sqlite
     # database_path: "%kernel.root_dir%/data.db3"
 
     mailer_transport:  smtp

composer.json

@@ -9,15 +9,15 @@
     },
     "require": {
         "php": ">=5.3.9",
-        "symfony/symfony": "2.8.*",
-        "doctrine/orm": "^2.4.8",
         "doctrine/doctrine-bundle": "~1.4",
-        "symfony/swiftmailer-bundle": "~2.3,>=2.3.10",
-        "symfony/monolog-bundle": "^3.0.2",
-        "sensio/distribution-bundle": "~5.0",
+        "doctrine/orm": "^2.4.8",
+        "sensio/distribution-bundle": "~4.0",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "twig/twig": "^1.0||^2.0",
-        "incenteev/composer-parameter-handler": "~2.0"
+        "symfony/assetic-bundle": "~2.3",
+        "symfony/monolog-bundle": "^3.0.2",
+        "symfony/swiftmailer-bundle": "~2.3,>=2.3.10",
+        "symfony/symfony": "2.8.*",
+        "twig/twig": "^1.0||^2.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "~3.0",
@@ -43,7 +43,8 @@
         "bin-dir": "bin",
         "platform": {
             "php": "5.3.9"
-        }
+        },
+        "sort-packages": true
     },
     "extra": {
         "symfony-app-dir": "app",