Fix ReturnTypeWillChange attribute position (it must be above the function otherwise it's not applied) (#1161)

kaznovac · mkalkbrenner · web-flow · commit a9a4fb19734f · 2025-08-07T11:01:45.000+02:00
Co-authored-by: Markus Kalkbrenner &lt;git@kalki.de&gt;
diff --git a/src/Component/Analytics/Analytics.php b/src/Component/Analytics/Analytics.php
@@ -181,10 +181,10 @@ public function addGrouping(Grouping $grouping): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/Pivot.php b/src/Component/Analytics/Facet/Pivot.php
@@ -99,10 +99,10 @@ public function setSort($sort): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/PivotFacet.php b/src/Component/Analytics/Facet/PivotFacet.php
@@ -67,10 +67,10 @@ public function addPivot(Pivot $pivot): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/QueryFacet.php b/src/Component/Analytics/Facet/QueryFacet.php
@@ -66,10 +66,10 @@ public function addQuery(string $key, string $query): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/RangeFacet.php b/src/Component/Analytics/Facet/RangeFacet.php
@@ -276,10 +276,10 @@ public function setOthers(array $others): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter(
diff --git a/src/Component/Analytics/Facet/Sort/Criterion.php b/src/Component/Analytics/Facet/Sort/Criterion.php
@@ -118,10 +118,10 @@ public function setDirection(string $direction): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/Sort/Sort.php b/src/Component/Analytics/Facet/Sort/Sort.php
@@ -114,10 +114,10 @@ public function setOffset(?int $offset): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Facet/ValueFacet.php b/src/Component/Analytics/Facet/ValueFacet.php
@@ -80,10 +80,10 @@ public function setSort($sort): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Analytics/Grouping.php b/src/Component/Analytics/Grouping.php
@@ -134,10 +134,10 @@ public function addFacet(AbstractFacet $facet): self
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_filter([
diff --git a/src/Component/Result/Debug/Detail.php b/src/Component/Result/Debug/Detail.php
@@ -123,14 +123,14 @@ public function offsetExists($offset): bool
         return \in_array($offset, ['match', 'value', 'description']);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->{$offset};
diff --git a/src/Component/Result/TermVector/Document.php b/src/Component/Result/TermVector/Document.php
@@ -100,14 +100,14 @@ public function offsetExists($offset): bool
         return \array_key_exists($offset, $this->fields);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->fields[$offset];
diff --git a/src/Component/Result/TermVector/Field.php b/src/Component/Result/TermVector/Field.php
@@ -100,14 +100,14 @@ public function offsetExists($offset): bool
         return \array_key_exists($offset, $this->terms);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->terms[$offset];
diff --git a/src/Component/Result/TermVector/Result.php b/src/Component/Result/TermVector/Result.php
@@ -100,14 +100,14 @@ public function offsetExists($offset): bool
         return \array_key_exists($offset, $this->documents);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->documents[$offset];
diff --git a/src/Component/Result/TermVector/Term.php b/src/Component/Result/TermVector/Term.php
@@ -167,14 +167,14 @@ public function offsetExists($offset): bool
         return \in_array($offset, ['tf', 'positions', 'offsets', 'payloads', 'df', 'tf-idf']);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if ('tf-idf' === $offset) {
diff --git a/src/Component/Result/TermVector/Warnings.php b/src/Component/Result/TermVector/Warnings.php
@@ -100,14 +100,14 @@ public function offsetExists($offset): bool
         return \in_array($offset, ['noTermVectors', 'noPositions', 'noOffsets', 'noPayloads']);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->{$offset};
diff --git a/src/Core/Query/AbstractDocument.php b/src/Core/Query/AbstractDocument.php
@@ -120,22 +120,22 @@ public function offsetUnset($offset): void
         $this->__set($offset, null);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->__get($offset);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     abstract public function jsonSerialize();
 }
diff --git a/src/Core/Query/LocalParameters/LocalParameters.php b/src/Core/Query/LocalParameters/LocalParameters.php
@@ -897,14 +897,14 @@ public function offsetExists($offset): bool
         return isset($this->parameters[$offset]);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->parameters[$offset] ?? null;
diff --git a/src/Core/Query/Result/Result.php b/src/Core/Query/Result/Result.php
@@ -134,10 +134,10 @@ public function getData(): array
         return $this->data;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();
diff --git a/src/Plugin/MinimumScoreFilter/Document.php b/src/Plugin/MinimumScoreFilter/Document.php
@@ -151,14 +151,14 @@ public function offsetUnset($offset): void
         $this->document->offsetUnset($offset);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->document->offsetGet($offset);
@@ -185,10 +185,10 @@ public function getFields(): array
         return $this->document->getFields();
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->document;
diff --git a/src/QueryType/Luke/Result/FlagList.php b/src/QueryType/Luke/Result/FlagList.php
@@ -281,14 +281,14 @@ public function offsetExists($offset): bool
         return \in_array($offset, $this->lookup);
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * ArrayAccess implementation.
      *
      * @param mixed $offset
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         $value = null;
diff --git a/src/QueryType/Select/Result/Document.php b/src/QueryType/Select/Result/Document.php
@@ -53,10 +53,10 @@ public function __set($name, $value): void
         throw new RuntimeException('A readonly document cannot be altered');
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getFields();
diff --git a/src/QueryType/Update/Query/Document.php b/src/QueryType/Update/Query/Document.php
@@ -487,10 +487,10 @@ public function getVersion(): ?int
         return $this->version;
     }
 
-    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $fields = $this->getFields();

Original file line number	Diff line number	Diff line change
`@@ -181,10 +181,10 @@ public function addGrouping(Grouping $grouping): self`
`181`	`181`	`return $this;`
`182`	`182`	`}`
`183`	`183`
`184`		`- #[\ReturnTypeWillChange]`
`185`	`184`	`/**`
`186`	`185`	`* {@inheritdoc}`
`187`	`186`	`*/`
	`187`	`+ #[\ReturnTypeWillChange]`
`188`	`188`	`public function jsonSerialize()`
`189`	`189`	`{`
`190`	`190`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ public function setSort($sort): self`
`99`	`99`	`return $this;`
`100`	`100`	`}`
`101`	`101`
`102`		`- #[\ReturnTypeWillChange]`
`103`	`102`	`/**`
`104`	`103`	`* {@inheritdoc}`
`105`	`104`	`*/`
	`105`	`+ #[\ReturnTypeWillChange]`
`106`	`106`	`public function jsonSerialize()`
`107`	`107`	`{`
`108`	`108`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ public function addPivot(Pivot $pivot): self`
`67`	`67`	`return $this;`
`68`	`68`	`}`
`69`	`69`
`70`		`- #[\ReturnTypeWillChange]`
`71`	`70`	`/**`
`72`	`71`	`* {@inheritdoc}`
`73`	`72`	`*/`
	`73`	`+ #[\ReturnTypeWillChange]`
`74`	`74`	`public function jsonSerialize()`
`75`	`75`	`{`
`76`	`76`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,10 @@ public function addQuery(string $key, string $query): self`
`66`	`66`	`return $this;`
`67`	`67`	`}`
`68`	`68`
`69`		`- #[\ReturnTypeWillChange]`
`70`	`69`	`/**`
`71`	`70`	`* {@inheritdoc}`
`72`	`71`	`*/`
	`72`	`+ #[\ReturnTypeWillChange]`
