Improve PHP 8.4 support

Author: Luke Towers

.gitignore

@@ -30,6 +30,7 @@ _ide_helper.php
 # Other ignores
 .DS_Store
 package-lock.json
+.phpunit.cache
 /node_modules
 
 # Ignore generated public directory from `winter:mirror public`

modules/cms/classes/CmsObject.php

@@ -202,7 +202,7 @@ public static function inTheme($theme)
      * @param  array  $options
      * @return bool
      */
-    public function save(array $options = null)
+    public function save(?array $options = null)
     {
         try {
             parent::save($options);

modules/system/classes/PluginManager.php

@@ -710,7 +710,7 @@ public function getReplacementMap(): array
     /**
      * Returns the actively replaced plugins defined in $this->activeReplacementMap
      */
-    public function getActiveReplacementMap(PluginBase|string $plugin = null): array|string|null
+    public function getActiveReplacementMap(PluginBase|string|null $plugin = null): array|string|null
     {
         if ($plugin) {
             return $this->normalizedMap[

modules/system/classes/UpdateManager.php

@@ -603,7 +603,7 @@ public function updatePlugin($name)
      * @param string $stopOnVersion If this parameter is specified, the process stops once the provided version number is reached
      * @return self
      */
-    public function rollbackPlugin(string $name, string $stopOnVersion = null)
+    public function rollbackPlugin(string $name, ?string $stopOnVersion = null)
     {
         /*
          * Remove the plugin database and version

modules/system/traits/AssetMaker.php

@@ -51,7 +51,7 @@ public function flushAssets(): void
      * Outputs `<link>` and `<script>` tags to load assets previously added
      * with addJs, addCss, & addRss method calls depending on the provided $type
      */
-    public function makeAssets(string $type = null): ?string
+    public function makeAssets(?string $type = null): ?string
     {
         if ($type != null) {
             $type = strtolower($type);

modules/system/traits/ViewMaker.php

@@ -132,7 +132,7 @@ public function makeView(string $view): string
     /**
      * Renders supplied contents inside a layout.
      */
-    public function makeViewContent(string $contents, string $layout = null): string
+    public function makeViewContent(string $contents, ?string $layout = null): string
     {
         if ($this->suppressLayout || $this->layout == '') {
             return $contents;
@@ -148,7 +148,7 @@ public function makeViewContent(string $contents, string $layout = null): string
      * Render a layout, defaulting to the layout propery specified on the class
      * @return string|bool The layout contents, or false.
      */
-    public function makeLayout(string $name = null, array $params = [], bool $throwException = true): string|bool
+    public function makeLayout(?string $name = null, array $params = [], bool $throwException = true): string|bool
     {
         $layout = $name ?? $this->layout;
         if ($layout == '') {
@@ -188,7 +188,7 @@ public function makeLayoutPartial(string $partial, array $params = []): string
      *
      * If the fileName cannot be found it will be returned unmodified.
      */
-    public function getViewPath(string $fileName, string|array $viewPaths = null): string
+    public function getViewPath(string $fileName, string|array|null $viewPaths = null): string
     {
         $input = $fileName;
         $allowedExtensions = ['php', 'htm'];