Merge pull request #285 from marshmallow-packages/hotfix/php-8.4-deprecation-fixes

stefvanesch · web-flow · commit 49f7c875b6ef · 2025-08-07T11:53:29.000+02:00
Fix PHP 8.4 deprecation warnings
diff --git a/src/TinyMCE.php b/src/TinyMCE.php
@@ -18,7 +18,7 @@ class TinyMCE extends Field
      */
     public $component = 'Nova-TinyMCE';
 
-    public function __construct(string $name, $attribute = null, callable $resolveCallback = null)
+    public function __construct(string $name, $attribute = null, ?callable $resolveCallback = null)
     {
         parent::__construct($name, $attribute, $resolveCallback);
 
@@ -80,8 +80,9 @@ protected function buildOptionsArray()
             $options = array_merge($options, $extra_options);
         }
 
-        if (config('nova-tinymce.formats') && !empty(config('nova-tinymce.formats'))) {
-            $options['formats'] = config('nova-tinymce.formats');
+        $formats = config('nova-tinymce.formats');
+        if ($formats && !empty($formats)) {
+            $options['formats'] = $formats;
         }
 
         if ($custom_items = config('nova-tinymce.custom_items')) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class TinyMCE extends Field`
`18`	`18`	`*/`
`19`	`19`	`public $component = 'Nova-TinyMCE';`
`20`	`20`
`21`		`- public function __construct(string $name, $attribute = null, callable $resolveCallback = null)`
	`21`	`+ public function __construct(string $name, $attribute = null, ?callable $resolveCallback = null)`
`22`	`22`	`{`
`23`	`23`	`parent::__construct($name, $attribute, $resolveCallback);`
`24`	`24`
`@@ -80,8 +80,9 @@ protected function buildOptionsArray()`
`80`	`80`	`$options = array_merge($options, $extra_options);`
`81`	`81`	`}`
`82`	`82`
`83`		`- if (config('nova-tinymce.formats') && !empty(config('nova-tinymce.formats'))) {`
`84`		`- $options['formats'] = config('nova-tinymce.formats');`
	`83`	`+ $formats = config('nova-tinymce.formats');`
	`84`	`+ if ($formats && !empty($formats)) {`
	`85`	`+ $options['formats'] = $formats;`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`if ($custom_items = config('nova-tinymce.custom_items')) {`