Merge branch '4.1'

* 4.1: (22 commits)
  Fix CS
  [PropertyInfo] fix resolving parent|self type hints
  fixed CS
  fix merge
  [Security] Fix logout
  Cleanup 2 tests for the HttpException classes
  #27250 limiting GET_LOCK key up to 64 char due to changes in MySQL 5.7.5 and later
  [Config] Fix tests when path contains UTF chars
  [DI] Shared services should not be inlined in non-shared ones
  [Profiler] Remove propel & event_listener_loading category identifiers
  [Filesystem] Fix usages of error_get_last()
  [Cache][Lock] Fix usages of error_get_last()
  [Debug] Fix populating error_get_last() for handled silent errors
  fixed CS
  fixed CS
  fixed CS
  [FrameworkBundle] Fix cache:clear on vagrant
  [HttpKernel] Handle NoConfigurationException "onKernelException()"
  Fix misses calculation when calling getItems
  [DI] Display previous error messages when throwing unused bindings
  ...

Author: nicolas-grekas

Loader/AnnotationClassLoader.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Config\Loader\LoaderInterface;

Matcher/Dumper/PhpMatcherDumper.php

@@ -473,7 +473,7 @@ private function compileStaticPrefixCollection(StaticPrefixCollection $tree, \st
                 $code .= $this->indent($this->compileStaticPrefixCollection($route, $state, $prefixLen + strlen($prefix)));
                 $code .= "\n                    .')'";
                 $state->regex .= ')';
-                $state->markTail += 1;
+                ++$state->markTail;
                 continue;
             }
 

RouteCollectionBuilder.php

@@ -118,7 +118,7 @@ public function createBuilder()
      * @param string                 $prefix
      * @param RouteCollectionBuilder $builder
      */
-    public function mount($prefix, RouteCollectionBuilder $builder)
+    public function mount($prefix, self $builder)
     {
         $builder->prefix = trim(trim($prefix), '/');
         $this->routes[] = $builder;
@@ -251,11 +251,9 @@ public function setMethods($methods)
     /**
      * Adds a resource for this collection.
      *
-     * @param ResourceInterface $resource
-     *
      * @return $this
      */
-    private function addResource(ResourceInterface $resource): RouteCollectionBuilder
+    private function addResource(ResourceInterface $resource): self
     {
         $this->resources[] = $resource;
 

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

@@ -89,17 +89,17 @@ public function testDumpWithLocalizedRoutes()
         $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test'));
         $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test'));
 
-        $code = $this->generatorDumper->dump([
+        $code = $this->generatorDumper->dump(array(
             'class' => 'LocalizedProjectUrlGenerator',
-        ]);
+        ));
         file_put_contents($this->testTmpFilepath, $code);
         include $this->testTmpFilepath;
 
         $context = new RequestContext('/app.php');
         $projectUrlGenerator = new \LocalizedProjectUrlGenerator($context, null, 'en');
 
         $urlWithDefaultLocale = $projectUrlGenerator->generate('test');
-        $urlWithSpecifiedLocale = $projectUrlGenerator->generate('test', ['_locale' => 'nl']);
+        $urlWithSpecifiedLocale = $projectUrlGenerator->generate('test', array('_locale' => 'nl'));
         $context->setParameter('_locale', 'en');
         $urlWithEnglishContext = $projectUrlGenerator->generate('test');
         $context->setParameter('_locale', 'nl');

Tests/Loader/AnnotationClassLoaderTest.php

@@ -46,7 +46,9 @@ protected function setUp()
     {
         $reader = new AnnotationReader();
         $this->loader = new class($reader) extends AnnotationClassLoader {
-            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot) {}
+            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
+            {
+            }
         };
         AnnotationRegistry::registerLoader('class_exists');
     }
@@ -194,7 +196,9 @@ public function testInvokableClassMultipleRouteLoad()
             ->will($this->returnValue(array()))
         ;
         $loader = new class($reader) extends AnnotationClassLoader {
-            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot) {}
+            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
+            {
+            }
         };
 
         $routeCollection = $loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');

Tests/Loader/XmlFileLoaderTest.php

@@ -420,7 +420,6 @@ public function testImportRouteWithGlobMatchingMultipleFiles()
 
         $route = $routeCollection->get('baz_route');
         $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
-
     }
 
     public function testImportRouteWithNamePrefix()