Merge branch '3.3' into 3.4

* 3.3:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
  [Filesystem] mirror - fix copying content with same name as source/target.
  Removed unnecessary getDefinition() call.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces

Author: nicolas-grekas

Loader/ObjectRouteLoader.php

@@ -45,7 +45,7 @@ abstract protected function getServiceObject($id);
     public function load($resource, $type = null)
     {
         $parts = explode(':', $resource);
-        if (count($parts) != 2) {
+        if (2 != count($parts)) {
             throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName"', $resource));
         }
 

Matcher/Dumper/PhpMatcherDumper.php

@@ -241,8 +241,8 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
         $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('HEAD', $methods) || in_array('GET', $methods));
         $regex = $compiledRoute->getRegex();
 
-        if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#'.(substr($regex, -1) === 'u' ? 'u' : ''), $regex, $m)) {
-            if ($supportsTrailingSlash && substr($m['url'], -1) === '/') {
+        if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#'.('u' === substr($regex, -1) ? 'u' : ''), $regex, $m)) {
+            if ($supportsTrailingSlash && '/' === substr($m['url'], -1)) {
                 $conditions[] = sprintf('%s === $trimmedPathinfo', var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
                 $hasTrailingSlash = true;
             } else {
@@ -282,7 +282,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
 
         if ($methods) {
             if (1 === count($methods)) {
-                if ($methods[0] === 'HEAD') {
+                if ('HEAD' === $methods[0]) {
                     $code .= <<<EOF
             if ('HEAD' !== \$requestMethod) {
                 \$allow[] = 'HEAD';

Matcher/Dumper/StaticPrefixCollection.php

@@ -139,7 +139,7 @@ private function groupWithItem($item, $prefix, $route)
      */
     private function accepts($prefix)
     {
-        return '' === $this->prefix || strpos($prefix, $this->prefix) === 0;
+        return '' === $this->prefix || 0 === strpos($prefix, $this->prefix);
     }
 
     /**