Merge branch '9.x' into 10.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

composer.json

@@ -36,6 +36,7 @@
         "illuminate/filesystem": "^12.0",
         "illuminate/support": "^12.0",
         "orchestra/canvas-core": "^10.0",
+        "orchestra/sidekick": "^1.0",
         "orchestra/testbench-core": "^10.0",
         "symfony/polyfill-php83": "^1.31",
         "symfony/yaml": "^7.0.3"

src/CanvasServiceProvider.php

@@ -9,7 +9,7 @@
 use Orchestra\Canvas\Core\PresetManager;
 use Symfony\Component\Yaml\Yaml;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class CanvasServiceProvider extends ServiceProvider implements DeferrableProvider
 {

src/Console/FactoryMakeCommand.php

@@ -7,7 +7,7 @@
 use Orchestra\Canvas\Core\Concerns\UsesGeneratorOverrides;
 use Symfony\Component\Console\Attribute\AsCommand;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 /**
  * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Database/Console/Factories/FactoryMakeCommand.php

src/Console/GeneratorMakeCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 #[AsCommand(name: 'make:generator', description: 'Create a new generator command')]
 class GeneratorMakeCommand extends GeneratorCommand

src/Console/PresetMakeCommand.php

@@ -13,8 +13,8 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use function Illuminate\Filesystem\join_paths;
 use function Laravel\Prompts\select;
+use function Orchestra\Sidekick\join_paths;
 use function Orchestra\Testbench\package_path;
 
 /**

src/Console/TestMakeCommand.php

@@ -7,7 +7,7 @@
 use Orchestra\Canvas\GeneratorPreset;
 use Symfony\Component\Console\Attribute\AsCommand;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 /**
  * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Foundation/Console/TestMakeCommand.php

src/Console/UserFactoryMakeCommand.php

@@ -7,7 +7,7 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 #[AsCommand(name: 'make:user-factory', description: 'Create the User factory class')]
 class UserFactoryMakeCommand extends GeneratorCommand

src/Console/UserModelMakeCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 #[AsCommand(name: 'make:user-model', description: 'Create the User model class')]
 class UserModelMakeCommand extends GeneratorCommand

src/Console/ViewMakeCommand.php

@@ -9,7 +9,7 @@
 use Orchestra\Canvas\GeneratorPreset;
 use Symfony\Component\Console\Attribute\AsCommand;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 #[AsCommand(name: 'make:view', description: 'Create a new view')]
 class ViewMakeCommand extends \Illuminate\Foundation\Console\ViewMakeCommand

src/GeneratorPreset.php

@@ -4,7 +4,7 @@
 
 use Orchestra\Canvas\Core\Presets\Preset;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class GeneratorPreset extends Preset
 {

src/Presets/Laravel.php

@@ -2,7 +2,7 @@
 
 namespace Orchestra\Canvas\Presets;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class Laravel extends Preset
 {

src/Presets/Package.php

@@ -4,7 +4,7 @@
 
 use InvalidArgumentException;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class Package extends Preset
 {

src/Presets/Preset.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Arr;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 abstract class Preset
 {

tests/Feature/GeneratorPresetTest.php

@@ -9,7 +9,7 @@
 use Orchestra\Testbench\TestCase;
 use PHPUnit\Framework\Attributes\Test;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class GeneratorPresetTest extends TestCase
 {

tests/Unit/Presets/LaravelTest.php

@@ -7,7 +7,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class LaravelTest extends TestCase
 {

tests/Unit/Presets/PackageTest.php

@@ -7,7 +7,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
-use function Illuminate\Filesystem\join_paths;
+use function Orchestra\Sidekick\join_paths;
 
 class PackageTest extends TestCase
 {