Merge branch '4.0' into 4.1

* 4.0: (21 commits)
  [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
  Fixed return type
  ...

Author: nicolas-grekas

Node/Specificity.php

@@ -40,7 +40,7 @@ public function __construct(int $a, int $b, int $c)
         $this->c = $c;
     }
 
-    public function plus(Specificity $specificity): Specificity
+    public function plus(self $specificity): self
     {
         return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c);
     }
@@ -56,7 +56,7 @@ public function getValue(): int
      *
      * @return int
      */
-    public function compareTo(Specificity $specificity)
+    public function compareTo(self $specificity)
     {
         if ($this->a !== $specificity->a) {
             return $this->a > $specificity->a ? 1 : -1;

XPath/Translator.php

@@ -114,7 +114,7 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen
         return ($prefix ?: '').$this->nodeToXPath($selector);
     }
 
-    public function registerExtension(Extension\ExtensionInterface $extension): Translator
+    public function registerExtension(Extension\ExtensionInterface $extension): self
     {
         $this->extensions[$extension->getName()] = $extension;
 
@@ -139,7 +139,7 @@ public function getExtension(string $name): Extension\ExtensionInterface
         return $this->extensions[$name];
     }
 
-    public function registerParserShortcut(ParserInterface $shortcut): Translator
+    public function registerParserShortcut(ParserInterface $shortcut): self
     {
         $this->shortcutParsers[] = $shortcut;
 

XPath/XPathExpr.php

@@ -43,7 +43,7 @@ public function getElement(): string
         return $this->element;
     }
 
-    public function addCondition(string $condition): XPathExpr
+    public function addCondition(string $condition): self
     {
         $this->condition = $this->condition ? sprintf('(%s) and (%s)', $this->condition, $condition) : $condition;
 
@@ -55,7 +55,7 @@ public function getCondition(): string
         return $this->condition;
     }
 
-    public function addNameTest(): XPathExpr
+    public function addNameTest(): self
     {
         if ('*' !== $this->element) {
             $this->addCondition('name() = '.Translator::getXpathLiteral($this->element));
@@ -65,7 +65,7 @@ public function addNameTest(): XPathExpr
         return $this;
     }
 
-    public function addStarPrefix(): XPathExpr
+    public function addStarPrefix(): self
     {
         $this->path .= '*/';