revert return type for union type

Author: macintoshplus

ecs.php

@@ -90,10 +90,10 @@
         NoSinglelineWhitespaceBeforeSemicolonsFixer::class,
         NoWhitespaceBeforeCommaInArrayFixer::class,
         WhitespaceAfterCommaInArrayFixer::class,
-        PhpdocToReturnTypeFixer::class,
         FullyQualifiedStrictTypesFixer::class,
         DisallowYodaComparisonSniff::class,
     ])
+    ->withConfiguredRule(PhpdocToReturnTypeFixer::class, ['union_types' => false])
     ->withConfiguredRule(NoSuperfluousPhpdocTagsFixer::class, ['remove_inheritdoc' => false])
     ->withConfiguredRule(
         ConcatSpaceFixer::class,
@@ -131,6 +131,4 @@
     ->withConfiguredRule(
         ClassAttributesSeparationFixer::class,
         ['elements' => ['property' => 'one', 'method' => 'one', 'const' => 'none']]
-    )
-
-;
+    );

src/Doctrine/JsonHelper.php

@@ -19,8 +19,10 @@ class JsonHelper
      * Newer SQLite, Mysql 5.7 -> [ "JSON_EXTRACT(foo, '$[0]')", 'bar' ]
      *
      * @param string|bool|null $slug
+     *
+     * @return string|array
      */
-    public static function wrapJsonFunction(?string $where, $slug, Connection $connection): string|array
+    public static function wrapJsonFunction(?string $where, $slug, Connection $connection)
     {
         $version = new Version($connection);
 

src/Entity/Field.php

@@ -242,8 +242,10 @@ public function isNew(): bool
 
     /**
      * like getValue() but returns single value for single value fields
+     *
+     * @return array|mixed|null
      */
-    public function getParsedValue(): mixed
+    public function getParsedValue()
     {
         $value = $this->getValue();
         if (is_iterable($value)) {
@@ -258,7 +260,10 @@ public function getParsedValue(): mixed
         return $value;
     }
 
-    public function getTwigValue(): string|array|Markup|bool
+    /**
+     * @return string|array|Markup|bool
+     */
+    public function getTwigValue()
     {
         $value = $this->getParsedValue();
 

src/Entity/Field/CheckboxField.php

@@ -38,7 +38,10 @@ public function setValue($value): Field
         return parent::setValue($value);
     }
 
-    public function getTwigValue(): string|array|Markup|bool
+    /**
+     * @return string|array|Markup|bool
+     */
+    public function getTwigValue()
     {
         return current($this->getValue()) ? true : false;
     }

src/Entity/Field/SelectField.php

@@ -56,7 +56,7 @@ public function getValue(): ?array
         return array_filter((array) $value);
     }
 
-    public function getParsedValue(): mixed
+    public function getParsedValue()
     {
         $parsedValue = parent::getParsedValue();
 

src/Storage/ContentQueryParser.php

@@ -382,8 +382,10 @@ public function getParameter(string $param): array
 
     /**
      * Runs the query and fetches the results.
+     *
+     * @return Pagerfanta|Content|null
      */
-    public function fetch(): Pagerfanta|Content|null
+    public function fetch()
     {
         $this->parse();
 

src/Storage/Filter.php

@@ -34,9 +34,9 @@ public function setKey($key): void
     }
 
     /**
-     * Getter for key.
+     * @return string|array
      */
-    public function getKey(): string|array
+    public function getKey()
     {
         return $this->key;
     }

src/Storage/Query.php

@@ -41,16 +41,21 @@ public function getScope(string $name): ?QueryScopeInterface
      *
      * Used by the twig command {% setcontent %} but also directly.
      * For reference refer to @see https://docs.bolt.cm/templating/content-fetching
+     *
+     * @return Pagerfanta|Content|null
      */
-    public function getContent(string $textQuery, array $parameters = []): Pagerfanta|Content|null
+    public function getContent(string $textQuery, array $parameters = [])
     {
         $this->parser->setQuery($textQuery);
         $this->parser->setParameters($parameters);
 
         return $this->parser->fetch();
     }
 
-    public function getContentByScope(string $scopeName, string $textQuery, array $parameters = []): Pagerfanta|Content|null
+    /**
+     * @return Content|Pagerfanta|null
+     */
+    public function getContentByScope(string $scopeName, string $textQuery, array $parameters = [])
     {
         $scope = $this->getScope($scopeName);
         if ($scope) {
@@ -69,8 +74,9 @@ public function getContentByScope(string $scopeName, string $textQuery, array $p
      *
      * @param string $textQuery The base part like `pages` or `pages/1`
      * @param array $parameters Parameters like `printquery` and `paging`, but also `where` parameters taken from `... where { foo: bar } ...`
+     * @return Pagerfanta|Content|null
      */
-    public function getContentForTwig(string $textQuery, array $parameters = []): Pagerfanta|Content|null
+    public function getContentForTwig(string $textQuery, array $parameters = [])
     {
         if (empty($textQuery)) {
             return new Pagerfanta(new ArrayAdapter([]));

src/Twig/ContentExtension.php

@@ -214,7 +214,10 @@ public function getTitleFieldsNames(Content $content): array
         return ContentHelper::guessTitleFields($content);
     }
 
-    public function getImage(?Content $content, bool $onlyValues = false): ImageField|array|null
+    /**
+     * @return ImageField|array|null
+     */
+    public function getImage(?Content $content, bool $onlyValues = false)
     {
         if (! $content) {
             return null;

src/Twig/FieldExtension.php

@@ -124,7 +124,10 @@ public function getType(Field $field): string
         return $field->getType();
     }
 
-    public function getSelected(SelectField $field, $returnsingle = false, $returnarray = false): array|Content|null
+    /**
+     * @return array|Content|null
+     */
+    public function getSelected(SelectField $field, $returnsingle = false, $returnarray = false)
     {
         $definition = $field->getDefinition();
 
@@ -207,7 +210,7 @@ public function getListTemplates(TemplateselectField $field): Collection
         return new Collection($options);
     }
 
-    public function selectOptionsUrl(SelectField $field): String
+    public function selectOptionsUrl(SelectField $field): string
     {
         return $this->router->generate('bolt_async_select_options', [
             'name' => $field->getDefinition()->get('name', ''),