Skip to content

Commit 4b78e55

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Fix return types for PHP 8.1
2 parents a603e57 + fa0b12a commit 4b78e55

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

OptionsResolver.php

+5
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@ public function resolve(array $options = [])
942942
* @throws OptionDefinitionException If there is a cyclic dependency between
943943
* lazy options and/or normalizers
944944
*/
945+
#[\ReturnTypeWillChange]
945946
public function offsetGet($option, bool $triggerDeprecation = true)
946947
{
947948
if (!$this->locked) {
@@ -1199,6 +1200,7 @@ private function verifyTypes(string $type, $value, array &$invalidTypes, int $le
11991200
*
12001201
* @see \ArrayAccess::offsetExists()
12011202
*/
1203+
#[\ReturnTypeWillChange]
12021204
public function offsetExists($option)
12031205
{
12041206
if (!$this->locked) {
@@ -1215,6 +1217,7 @@ public function offsetExists($option)
12151217
*
12161218
* @throws AccessException
12171219
*/
1220+
#[\ReturnTypeWillChange]
12181221
public function offsetSet($option, $value)
12191222
{
12201223
throw new AccessException('Setting options via array access is not supported. Use setDefault() instead.');
@@ -1227,6 +1230,7 @@ public function offsetSet($option, $value)
12271230
*
12281231
* @throws AccessException
12291232
*/
1233+
#[\ReturnTypeWillChange]
12301234
public function offsetUnset($option)
12311235
{
12321236
throw new AccessException('Removing options via array access is not supported. Use remove() instead.');
@@ -1243,6 +1247,7 @@ public function offsetUnset($option)
12431247
*
12441248
* @see \Countable::count()
12451249
*/
1250+
#[\ReturnTypeWillChange]
12461251
public function count()
12471252
{
12481253
if (!$this->locked) {

0 commit comments

Comments
 (0)