wip

Author: lakuapik

src/Commands/InstallCommand.php

@@ -33,7 +33,7 @@ public function handle(): int
         if ($dirExists) {
             File::deleteDirectory(base_path('modules'));
             File::makeDirectory((base_path('modules')));
-            File::put(base_path('modules/.gitkeep'), '');
+            File::put(base_path('modules'.DIRECTORY_SEPARATOR.'.gitkeep'), '');
         }
 
         $this->info("> Success!");

src/Commands/ModuleListCommand.php

@@ -22,7 +22,7 @@ public function handle(): int
         foreach ($modules as $module) {
             // TODO: get whats loaded in the module (routes, config, etc)
             $name = Str::studly(str_replace('modules/', '', $module));
-            $folder = "modules/{$name}";
+            $folder = 'modules'.DIRECTORY_SEPARATOR.$name;
             $rows[] = [$name, $folder];
         }
 

src/Commands/ModuleMakeCommand.php

@@ -25,6 +25,7 @@ public function __construct(Composer $composer)
 
     public function handle(): int
     {
+        $ds = DIRECTORY_SEPARATOR;
         $name = Str::studly($this->argument('name'));
         $nameSlug = Str::slug($this->argument('name'));
 
@@ -42,25 +43,25 @@ public function handle(): int
         $this->line("> Creating composer.json file..");
 
         File::ensureDirectoryExists(module_path($name));
-        File::makeDirectory(module_path("{$name}/src"));
-        File::makeDirectory(module_path("{$name}/src/Providers"));
+        File::makeDirectory(module_path($name.$ds.'src'));
+        File::makeDirectory(module_path($name.$ds.'src'.$ds.'Providers'));
 
-        $composerContent = File::get(__DIR__.'/../../stubs/composer.json.stub');
+        $composerContent = File::get(__DIR__.$ds.'..'.$ds.'..'.$ds.'stubs'.$ds.'composer.json.stub');
         $composerContent = preg_replace('/_MODULENAME_/', $name, $composerContent);
         $composerContent = preg_replace('/_MODULENAMESLUG_/', $nameSlug, $composerContent);
 
         File::put(module_path("{$name}/composer.json"), $composerContent);
 
         $this->line("> Creating {$name}ServiceProvider file..");
 
-        $providerContent = File::get(__DIR__.'/../../stubs/ModuleNameServiceProvider.php.stub');
+        $providerContent = File::get(__DIR__.$ds.'..'.$ds.'..'.$ds.'stubs/ModuleNameServiceProvider.php.stub');
         $providerContent = preg_replace('/_MODULENAME_/', $name, $providerContent);
 
-        File::put(module_path("{$name}/src/Providers/{$name}ServiceProvider.php"), $providerContent);
+        File::put(module_path($name.$ds.'src'.$ds.'Providers'.$ds.$name.'ServiceProvider.php'), $providerContent);
 
         $this->line("> Running composer install modules/{$nameSlug}..");
 
-        $installProcess = new Process(['composer', 'require', "modules/{$nameSlug}"], null);
+        $installProcess = new Process(['composer', 'require', 'modules'.$ds.$nameSlug], null);
         $installProcess->setWorkingDirectory(base_path());
         $installProcess->mustRun(function ($type, $buffer) {
             $this->getOutput()->write($buffer);

src/Module.php

@@ -50,15 +50,15 @@ public function name(string $name): self
     public function hasViews(): self
     {
         $this->hasViews = true;
-        $this->viewPath = $this->basePath('resources/views');
+        $this->viewPath = $this->basePath('resources'.DIRECTORY_SEPARATOR.'views');
 
         return $this;
     }
 
     public function hasMigrations(): self
     {
         $this->hasMigrations = true;
-        $this->migrationPath = $this->basePath('database/migrations');
+        $this->migrationPath = $this->basePath('database'.DIRECTORY_SEPARATOR.'migrations');
 
         return $this;
     }
@@ -96,7 +96,7 @@ public function hasConfigs(array $configNames = []): self
 
             foreach ($configNames as $configName) {
                 //.
-                $path = $this->basePath("config/{$configName}.php");
+                $path = $this->basePath('config'.DIRECTORY_SEPARATOR.$configName.'.php');
                 if (! file_exists($path)) {
                     throw new \Exception("Config file {$configName} does not exists!");
                 }
@@ -138,7 +138,7 @@ public function hasRoutes(array $routeNames = []): self
 
             foreach ($routeNames as $routeName) {
                 //.
-                $path = $this->basePath("routes/{$routeName}.php");
+                $path = $this->basePath('routes'.DIRECTORY_SEPARATOR.$routeName.'.php');
                 if (! file_exists($path)) {
                     throw new \Exception("Route file {$routeName} does not exists!");
                 }
@@ -223,8 +223,11 @@ public function hasServiceProviders(array $serviceProviders): self
 
     public function basePath(string $directory = null): string
     {
+        $ds = DIRECTORY_SEPARATOR;
+
         return $directory === null
-            ? $this->basePath : "{$this->basePath}/" . ltrim($directory, '/');
+            ? $this->basePath
+            : $this->basePath.$ds . ltrim($directory, $ds);
     }
 
     public function setBasePath(string $path): self

src/Providers/ModuleServiceProvider.php

@@ -109,9 +109,11 @@ public function getModule(): Module
 
     protected function getModuleBaseDir(): string
     {
+        $ds = DIRECTORY_SEPARATOR;
         $reflector = new ReflectionClass(get_class($this));
+        $dirName = dirname($reflector->getFileName());
 
-        return str_replace('/src/Providers', '', dirname($reflector->getFileName()));
+        return str_replace($ds.'src'.$ds.'Providers', '', $dirName);
     }
 
     /**

src/Providers/PackageServiceProvider.php

@@ -8,7 +8,8 @@ class PackageServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        require_once __DIR__.'/../../src/helpers.php';
+        $ds = DIRECTORY_SEPARATOR;
+        require_once __DIR__.$ds.'..'.$ds.'..'.$ds.'src'.$ds.'helpers.php';
     }
 
     public function boot(): void

stubs/composer.json.stub

@@ -2,14 +2,14 @@
   "name": "modules/_MODULENAMESLUG_",
   "autoload": {
     "psr-4": {
-      "_MODULENAME_\\": "src/",
+      "_MODULENAME_\\": "src",
       "_MODULENAME_\\Database\\Factories\\": "database/factories",
       "_MODULENAME_\\Database\\Seeeders\\": "database/seeders"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "_MODULENAME_\\Tests\\": "tests/"
+      "_MODULENAME_\\Tests\\": "tests"
     }
   },
   "extra": {