wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 27, 2023 · bfba3c6 · bfba3c6
1 parent d4c3325
commit bfba3c6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -30,13 +30,13 @@
         "php": "^8.1",
         "composer-runtime-api": "^2.2",
         "composer/semver": "^3.0",
-        "illuminate/console": "^10.26",
-        "illuminate/filesystem": "^10.26",
+        "illuminate/console": "^10.38.1",
+        "illuminate/filesystem": "^10.38.1",
         "symfony/polyfill-php83": "^1.28"
     },
     "require-dev": {
         "laravel/pint": "^1.6",
-        "laravel/framework": "^10.26",
+        "laravel/framework": "^10.38.1",
         "mockery/mockery": "^1.5.1",
         "orchestra/testbench-core": "^8.15",
         "phpstan/phpstan": "^1.10.6",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Foundation\\\\Application\\:\\:joinPaths\\(\\)\\.$#"
-			count: 1
-			path: src/Commands/MigrationGeneratorCommand.php
-
 		-
 			message: "#^Cannot access offset 'migration\\.creator' on Illuminate\\\\Contracts\\\\Foundation\\\\Application\\.$#"
 			count: 1

diff --git a/src/Concerns/MigrationGenerator.php b/src/Concerns/MigrationGenerator.php
@@ -2,6 +2,8 @@
 
 namespace Orchestra\Canvas\Core\Concerns;
 
+use function Illuminate\Filesystem\join_paths;
+
 trait MigrationGenerator
 {
     use CreatesUsingGeneratorPreset;
@@ -22,7 +24,7 @@ protected function createBaseMigrationUsingCanvas(string $table): string
     protected function migrationExistsUsingCanvas(string $table): bool
     {
         return \count($this->files->glob(
-            $this->laravel->joinPaths($this->generatorPreset()->migrationPath(), '*_*_*_*_create_'.$table.'_table.php')
+            join_paths($this->generatorPreset()->migrationPath(), '*_*_*_*_create_'.$table.'_table.php')
         )) !== 0;
     }
 }
diff --git a/src/Concerns/ResolvesPresetStubs.php b/src/Concerns/ResolvesPresetStubs.php
@@ -2,6 +2,8 @@
 
 namespace Orchestra\Canvas\Core\Concerns;
 
+use function Illuminate\Filesystem\join_paths;
+
 trait ResolvesPresetStubs
 {
     /**
@@ -14,7 +16,7 @@ protected function resolveStubPath($stub)
     {
         $preset = $this->generatorPreset();
 
-        return $preset->hasCustomStubPath() && file_exists($customPath = implode('/', [$preset->basePath(), trim($stub, '/')]))
+        return $preset->hasCustomStubPath() && file_exists($customPath = join_paths($preset->basePath(), trim($stub, '/')))
             ? $customPath
             : $this->resolveDefaultStubPath($stub);
     }

diff --git a/src/Concerns/UsesGeneratorOverrides.php b/src/Concerns/UsesGeneratorOverrides.php
@@ -6,6 +6,8 @@
 use Orchestra\Canvas\Core\Presets\Preset;
 use Symfony\Component\Finder\Finder;
 
+use function Illuminate\Filesystem\join_paths;
+
 trait UsesGeneratorOverrides
 {
     /**
@@ -31,7 +33,7 @@ protected function getPathUsingCanvas(string $name): string
     {
         $name = Str::replaceFirst($this->rootNamespace(), '', $name);
 
-        return $this->getGeneratorSourcePath().'/'.str_replace('\\', '/', $name).'.php';
+        return join_paths($this->getGeneratorSourcePath(), str_replace('\\', '/', $name).'.php');
     }
 
     /**
@@ -57,7 +59,7 @@ protected function viewPathUsingCanvas(string $path = ''): string
     {
         $views = $this->generatorPreset()->viewPath();
 
-        return $views.($path ? DIRECTORY_SEPARATOR.$path : $path);
+        return join_paths($views, $path);
     }
 
     /**
@@ -69,7 +71,7 @@ protected function possibleModelsUsingCanvas(): array
     {
         $sourcePath = $this->generatorPreset()->sourcePath();
 
-        $modelPath = is_dir("{$sourcePath}/Models") ? "{$sourcePath}/Models" : $sourcePath;
+        $modelPath = is_dir(join_paths($sourcePath, 'Models')) ? join_paths($sourcePath, 'Models') : $sourcePath;
 
         return collect((new Finder)->files()->depth(0)->in($modelPath))
             ->map(fn ($file) => $file->getBasename('.php'))
@@ -85,7 +87,7 @@ protected function possibleModelsUsingCanvas(): array
      */
     protected function possibleEventsUsingCanvas(): array
     {
-        $eventPath = sprintf('%s/Events', $this->generatorPreset()->sourcePath());
+        $eventPath = join_paths($this->generatorPreset()->sourcePath(), 'Events');
 
         if (! is_dir($eventPath)) {
             return [];

diff --git a/src/Presets/Laravel.php b/src/Presets/Laravel.php
@@ -2,6 +2,8 @@
 
 namespace Orchestra\Canvas\Core\Presets;
 
+use function Illuminate\Filesystem\join_paths;
+
 class Laravel extends Preset
 {
     /**
@@ -123,7 +125,7 @@ public function commandNamespace()
      */
     public function modelNamespace()
     {
-        return is_dir("{$this->sourcePath()}/Models") ? "{$this->rootNamespace()}Models\\" : $this->rootNamespace();
+        return is_dir(join_paths($this->sourcePath(), 'Models')) ? "{$this->rootNamespace()}Models\\" : $this->rootNamespace();
     }
 
     /**