Add union types

nicolas-grekas · nicolas-grekas · commit ebfff039c2db · 2021-06-29T11:21:24.000+02:00
diff --git a/AppVariable.php b/AppVariable.php
@@ -152,7 +152,7 @@ public function getDebug()
      *
      * @return array
      */
-    public function getFlashes($types = null)
+    public function getFlashes(string|array|null $types = null)
     {
         try {
             if (null === $session = $this->getSession()) {
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -293,7 +293,7 @@ private function getLoaderPaths(string $name = null): array
         return $loaderPaths;
     }
 
-    private function getMetadata(string $type, $entity)
+    private function getMetadata(string $type, mixed $entity)
     {
         if ('globals' === $type) {
             return $entity;
@@ -351,7 +351,7 @@ private function getMetadata(string $type, $entity)
         return null;
     }
 
-    private function getPrettyMetadata(string $type, $entity, bool $decorated): ?string
+    private function getPrettyMetadata(string $type, mixed $entity, bool $decorated): ?string
     {
         if ('tests' === $type) {
             return '';
diff --git a/ErrorRenderer/TwigErrorRenderer.php b/ErrorRenderer/TwigErrorRenderer.php
@@ -32,12 +32,8 @@ class TwigErrorRenderer implements ErrorRendererInterface
     /**
      * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
      */
-    public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, $debug = false)
+    public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
     {
-        if (!\is_bool($debug) && !\is_callable($debug)) {
-            throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be a boolean or a callable, "%s" given.', __METHOD__, get_debug_type($debug)));
-        }
-
         $this->twig = $twig;
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
         $this->debug = $debug;
diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -26,10 +26,7 @@ final class CodeExtension extends AbstractExtension
     private $charset;
     private $projectDir;
 
-    /**
-     * @param string|FileLinkFormatter $fileLinkFormat The format for links to source files
-     */
-    public function __construct($fileLinkFormat, string $projectDir, string $charset)
+    public function __construct(string|FileLinkFormatter $fileLinkFormat, string $projectDir, string $charset)
     {
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         $this->projectDir = str_replace('\\', '/', $projectDir).'/';
diff --git a/Extension/FormExtension.php b/Extension/FormExtension.php
@@ -158,7 +158,7 @@ public function getFieldChoices(FormView $view): iterable
         yield from $this->createFieldChoicesList($view->vars['choices'], $view->vars['choice_translation_domain']);
     }
 
-    private function createFieldChoicesList(iterable $choices, $translationDomain): iterable
+    private function createFieldChoicesList(iterable $choices, string|false|null $translationDomain): iterable
     {
         foreach ($choices as $choice) {
             $translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);
@@ -174,7 +174,7 @@ private function createFieldChoicesList(iterable $choices, $translationDomain):
         }
     }
 
-    private function createFieldTranslation(?string $value, array $parameters, $domain): ?string
+    private function createFieldTranslation(?string $value, array $parameters, string|false|null $domain): ?string
     {
         if (!$this->translator || !$value || false === $domain) {
             return $value;
@@ -189,11 +189,9 @@ private function createFieldTranslation(?string $value, array $parameters, $doma
  *
  * This is a function and not callable due to performance reasons.
  *
- * @param string|array $selectedValue The selected value to compare
- *
  * @see ChoiceView::isSelected()
  */
-function twig_is_selected_choice(ChoiceView $choice, $selectedValue): bool
+function twig_is_selected_choice(ChoiceView $choice, string|array $selectedValue): bool
 {
     if (\is_array($selectedValue)) {
         return \in_array($choice->value, $selectedValue, true);
diff --git a/Extension/HttpKernelRuntime.php b/Extension/HttpKernelRuntime.php
@@ -34,11 +34,9 @@ public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterf
     /**
      * Renders a fragment.
      *
-     * @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
-     *
      * @see FragmentHandler::render()
      */
-    public function renderFragment($uri, array $options = []): string
+    public function renderFragment(string|ControllerReference $uri, array $options = []): string
     {
         $strategy = $options['strategy'] ?? 'inline';
         unset($options['strategy']);
@@ -49,11 +47,9 @@ public function renderFragment($uri, array $options = []): string
     /**
      * Renders a fragment.
      *
-     * @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
-     *
      * @see FragmentHandler::render()
      */
-    public function renderFragmentStrategy(string $strategy, $uri, array $options = []): string
+    public function renderFragmentStrategy(string $strategy, string|ControllerReference $uri, array $options = []): string
     {
         return $this->handler->render($uri, $strategy, $options);
     }
diff --git a/Extension/SecurityExtension.php b/Extension/SecurityExtension.php
@@ -35,10 +35,7 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul
         $this->impersonateUrlGenerator = $impersonateUrlGenerator;
     }
 
-    /**
-     * @param mixed $object
-     */
-    public function isGranted($role, $object = null, string $field = null): bool
+    public function isGranted(mixed $role, mixed $object = null, string $field = null): bool
     {
         if (null === $this->securityChecker) {
             return false;
diff --git a/Extension/SerializerRuntime.php b/Extension/SerializerRuntime.php
@@ -26,7 +26,7 @@ public function __construct(SerializerInterface $serializer)
         $this->serializer = $serializer;
     }
 
-    public function serialize($data, string $format = 'json', array $context = []): string
+    public function serialize(mixed $data, string $format = 'json', array $context = []): string
     {
         return $this->serializer->serialize($data, $format, $context);
     }
diff --git a/Extension/TranslationExtension.php b/Extension/TranslationExtension.php
@@ -106,10 +106,9 @@ public function getTranslationNodeVisitor(): TranslationNodeVisitor
     }
 
     /**
-     * @param string|\Stringable|TranslatableInterface|null $message
-     * @param array|string                                  $arguments Can be the locale as a string when $message is a TranslatableInterface
+     * @param array|string $arguments Can be the locale as a string when $message is a TranslatableInterface
      */
-    public function trans($message, $arguments = [], string $domain = null, string $locale = null, int $count = null): string
+    public function trans(string|\Stringable|TranslatableInterface|null $message, array|string $arguments = [], string $domain = null, string $locale = null, int $count = null): string
     {
         if ($message instanceof TranslatableInterface) {
             if ([] !== $arguments && !\is_string($arguments)) {
diff --git a/Extension/WorkflowExtension.php b/Extension/WorkflowExtension.php
@@ -102,7 +102,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st
      *                                                Use a string (the place name) to get place metadata
      *                                                Use a Transition instance to get transition metadata
      */
-    public function getMetadata(object $subject, string $key, $metadataSubject = null, string $name = null)
+    public function getMetadata(object $subject, string $key, string|Transition|null $metadataSubject = null, string $name = null)
     {
         return $this
             ->workflowRegistry
diff --git a/Extension/YamlExtension.php b/Extension/YamlExtension.php
@@ -33,7 +33,7 @@ public function getFilters(): array
         ];
     }
 
-    public function encode($input, int $inline = 0, int $dumpObjects = 0): string
+    public function encode(mixed $input, int $inline = 0, int $dumpObjects = 0): string
     {
         static $dumper;
 
@@ -48,7 +48,7 @@ public function encode($input, int $inline = 0, int $dumpObjects = 0): string
         return $dumper->dump($input, $inline, 0, false, $dumpObjects);
     }
 
-    public function dump($value, int $inline = 0, int $dumpObjects = 0): string
+    public function dump(mixed $value, int $inline = 0, int $dumpObjects = 0): string
     {
         if (\is_resource($value)) {
             return '%Resource%';
diff --git a/Form/TwigRendererEngine.php b/Form/TwigRendererEngine.php
@@ -40,7 +40,7 @@ public function __construct(array $defaultThemes, Environment $environment)
     /**
      * {@inheritdoc}
      */
-    public function renderBlock(FormView $view, $resource, string $blockName, array $variables = [])
+    public function renderBlock(FormView $view, mixed $resource, string $blockName, array $variables = [])
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
diff --git a/Mime/NotificationEmail.php b/Mime/NotificationEmail.php
@@ -124,16 +124,10 @@ public function importance(string $importance)
     }
 
     /**
-     * @param \Throwable|FlattenException $exception
-     *
      * @return $this
      */
-    public function exception($exception)
+    public function exception(\Throwable|FlattenException $exception)
     {
-        if (!$exception instanceof \Throwable && !$exception instanceof FlattenException) {
-            throw new \LogicException(sprintf('"%s" accepts "%s" or "%s" instances.', __METHOD__, \Throwable::class, FlattenException::class));
-        }
-
         $exceptionAsString = $this->getExceptionAsString($exception);
 
         $this->context['exception'] = true;
@@ -208,7 +202,7 @@ private function determinePriority(string $importance): int
         }
     }
 
-    private function getExceptionAsString($exception): string
+    private function getExceptionAsString(\Throwable|FlattenException $exception): string
     {
         if (class_exists(FlattenException::class)) {
             $exception = $exception instanceof FlattenException ? $exception : FlattenException::createFromThrowable($exception);
diff --git a/Node/DumpNode.php b/Node/DumpNode.php
@@ -21,7 +21,7 @@ final class DumpNode extends Node
 {
     private $varPrefix;
 
-    public function __construct($varPrefix, ?Node $values, int $lineno, string $tag = null)
+    public function __construct(string $varPrefix, ?Node $values, int $lineno, string $tag = null)
     {
         $nodes = [];
         if (null !== $values) {
diff --git a/NodeVisitor/Scope.php b/NodeVisitor/Scope.php
@@ -54,7 +54,7 @@ public function leave()
      *
      * @throws \LogicException
      */
-    public function set(string $key, $value)
+    public function set(string $key, mixed $value)
     {
         if ($this->left) {
             throw new \LogicException('Left scope is not mutable.');
@@ -88,7 +88,7 @@ public function has(string $key)
      *
      * @return mixed
      */
-    public function get(string $key, $default = null)
+    public function get(string $key, mixed $default = null)
     {
         if (\array_key_exists($key, $this->data)) {
             return $this->data[$key];

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function getDebug()`
`152`	`152`	`*`
`153`	`153`	`* @return array`
`154`	`154`	`*/`
`155`		`- public function getFlashes($types = null)`
	`155`	`+ public function getFlashes(string\|array\|null $types = null)`
`156`	`156`	`{`
`157`	`157`	`try {`
`158`	`158`	`if (null === $session = $this->getSession()) {`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ private function getLoaderPaths(string $name = null): array`
`293`	`293`	`return $loaderPaths;`
`294`	`294`	`}`
`295`	`295`
`296`		`- private function getMetadata(string $type, $entity)`
	`296`	`+ private function getMetadata(string $type, mixed $entity)`
`297`	`297`	`{`
`298`	`298`	`if ('globals' === $type) {`
`299`	`299`	`return $entity;`
`@@ -351,7 +351,7 @@ private function getMetadata(string $type, $entity)`
`351`	`351`	`return null;`
`352`	`352`	`}`
`353`	`353`
`354`		`- private function getPrettyMetadata(string $type, $entity, bool $decorated): ?string`
	`354`	`+ private function getPrettyMetadata(string $type, mixed $entity, bool $decorated): ?string`
`355`	`355`	`{`
`356`	`356`	`if ('tests' === $type) {`
`357`	`357`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function getFieldChoices(FormView $view): iterable`
`158`	`158`	`yield from $this->createFieldChoicesList($view->vars['choices'], $view->vars['choice_translation_domain']);`
`159`	`159`	`}`
`160`	`160`
`161`		`- private function createFieldChoicesList(iterable $choices, $translationDomain): iterable`
	`161`	`+ private function createFieldChoicesList(iterable $choices, string\|false\|null $translationDomain): iterable`
`162`	`162`	`{`
`163`	`163`	`foreach ($choices as $choice) {`
`164`	`164`	`$translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);`
`@@ -174,7 +174,7 @@ private function createFieldChoicesList(iterable $choices, $translationDomain):`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`- private function createFieldTranslation(?string $value, array $parameters, $domain): ?string`
	`177`	`+ private function createFieldTranslation(?string $value, array $parameters, string\|false\|null $domain): ?string`
`178`	`178`	`{`
`179`	`179`	`if (!$this->translator \|\| !$value \|\| false === $domain) {`
`180`	`180`	`return $value;`
`@@ -189,11 +189,9 @@ private function createFieldTranslation(?string $value, array $parameters, $doma`
`189`	`189`	`*`
`190`	`190`	`* This is a function and not callable due to performance reasons.`
`191`	`191`	`*`
`192`		`- * @param string\|array $selectedValue The selected value to compare`
`193`		`- *`
`194`	`192`	`* @see ChoiceView::isSelected()`
`195`	`193`	`*/`
`196`		`-function twig_is_selected_choice(ChoiceView $choice, $selectedValue): bool`
	`194`	`+function twig_is_selected_choice(ChoiceView $choice, string\|array $selectedValue): bool`
`197`	`195`	`{`
`198`	`196`	`if (\is_array($selectedValue)) {`
`199`	`197`	`return \in_array($choice->value, $selectedValue, true);`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,9 @@ public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterf`
`34`	`34`	`/**`
`35`	`35`	`* Renders a fragment.`
`36`	`36`	`*`
`37`		`- * @param string\|ControllerReference $uri A URI as a string or a ControllerReference instance`
`38`		`- *`
`39`	`37`	`* @see FragmentHandler::render()`
`40`	`38`	`*/`
`41`		`- public function renderFragment($uri, array $options = []): string`
	`39`	`+ public function renderFragment(string\|ControllerReference $uri, array $options = []): string`
`42`	`40`	`{`
`43`	`41`	`$strategy = $options['strategy'] ?? 'inline';`
`44`	`42`	`unset($options['strategy']);`
`@@ -49,11 +47,9 @@ public function renderFragment($uri, array $options = []): string`
`49`	`47`	`/**`
`50`	`48`	`* Renders a fragment.`
`51`	`49`	`*`
`52`		`- * @param string\|ControllerReference $uri A URI as a string or a ControllerReference instance`
`53`		`- *`
`54`	`50`	`* @see FragmentHandler::render()`
`55`	`51`	`*/`
`56`		`- public function renderFragmentStrategy(string $strategy, $uri, array $options = []): string`
	`52`	`+ public function renderFragmentStrategy(string $strategy, string\|ControllerReference $uri, array $options = []): string`
`57`	`53`	`{`
`58`	`54`	`return $this->handler->render($uri, $strategy, $options);`
`59`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,7 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul`
`35`	`35`	`$this->impersonateUrlGenerator = $impersonateUrlGenerator;`
`36`	`36`	`}`
`37`	`37`
`38`		`- /**`
`39`		`- * @param mixed $object`
`40`		`- */`
`41`		`- public function isGranted($role, $object = null, string $field = null): bool`
	`38`	`+ public function isGranted(mixed $role, mixed $object = null, string $field = null): bool`
`42`	`39`	`{`
`43`	`40`	`if (null === $this->securityChecker) {`
`44`	`41`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(SerializerInterface $serializer)`
`26`	`26`	`$this->serializer = $serializer;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function serialize($data, string $format = 'json', array $context = []): string`
	`29`	`+ public function serialize(mixed $data, string $format = 'json', array $context = []): string`
`30`	`30`	`{`
`31`	`31`	`return $this->serializer->serialize($data, $format, $context);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,9 @@ public function getTranslationNodeVisitor(): TranslationNodeVisitor`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
`109`		`- * @param string\|\Stringable\|TranslatableInterface\|null $message`
`110`		`- * @param array\|string $arguments Can be the locale as a string when $message is a TranslatableInterface`
	`109`	`+ * @param array\|string $arguments Can be the locale as a string when $message is a TranslatableInterface`
`111`	`110`	`*/`
`112`		`- public function trans($message, $arguments = [], string $domain = null, string $locale = null, int $count = null): string`
	`111`	`+ public function trans(string\|\Stringable\|TranslatableInterface\|null $message, array\|string $arguments = [], string $domain = null, string $locale = null, int $count = null): string`
`113`	`112`	`{`
`114`	`113`	`if ($message instanceof TranslatableInterface) {`
`115`	`114`	`if ([] !== $arguments && !\is_string($arguments)) {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st`
`102`	`102`	`* Use a string (the place name) to get place metadata`
`103`	`103`	`* Use a Transition instance to get transition metadata`
`104`	`104`	`*/`
`105`		`- public function getMetadata(object $subject, string $key, $metadataSubject = null, string $name = null)`
	`105`	`+ public function getMetadata(object $subject, string $key, string\|Transition\|null $metadataSubject = null, string $name = null)`
`106`	`106`	`{`
`107`	`107`	`return $this`
`108`	`108`	`->workflowRegistry`