Updating Symfony lib and dependencies:

Package operations: 2 installs, 23 updates, 0 removals - Updating psr/log (1.1.0 => 1.1.2) - Updating symfony/debug (v3.4.30 => v3.4.35) - Updating symfony/console (v3.4.30 => v3.4.35) - Updating symfony/dotenv (v3.4.30 => v3.4.35) - Updating symfony/routing (v3.4.30 => v3.4.35) - Updating symfony/finder (v3.4.30 => v3.4.35) - Updating symfony/filesystem (v3.4.30 => v3.4.35) - Installing symfony/polyfill-util (v1.12.0) - Installing symfony/polyfill-php56 (v1.12.0) - Updating symfony/http-foundation (v3.4.30 => v3.4.35) - Updating symfony/event-dispatcher (v3.4.30 => v3.4.35) - Updating symfony/http-kernel (v3.4.30 => v3.4.35) - Updating symfony/config (v3.4.30 => v3.4.35) - Updating symfony/dependency-injection (v3.4.30 => v3.4.35) - Updating symfony/class-loader (v3.4.30 => v3.4.35) - Updating symfony/cache (v3.4.30 => v3.4.35) - Updating symfony/framework-bundle (v3.4.30 => v3.4.35) - Updating twig/twig (v1.42.2 => v1.42.4) - Updating symfony/twig-bridge (v3.4.30 => v3.4.35) - Updating symfony/twig-bundle (v3.4.30 => v3.4.35) - Updating symfony/yaml (v3.4.30 => v3.4.35) - Updating symfony/stopwatch (v3.4.30 => v3.4.35) - Updating symfony/var-dumper (v3.4.30 => v3.4.35) - Updating symfony/web-profiler-bundle (v3.4.30 => v3.4.35) - Updating symfony/css-selector (v3.4.30 => v3.4.35)
2026-04-22 10:08:45 +02:00 · 2019-11-18 18:04:32 +01:00
parent 532eb466a1
commit c76cccd2e7
633 changed files with 4154 additions and 4093 deletions
--- a/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
@@ -127,8 +127,6 @@ abstract class Descriptor implements DescriptorInterface
     * * name: name of described service
     *
     * @param Definition|Alias|object $service
-     * @param array                   $options
-     * @param ContainerBuilder|null   $builder
     */
    abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);

@@ -166,8 +164,7 @@ abstract class Descriptor implements DescriptorInterface
    /**
     * Describes a callable.
     *
-     * @param callable $callable
-     * @param array    $options
+     * @param mixed $callable
     */
    abstract protected function describeCallable($callable, array $options = []);

@@ -214,8 +211,7 @@ abstract class Descriptor implements DescriptorInterface
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
+     * @param string $serviceId
     *
     * @return mixed
     */
@@ -235,8 +231,7 @@ abstract class Descriptor implements DescriptorInterface
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
     *
     * @return array
     */
--- a/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
@@ -142,7 +142,9 @@ class JsonDescriptor extends Descriptor
    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
    {
        if (!$builder) {
-            return $this->writeData($this->getContainerAliasData($alias), $options);
+            $this->writeData($this->getContainerAliasData($alias), $options);
+
+            return;
        }

        $this->writeData(
@@ -179,8 +181,6 @@ class JsonDescriptor extends Descriptor

    /**
     * Writes data as json.
-     *
-     * @return array|string
     */
    private function writeData(array $data, array $options)
    {
@@ -209,8 +209,7 @@ class JsonDescriptor extends Descriptor
    }

    /**
-     * @param Definition $definition
-     * @param bool       $omitTags
+     * @param bool $omitTags
     *
     * @return array
     */
@@ -287,8 +286,7 @@ class JsonDescriptor extends Descriptor
    }

    /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
     *
     * @return array
     */
@@ -320,7 +318,6 @@ class JsonDescriptor extends Descriptor

    /**
     * @param callable $callable
-     * @param array    $options
     *
     * @return array
     */
--- a/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
@@ -249,7 +249,9 @@ class MarkdownDescriptor extends Descriptor
            ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');

        if (!isset($options['id'])) {
-            return $this->write($output);
+            $this->write($output);
+
+            return;
        }

        $this->write(sprintf("### %s\n\n%s\n", $options['id'], $output));
--- a/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
@@ -369,7 +369,7 @@ class TextDescriptor extends Descriptor
            return;
        }

-        return $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
+        $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
    }

    /**
@@ -425,7 +425,6 @@ class TextDescriptor extends Descriptor
        $tableHeaders = ['Order', 'Callable', 'Priority'];
        $tableRows = [];

-        $order = 1;
        foreach ($eventListeners as $order => $listener) {
            $tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
        }
@@ -434,8 +433,6 @@ class TextDescriptor extends Descriptor
    }

    /**
-     * @param array $config
-     *
     * @return string
     */
    private function formatRouterConfig(array $config)
@@ -494,7 +491,6 @@ class TextDescriptor extends Descriptor

    /**
     * @param string $content
-     * @param array  $options
     */
    private function writeText($content, array $options = [])
    {
--- a/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
@@ -98,7 +98,9 @@ class XmlDescriptor extends Descriptor
        $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));

        if (!$builder) {
-            return $this->writeDocument($dom);
+            $this->writeDocument($dom);
+
+            return;
        }

        $dom->appendChild($dom->importNode($this->getContainerDefinitionDocument($builder->getDefinition((string) $alias), (string) $alias)->childNodes->item(0), true));
@@ -132,8 +134,6 @@ class XmlDescriptor extends Descriptor

    /**
     * Writes DOM document.
-     *
-     * @return \DOMDocument|string
     */
    private function writeDocument(\DOMDocument $dom)
    {
@@ -158,7 +158,6 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param Route       $route
     * @param string|null $name
     *
     * @return \DOMDocument
@@ -244,8 +243,7 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
     *
     * @return \DOMDocument
     */
@@ -268,10 +266,9 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param mixed                 $service
-     * @param string                $id
-     * @param ContainerBuilder|null $builder
-     * @param bool                  $showArguments
+     * @param mixed  $service
+     * @param string $id
+     * @param bool   $showArguments
     *
     * @return \DOMDocument
     */
@@ -296,11 +293,10 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param string|null      $tag
-     * @param bool             $showPrivate
-     * @param bool             $showArguments
-     * @param callable         $filter
+     * @param string|null $tag
+     * @param bool        $showPrivate
+     * @param bool        $showArguments
+     * @param callable    $filter
     *
     * @return \DOMDocument
     */
@@ -330,7 +326,6 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param Definition  $definition
     * @param string|null $id
     * @param bool        $omitTags
     *
@@ -454,7 +449,6 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param Alias       $alias
     * @param string|null $id
     *
     * @return \DOMDocument
@@ -492,8 +486,7 @@ class XmlDescriptor extends Descriptor
    }

    /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
     *
     * @return \DOMDocument
     */