Merge pull request #3 from bwaidelich/bugfix/2-fix-callable-schema-check-for-php8

bwaidelich · web-flow · commit 03f14e11f9a6 · 2022-07-27T18:53:19.000+02:00
BUGFIX: Fix OptionsSchema check for "callable" options for PHP 8+
diff --git a/Classes/OptionsSchema.php b/Classes/OptionsSchema.php
@@ -101,7 +101,7 @@ public function validate(array $options): void
             $expectedType = $optionSchema['type'] ?? 'string';
             $actualType = TypeHandling::getTypeForValue($options[$optionName]);
             if ($expectedType === 'callable') {
-                if (!\is_callable($options[$optionName])) {
+                if (!\is_callable($options[$optionName], true)) {
                     throw new \InvalidArgumentException(sprintf('Option "%s" must be a callable in the format: "Some\ClassName::someMethodName" but it is: "%s" and that is not callable', $optionName, \is_string($options[$optionName]) ? $options[$optionName] : $actualType), 1563962182);
                 }
             } elseif ($actualType !== $expectedType) {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function validate(array $options): void`
`101`	`101`	`$expectedType = $optionSchema['type'] ?? 'string';`
`102`	`102`	`$actualType = TypeHandling::getTypeForValue($options[$optionName]);`
`103`	`103`	`if ($expectedType === 'callable') {`
`104`		`- if (!\is_callable($options[$optionName])) {`
	`104`	`+ if (!\is_callable($options[$optionName], true)) {`
`105`	`105`	`throw new \InvalidArgumentException(sprintf('Option "%s" must be a callable in the format: "Some\ClassName::someMethodName" but it is: "%s" and that is not callable', $optionName, \is_string($options[$optionName]) ? $options[$optionName] : $actualType), 1563962182);`
`106`	`106`	`}`
`107`	`107`	`} elseif ($actualType !== $expectedType) {`