Merge branch '7.4' into 8.0

javiereguiluz · javiereguiluz · commit 3f83dbbd8c55 · 2025-11-29T12:59:38.000+01:00
* 7.4:
  [OptionsResolver] setOptions callback should not return a value
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
@@ -723,8 +723,11 @@ In same way, parent options can access to the nested options as normal arrays::
                     // ...
                 ]);
             });
+
             $resolver->setOptions('profiling', function (Options $options): void {
-                return 'file' === $options['spool']['type'];
+                if ('file' === $options['spool']['type']) {
+                    // ...
+                }
             });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -723,8 +723,11 @@ In same way, parent options can access to the nested options as normal arrays::`
`723`	`723`	`// ...`
`724`	`724`	`]);`
`725`	`725`	`});`
	`726`	`+`
`726`	`727`	`$resolver->setOptions('profiling', function (Options $options): void {`
`727`		`- return 'file' === $options['spool']['type'];`
	`728`	`+ if ('file' === $options['spool']['type']) {`
	`729`	`+ // ...`
	`730`	`+ }`
`728`	`731`	`});`
`729`	`732`	`}`
`730`	`733`	`}`