Merge branch '2.0' into 2.1

Author: dunglas

composer.json

@@ -32,9 +32,9 @@
         "behat/mink-extension": "^2.2",
         "behat/symfony2-extension": "^2.1.1",
         "behatch/contexts": "dev-master",
+        "doctrine/annotations": "^1.2",
         "doctrine/doctrine-bundle": "^1.6.3",
         "doctrine/orm": "^2.5.2",
-        "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0",
         "nelmio/api-doc-bundle": "^2.13.3",
@@ -73,8 +73,8 @@
         "phpdocumentor/reflection-docblock": "To support extracting metadata from PHPDoc.",
         "psr/cache-implementation": "To use metadata caching.",
         "symfony/cache": "To have metadata caching when using Symfony integration.",
-        "symfony/expression-language": "To use authorization features.",
         "symfony/config": "To load XML configuration files.",
+        "symfony/expression-language": "To use authorization features.",
         "symfony/security": "To use authorization features.",
         "symfony/twig-bundle": "To use the Swagger UI integration."
     },
@@ -88,5 +88,8 @@
         "branch-alias": {
             "dev-master": "2.1.x-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }

src/EventListener/EventPriorities.php

@@ -20,14 +20,17 @@
  */
 final class EventPriorities
 {
+    // kernel.request
     const PRE_READ = 5;
     const POST_READ = 3;
     const PRE_DESERIALIZE = 3;
     const POST_DESERIALIZE = 1;
+    // kernel.view
     const PRE_VALIDATE = 65;
     const POST_VALIDATE = 63;
     const PRE_WRITE = 33;
     const POST_WRITE = 31;
     const PRE_RESPOND = 9;
+    // kernel.response
     const POST_RESPOND = 0;
 }