Add return type to jsonSerialize() (#1180)

thomascorthals · web-flow · commit c962f48eb48b · 2026-03-21T00:34:32.000+01:00
diff --git a/src/Component/Analytics/Analytics.php b/src/Component/Analytics/Analytics.php
@@ -180,8 +180,7 @@ public function addGrouping(Grouping $grouping): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'functions' => $this->functions,
diff --git a/src/Component/Analytics/Facet/Pivot.php b/src/Component/Analytics/Facet/Pivot.php
@@ -93,8 +93,7 @@ public function setSort(Sort|array|null $sort): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'name' => $this->name,
diff --git a/src/Component/Analytics/Facet/PivotFacet.php b/src/Component/Analytics/Facet/PivotFacet.php
@@ -70,8 +70,7 @@ public function addPivot(Pivot $pivot): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'type' => $this->getType(),
diff --git a/src/Component/Analytics/Facet/QueryFacet.php b/src/Component/Analytics/Facet/QueryFacet.php
@@ -66,8 +66,7 @@ public function addQuery(string $key, string $query): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'type' => $this->getType(),
diff --git a/src/Component/Analytics/Facet/RangeFacet.php b/src/Component/Analytics/Facet/RangeFacet.php
@@ -258,8 +258,7 @@ public function setOthers(array $others): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter(
             [
diff --git a/src/Component/Analytics/Facet/Sort/Criterion.php b/src/Component/Analytics/Facet/Sort/Criterion.php
@@ -112,8 +112,7 @@ public function setDirection(string $direction): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'type' => $this->type,
diff --git a/src/Component/Analytics/Facet/Sort/Sort.php b/src/Component/Analytics/Facet/Sort/Sort.php
@@ -111,8 +111,7 @@ public function setOffset(?int $offset): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'limit' => $this->limit,
diff --git a/src/Component/Analytics/Facet/ValueFacet.php b/src/Component/Analytics/Facet/ValueFacet.php
@@ -77,8 +77,7 @@ public function setSort(Sort|array|null $sort): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'type' => $this->getType(),
diff --git a/src/Component/Analytics/Grouping.php b/src/Component/Analytics/Grouping.php
@@ -132,8 +132,7 @@ public function addFacet(AbstractFacet $facet): self
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return array_filter([
             'expressions' => $this->expressions,
diff --git a/src/Core/Query/AbstractDocument.php b/src/Core/Query/AbstractDocument.php
@@ -133,9 +133,6 @@ public function offsetGet($offset)
 
     /**
      * {@inheritdoc}
-     *
-     * @return mixed
      */
-    #[\ReturnTypeWillChange]
-    abstract public function jsonSerialize();
+    abstract public function jsonSerialize(): mixed;
 }
diff --git a/src/Core/Query/Result/Result.php b/src/Core/Query/Result/Result.php
@@ -132,8 +132,7 @@ public function getData(): array
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->getData();
     }
diff --git a/src/Plugin/MinimumScoreFilter/Document.php b/src/Plugin/MinimumScoreFilter/Document.php
@@ -186,8 +186,7 @@ public function getFields(): array
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->document;
     }
diff --git a/src/QueryType/Select/Result/Document.php b/src/QueryType/Select/Result/Document.php
@@ -54,8 +54,7 @@ public function __set(string $name, mixed $value): void
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->getFields();
     }
diff --git a/src/QueryType/Update/Query/Document.php b/src/QueryType/Update/Query/Document.php
@@ -460,8 +460,7 @@ public function getVersion(): ?int
     /**
      * {@inheritdoc}
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $fields = $this->getFields();
 

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,7 @@ public function setOthers(array $others): self`
`258`	`258`	`/**`
`259`	`259`	`* {@inheritdoc}`
`260`	`260`	`*/`
`261`		`- #[\ReturnTypeWillChange]`
`262`		`- public function jsonSerialize()`
	`261`	`+ public function jsonSerialize(): mixed`
`263`	`262`	`{`
`264`	`263`	`return array_filter(`
`265`	`264`	`[`