`73`	`73`	`public function jsonSerialize()`
`74`	`74`	`{`
`75`	`75`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,10 @@ public function setOthers(array $others): self`
`276`	`276`	`return $this;`
`277`	`277`	`}`
`278`	`278`
`279`		`- #[\ReturnTypeWillChange]`
`280`	`279`	`/**`
`281`	`280`	`* {@inheritdoc}`
`282`	`281`	`*/`
	`282`	`+ #[\ReturnTypeWillChange]`
`283`	`283`	`public function jsonSerialize()`
`284`	`284`	`{`
`285`	`285`	`return array_filter(`
Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,10 @@ public function setDirection(string $direction): self`
`118`	`118`	`return $this;`
`119`	`119`	`}`
`120`	`120`
`121`		`- #[\ReturnTypeWillChange]`
`122`	`121`	`/**`
`123`	`122`	`* {@inheritdoc}`
`124`	`123`	`*/`
	`124`	`+ #[\ReturnTypeWillChange]`
`125`	`125`	`public function jsonSerialize()`
`126`	`126`	`{`
`127`	`127`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,10 @@ public function setOffset(?int $offset): self`
`114`	`114`	`return $this;`
`115`	`115`	`}`
`116`	`116`
`117`		`- #[\ReturnTypeWillChange]`
`118`	`117`	`/**`
`119`	`118`	`* {@inheritdoc}`
`120`	`119`	`*/`
	`120`	`+ #[\ReturnTypeWillChange]`
`121`	`121`	`public function jsonSerialize()`
`122`	`122`	`{`
`123`	`123`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ public function setSort($sort): self`
`80`	`80`	`return $this;`
`81`	`81`	`}`
`82`	`82`
`83`		`- #[\ReturnTypeWillChange]`
`84`	`83`	`/**`
`85`	`84`	`* {@inheritdoc}`
`86`	`85`	`*/`
	`86`	`+ #[\ReturnTypeWillChange]`
`87`	`87`	`public function jsonSerialize()`
`88`	`88`	`{`
`89`	`89`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,10 @@ public function addFacet(AbstractFacet $facet): self`
`134`	`134`	`return $this;`
`135`	`135`	`}`
`136`	`136`
`137`		`- #[\ReturnTypeWillChange]`
`138`	`137`	`/**`
`139`	`138`	`* {@inheritdoc}`
`140`	`139`	`*/`
	`140`	`+ #[\ReturnTypeWillChange]`
`141`	`141`	`public function jsonSerialize()`
`142`	`142`	`{`
`143`	`143`	`return array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,14 @@ public function offsetExists($offset): bool`
`123`	`123`	`return \in_array($offset, ['match', 'value', 'description']);`
`124`	`124`	`}`
`125`	`125`
`126`		`- #[\ReturnTypeWillChange]`
`127`	`126`	`/**`
`128`	`127`	`* ArrayAccess implementation.`
`129`	`128`	`*`
`130`	`129`	`* @param mixed $offset`
`131`	`130`	`*`
`132`	`131`	`* @return mixed`
`133`	`132`	`*/`
	`133`	`+ #[\ReturnTypeWillChange]`
`134`	`134`	`public function offsetGet($offset)`
`135`	`135`	`{`
`136`	`136`	`return $this->{$offset};`