Merge branch '5.4' into 6.0

* 5.4:
  Fix return types for PHP 8.1

Author: derrabus

OptionsResolver.php

@@ -924,6 +924,7 @@ public function resolve(array $options = [])
      * @throws OptionDefinitionException If there is a cyclic dependency between
      *                                   lazy options and/or normalizers
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet(mixed $option, bool $triggerDeprecation = true)
     {
         if (!$this->locked) {
@@ -1179,6 +1180,7 @@ private function verifyTypes(string $type, mixed $value, array &$invalidTypes, i
      *
      * @see \ArrayAccess::offsetExists()
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists(mixed $option)
     {
         if (!$this->locked) {
@@ -1195,6 +1197,7 @@ public function offsetExists(mixed $option)
      *
      * @throws AccessException
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet(mixed $option, mixed $value)
     {
         throw new AccessException('Setting options via array access is not supported. Use setDefault() instead.');
@@ -1207,6 +1210,7 @@ public function offsetSet(mixed $option, mixed $value)
      *
      * @throws AccessException
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset(mixed $option)
     {
         throw new AccessException('Removing options via array access is not supported. Use remove() instead.');
@@ -1223,6 +1227,7 @@ public function offsetUnset(mixed $option)
      *
      * @see \Countable::count()
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         if (!$this->locked) {