Merge branch '2.7' into 2.8

* 2.7:
  add @event annotation for AuthenticationEvents
  add @event annotation for KernelEvents
  bumped Symfony version to 2.7.13
  updated VERSION for 2.7.12
  update CONTRIBUTORS for 2.7.12
  updated CHANGELOG for 2.7.12
  bumped Symfony version to 2.3.41
  updated VERSION for 2.3.40
  update CONTRIBUTORS for 2.3.40
  updated CHANGELOG for 2.3.40
  Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
  Revert "fixed CS"
  [FrameworkBundle] Remove misleading comment
  bug #17460 [DI] fix ambiguous services schema

Author: fabpot

Generator/UrlGenerator.php

@@ -75,11 +75,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%7C' => '|',
     );
 
-    /**
-     * @var string This regexp matches all characters that are not or should not be encoded by rawurlencode (see list in array above).
-     */
-    private $urlEncodingSkipRegexp = '#[^-.~a-zA-Z0-9_/@:;,=+!*|]#';
-
     /**
      * Constructor.
      *
@@ -201,21 +196,19 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
 
         if ('' === $url) {
             $url = '/';
-        } elseif (preg_match($this->urlEncodingSkipRegexp, $url)) {
-            // the context base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-            $url = strtr(rawurlencode($url), $this->decodedChars);
         }
 
+        // the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
+        $url = strtr(rawurlencode($url), $this->decodedChars);
+
         // the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
         // so we need to encode them as they are not used for this purpose here
         // otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
-        if (false !== strpos($url, '/.')) {
-            $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
-            if ('/..' === substr($url, -3)) {
-                $url = substr($url, 0, -2).'%2E%2E';
-            } elseif ('/.' === substr($url, -2)) {
-                $url = substr($url, 0, -1).'%2E';
-            }
+        $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
+        if ('/..' === substr($url, -3)) {
+            $url = substr($url, 0, -2).'%2E%2E';
+        } elseif ('/.' === substr($url, -2)) {
+            $url = substr($url, 0, -1).'%2E';
         }
 
         $schemeAuthority = '';
@@ -292,7 +285,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         if ($extra && $query = http_build_query($extra, '', '&')) {
             // "/" and "?" can be left decoded for better user experience, see
             // http://tools.ietf.org/html/rfc3986#section-3.4
-            $url .= '?'.(false === strpos($query, '%2F') ? $query : strtr($query, array('%2F' => '/')));
+            $url .= '?'.strtr($query, array('%2F' => '/'));
         }
 
         return $url;