Remove hardcoded UNIX dir separators.

zachleigh · Jun 1, 2017 · 92609ba · 92609ba
1 parent 7171c0c
commit 92609ba
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/src/Bundle/BundleMap.php b/src/Bundle/BundleMap.php
@@ -131,7 +131,7 @@ protected function getPathCollection()
      */
     protected function getPathKeys($path)
     {
-        $key = str_replace('.php', '', explode('/bundles/', $path)[1]);
+        $key = str_replace('.php', '', explode(DIRECTORY_SEPARATOR.'bundles'.DIRECTORY_SEPARATOR, $path)[1]);
 
         return explode('/', $key);
     }

diff --git a/src/Commands/LaravelLangBundlerCommand.php b/src/Commands/LaravelLangBundlerCommand.php
@@ -33,7 +33,7 @@ protected function setUp()
     protected function buildPath($pathArray, $path)
     {
         foreach ($pathArray as $directory) {
-            $path .= $directory.'/';
+            $path .= $directory.DIRECTORY_SEPARATOR;
 
             if (!$this->filesystem->exists($path)) {
                 $this->filesystem->makeDirectory($path);

diff --git a/src/Commands/MakeBundleMod.php b/src/Commands/MakeBundleMod.php
@@ -29,7 +29,7 @@ public function handle()
 
         $pathArray = ['LangBundler', 'Mods'];
 
-        $basePath = app_path().'/';
+        $basePath = app_path().DIRECTORY_SEPARATOR;
 
         $this->buildPath($pathArray, $basePath);
 
@@ -38,7 +38,7 @@ public function handle()
         $stub = $this->getStub($name);
 
         $this->filesystem->put(
-            app_path(implode('/', $pathArray).'/'.$name.'.php'),
+            app_path(implode(DIRECTORY_SEPARATOR, $pathArray).DIRECTORY_SEPARATOR.$name.'.php'),
             $stub
         );
 
@@ -58,7 +58,8 @@ protected function getStub($name)
 
         $namespace = $namespace.'LangBundler\\Mods';
 
-        $stub = $this->filesystem->get(__DIR__.'/../BundleItems/ModStub.php');
+        $stub = $this->filesystem->get(
+            dirname(__DIR__).DIRECTORY_SEPARATOR.'BundleItems'.DIRECTORY_SEPARATOR.'ModStub.php');
 
         $stub = str_replace(
             'LaravelLangBundler\BundleItems',

diff --git a/src/Commands/MakeBundlesFolder.php b/src/Commands/MakeBundlesFolder.php
@@ -25,7 +25,7 @@ public function handle()
     {
         $this->setUp();
 
-        $directory = resource_path('lang/bundles');
+        $directory = resource_path('lang'.DIRECTORY_SEPARATOR.'bundles');
 
         if (!$this->filesystem->exists($directory)) {
             $this->filesystem->makeDirectory($directory);

diff --git a/src/Commands/MakeNewBundleFile.php b/src/Commands/MakeNewBundleFile.php
@@ -31,7 +31,7 @@ public function handle()
 
         $pathArray->prepend('bundles');
 
-        $basePath = resource_path('lang/');
+        $basePath = resource_path('lang'.DIRECTORY_SEPARATOR);
 
         $path = $this->buildPath($pathArray->all(), $basePath);
 
@@ -50,7 +50,7 @@ protected function createFile($path, $filename)
     {
         $filePath = $path.$filename;
 
-        $stub = __DIR__.'/bundle-file-stub.php';
+        $stub = __DIR__.DIRECTORY_SEPARATOR.'bundle-file-stub.php';
 
         if (!$this->filesystem->exists($filePath)) {
             $this->filesystem->copy($stub, $filePath);

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -35,7 +35,7 @@ public function register()
     public function boot()
     {
         $this->publishes([
-            __DIR__.'/config.php' => config_path('lang-bundler.php'),
+            __DIR__.DIRECTORY_SEPARATOR.'config.php' => config_path('lang-bundler.php'),
         ], 'config');
     }