Merge branch '3.4' into 4.3

* 3.4: Remove superfluous phpdoc tags
symfony · Aug 14, 2019 · 044de92 · 044de92
2 parents a51dd70 + d25a40f
commit 044de92
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 67 deletions.
diff --git a/Argument/RewindableGenerator.php b/Argument/RewindableGenerator.php
@@ -20,7 +20,6 @@ class RewindableGenerator implements \IteratorAggregate, \Countable
     private $count;
 
     /**
-     * @param callable     $generator
      * @param int|callable $count
      */
     public function __construct(callable $generator, $count)

diff --git a/Compiler/AbstractRecursivePass.php b/Compiler/AbstractRecursivePass.php
@@ -105,8 +105,7 @@ protected function processValue($value, $isRoot = false)
     }
 
     /**
-     * @param Definition $definition
-     * @param bool       $required
+     * @param bool $required
      *
      * @return \ReflectionFunctionAbstract|null
      *
@@ -161,8 +160,7 @@ protected function getConstructor(Definition $definition, $required)
     }
 
     /**
-     * @param Definition $definition
-     * @param string     $method
+     * @param string $method
      *
      * @throws RuntimeException
      *

diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -137,11 +137,6 @@ private function doProcessValue($value, $isRoot = false)
         return $value;
     }
 
-    /**
-     * @param \ReflectionClass $reflectionClass
-     *
-     * @return array
-     */
     private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot): array
     {
         $this->decoratedId = null;

diff --git a/Compiler/Compiler.php b/Compiler/Compiler.php
@@ -54,9 +54,8 @@ public function getServiceReferenceGraph()
     /**
      * Adds a pass to the PassConfig.
      *
-     * @param CompilerPassInterface $pass     A compiler pass
-     * @param string                $type     The type of the pass
-     * @param int                   $priority Used to sort the passes
+     * @param CompilerPassInterface $pass A compiler pass
+     * @param string                $type The type of the pass
      */
     public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
     {

diff --git a/Compiler/PassConfig.php b/Compiler/PassConfig.php
@@ -110,9 +110,8 @@ public function getPasses()
     /**
      * Adds a pass.
      *
-     * @param CompilerPassInterface $pass     A Compiler pass
-     * @param string                $type     The pass type
-     * @param int                   $priority Used to sort the passes
+     * @param CompilerPassInterface $pass A Compiler pass
+     * @param string                $type The pass type
      *
      * @throws InvalidArgumentException when a pass type doesn't exist
      */

diff --git a/Compiler/PriorityTaggedServiceTrait.php b/Compiler/PriorityTaggedServiceTrait.php
@@ -35,7 +35,6 @@ trait PriorityTaggedServiceTrait
      * @see https://bugs.php.net/60926
      *
      * @param string|TaggedIteratorArgument $tagName
-     * @param ContainerBuilder              $container
      *
      * @return Reference[]
      */

diff --git a/Compiler/ServiceLocatorTagPass.php b/Compiler/ServiceLocatorTagPass.php
@@ -87,9 +87,8 @@ protected function processValue($value, $isRoot = false)
     }
 
     /**
-     * @param ContainerBuilder $container
-     * @param Reference[]      $refMap
-     * @param string|null      $callerId
+     * @param Reference[] $refMap
+     * @param string|null $callerId
      *
      * @return Reference
      */

diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -384,8 +384,6 @@ public function getReflectionClass(?string $class, bool $throw = true): ?\Reflec
      * @param bool|string $trackContents Whether to track contents of the given resource. If a string is passed,
      *                                   it will be used as pattern for tracking contents of the requested directory
      *
-     * @return bool
-     *
      * @final
      */
     public function fileExists(string $path, $trackContents = true): bool
@@ -1635,7 +1633,6 @@ private function callMethod($service, $call, array &$inlineServices)
     /**
      * Shares a given service in the container.
      *
-     * @param Definition  $definition
      * @param mixed       $service
      * @param string|null $id
      */

diff --git a/Definition.php b/Definition.php
@@ -857,8 +857,6 @@ public function getBindings()
      * injected in the matching parameters (of the constructor, of methods
      * called and of controller actions).
      *
-     * @param array $bindings
-     *
      * @return $this
      */
     public function setBindings(array $bindings)

diff --git a/Dumper/XmlDumper.php b/Dumper/XmlDumper.php
@@ -94,9 +94,8 @@ private function addMethodCalls(array $methodcalls, \DOMElement $parent)
     /**
      * Adds a service.
      *
-     * @param Definition  $definition
-     * @param string      $id
-     * @param \DOMElement $parent
+     * @param Definition $definition
+     * @param string     $id
      */
     private function addService($definition, $id, \DOMElement $parent)
     {
@@ -218,9 +217,7 @@ private function addService($definition, $id, \DOMElement $parent)
     /**
      * Adds a service alias.
      *
-     * @param string      $alias
-     * @param Alias       $id
-     * @param \DOMElement $parent
+     * @param string $alias
      */
     private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
     {
@@ -266,10 +263,8 @@ private function addServices(\DOMElement $parent)
     /**
      * Converts parameters.
      *
-     * @param array       $parameters
-     * @param string      $type
-     * @param \DOMElement $parent
-     * @param string      $keyAttribute
+     * @param string $type
+     * @param string $keyAttribute
      */
     private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
     {

diff --git a/LazyProxy/PhpDumper/DumperInterface.php b/LazyProxy/PhpDumper/DumperInterface.php
@@ -30,9 +30,8 @@ public function isProxyCandidate(Definition $definition);
     /**
      * Generates the code to be used to instantiate a proxy in the dumped factory code.
      *
-     * @param Definition $definition
-     * @param string     $id          Service identifier
-     * @param string     $factoryCode The code to execute to create the service
+     * @param string $id          Service identifier
+     * @param string $factoryCode The code to execute to create the service
      *
      * @return string
      */

diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -86,8 +86,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
     /**
      * Registers a definition in the container with its instanceof-conditionals.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      */
     protected function setDefinition($id, Definition $definition)
     {

diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -88,8 +88,7 @@ public function supports($resource, $type = null)
     /**
      * Parses parameters.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseParameters(\DOMDocument $xml, $file)
     {
@@ -101,8 +100,7 @@ private function parseParameters(\DOMDocument $xml, $file)
     /**
      * Parses imports.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseImports(\DOMDocument $xml, $file)
     {
@@ -123,8 +121,7 @@ private function parseImports(\DOMDocument $xml, $file)
     /**
      * Parses multiple definitions.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseDefinitions(\DOMDocument $xml, $file, $defaults)
     {
@@ -208,9 +205,7 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
     /**
      * Parses an individual Definition.
      *
-     * @param \DOMElement $service
-     * @param string      $file
-     * @param array       $defaults
+     * @param string $file
      *
      * @return Definition|null
      */
@@ -421,9 +416,8 @@ private function parseFileToDOM($file)
     /**
      * Processes anonymous services.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
-     * @param array        $defaults
+     * @param string $file
+     * @param array  $defaults
      */
     private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
     {
@@ -472,10 +466,9 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
     /**
      * Returns arguments as valid php types.
      *
-     * @param \DOMElement $node
-     * @param string      $name
-     * @param string      $file
-     * @param bool        $lowercase
+     * @param string $name
+     * @param string $file
+     * @param bool   $lowercase
      *
      * @return mixed
      */
@@ -582,8 +575,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
     /**
      * Get child elements by name.
      *
-     * @param \DOMNode $node
-     * @param mixed    $name
+     * @param mixed $name
      *
      * @return \DOMElement[]
      */
@@ -602,8 +594,6 @@ private function getChildren(\DOMNode $node, $name)
     /**
      * Validates a documents XML schema.
      *
-     * @param \DOMDocument $dom
-     *
      * @return bool
      *
      * @throws RuntimeException When extension references a non-existent XSD file
@@ -681,8 +671,7 @@ public function validateSchema(\DOMDocument $dom)
     /**
      * Validates an alias.
      *
-     * @param \DOMElement $alias
-     * @param string      $file
+     * @param string $file
      */
     private function validateAlias(\DOMElement $alias, $file)
     {
@@ -705,8 +694,7 @@ private function validateAlias(\DOMElement $alias, $file)
     /**
      * Validates an extension.
      *
-     * @param \DOMDocument $dom
-     * @param string       $file
+     * @param string $file
      *
      * @throws InvalidArgumentException When no extension is found corresponding to a tag
      */
@@ -727,8 +715,6 @@ private function validateExtensions(\DOMDocument $dom, $file)
 
     /**
      * Loads from an extension.
-     *
-     * @param \DOMDocument $xml
      */
     private function loadFromExtensions(\DOMDocument $xml)
     {

diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -309,7 +309,6 @@ private function isUsingShortSyntax(array $service): bool
      * @param string       $id
      * @param array|string $service
      * @param string       $file
-     * @param array        $defaults
      *
      * @throws InvalidArgumentException When tags are invalid
      */