Merge pull request #38 from tattersoftware/devendor

Remove Vendor
tattersoftware · Dec 10, 2021 · d0099ce · d0099ce
2 parents 1bd1348 + bd8f648
commit d0099ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 134 deletions.
diff --git a/src/Asset.php b/src/Asset.php
@@ -60,9 +60,9 @@ public static function config(): AssetsConfig
             self::$config = config(AssetsConfig::class);
 
             // Standardize formats
-            self::$config->uri       = rtrim(self::$config->uri, '/') . '/';
-            self::$config->directory = rtrim(self::$config->directory, '/') . '/';
-            self::$config->vendor    = rtrim(self::$config->vendor, '/') . '/';
+            self::$config->uri       = rtrim(self::$config->uri, '/\\') . DIRECTORY_SEPARATOR;
+            self::$config->directory = rtrim(self::$config->directory, '/\\') . DIRECTORY_SEPARATOR;
+            self::$config->vendor    = rtrim(self::$config->vendor, '/\\') . DIRECTORY_SEPARATOR;
         }
 
         return self::$config;
@@ -90,7 +90,7 @@ public static function useConfig(?AssetsConfig $config)
     public static function createFromPath(string $path): self
     {
         $config = self::config();
-        $path   = ltrim($path, '/');
+        $path   = ltrim($path, '/\\');
         $file   = new File($config->directory . $path, true);
 
         // Build the URI

diff --git a/src/VendorBundle.php b/src/VendorBundle.php
diff --git a/src/VendorPublisher.php b/src/VendorPublisher.php
diff --git a/tests/VendorTest.php b/tests/VendorTest.php