Merge remote-tracking branch 'origin/master' into psalm-on-ci

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "laravel/framework": "^8.0|^9.0",
+        "laravel/framework": "^8.0|^9.0|^10.0",
         "laravel/nova": "^4.0",
         "nova-kit/nova-packages-tool": "^1.3.1"
     },

src/Commands/CreateCast.php

@@ -117,7 +117,7 @@ protected function buildClass()
         ], [
             $this->classname,
         ],
-            $this->files->get(__DIR__.'/../Stubs/Cast.php')
+            $this->files->get(__DIR__.'/../Stubs/Cast.stub')
         );
     }
 }

src/Commands/CreateLayout.php

@@ -141,7 +141,7 @@ protected function buildClass()
             $this->classname,
             $this->name,
         ],
-            $this->files->get(__DIR__.'/../Stubs/Layout.php')
+            $this->files->get(__DIR__.'/../Stubs/Layout.stub')
         );
     }
 }

src/Commands/CreatePreset.php

@@ -115,7 +115,7 @@ protected function buildClass()
         return str_replace(
             ':classname',
             $this->classname,
-            $this->files->get(__DIR__.'/../Stubs/Preset.php')
+            $this->files->get(__DIR__.'/../Stubs/Preset.stub')
         );
     }
 }

src/Commands/CreateResolver.php

@@ -115,7 +115,7 @@ protected function buildClass()
         return str_replace(
             ':classname',
             $this->classname,
-            $this->files->get(__DIR__.'/../Stubs/Resolver.php')
+            $this->files->get(__DIR__.'/../Stubs/Resolver.stub')
         );
     }
 }

src/Concerns/HasFlexible.php

@@ -119,7 +119,7 @@ protected function getMappedLayout($item, array $layoutMapping)
         if (is_array($item)) {
             $name = $item['layout'] ?? null;
             $key = $item['key'] ?? null;
-            $attributes = (array) $item['attributes'] ?? [];
+            $attributes = (array) ($item['attributes'] ?? []);
         } elseif (is_a($item, \stdClass::class)) {
             $name = $item->layout ?? null;
             $key = $item->key ?? null;