Merge branch '4.4' into 5.2

* 4.4: Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
symfony · Jul 2, 2021 · deb040a · deb040a
2 parents fcd0b29 + 8da05a9
commit deb040a
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 27 deletions.
diff --git a/Node/AttributeNode.php b/Node/AttributeNode.php
@@ -71,9 +71,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         $attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute;

diff --git a/Node/ClassNode.php b/Node/ClassNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);

diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -57,9 +57,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         $combinator = ' ' === $this->combinator ? '<followed>' : $this->combinator;

diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return new Specificity(0, 0, $this->element ? 1 : 0);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         $element = $this->element ?: '*';

diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -65,9 +65,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         $arguments = implode(', ', array_map(function (Token $token) {

diff --git a/Node/HashNode.php b/Node/HashNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus(new Specificity(1, 0, 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);

diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);

diff --git a/Node/PseudoNode.php b/Node/PseudoNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);

diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -50,9 +50,6 @@ public function getSpecificity(): Specificity
         return $this->tree->getSpecificity()->plus(new Specificity(0, 0, $this->pseudoElement ? 1 : 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');