Merge pull request #24 from tattersoftware/source

Vendor Path

Author: MGatner

Diff for: src/FrontendPublisher.php

@@ -15,22 +15,32 @@
  */
 abstract class FrontendPublisher extends Publisher
 {
+    /**
+     * Destination path relative to vendor/ directory.
+     * Must be set by child classes.
+     */
+    protected string $vendorPath = '';
+
     /**
      * Destination path relative to AssetsConfig::directory.
      * Must be set by child classes.
      */
-    protected string $path = '';
+    protected string $publicPath = '';
 
     /**
      * Set the real destination.
      */
     public function __construct(?string $source = null, ?string $destination = null)
     {
-        if ($this->path === '') {
-            throw new DomainException('Invalid relative destination $path.');
+        if ($this->vendorPath === '') {
+            throw new DomainException('Invalid relative source path.');
+        }
+        if ($this->publicPath === '') {
+            throw new DomainException('Invalid relative destination path.');
         }
 
-        $this->destination = FrontendBundle::base() . ltrim($this->path, '\\/');
+        $this->source      = dirname(COMPOSER_PATH) . '/' . ltrim($this->vendorPath, '\\/');
+        $this->destination = FrontendBundle::base() . ltrim($this->publicPath, '\\/');
 
         if (! is_dir($this->destination)) {
             mkdir($this->destination, 0775, true);

Diff for: src/Publishers/AdminLTEPublisher.php

@@ -6,6 +6,6 @@
 
 class AdminLTEPublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/almasaeed2010/adminlte/dist';
-    protected string $path = 'adminlte';
+    protected string $vendorPath = 'almasaeed2010/adminlte/dist';
+    protected string $publicPath = 'adminlte';
 }

Diff for: src/Publishers/BootstrapPublisher.php

@@ -6,6 +6,6 @@
 
 class BootstrapPublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/twbs/bootstrap/dist';
-    protected string $path = 'bootstrap';
+    protected string $vendorPath = 'twbs/bootstrap/dist';
+    protected string $publicPath = 'bootstrap';
 }

Diff for: src/Publishers/DataTablesPublisher.php

@@ -6,8 +6,8 @@
 
 class DataTablesPublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/datatables.net/datatables.net';
-    protected string $path = 'datatables';
+    protected string $vendorPath = 'datatables.net/datatables.net';
+    protected string $publicPath = 'datatables';
 
     /**
      * Reads files from the sources and copies them out to their destinations.

Diff for: src/Publishers/DataTablesStylePublisher.php

@@ -6,8 +6,8 @@
 
 class DataTablesStylePublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/datatables.net/datatables.net-bs4';
-    protected string $path = 'datatables';
+    protected string $vendorPath = 'datatables.net/datatables.net-bs4';
+    protected string $publicPath = 'datatables';
 
     /**
      * Reads files from the sources and copies them out to their destinations.

Diff for: src/Publishers/FontAwesomePublisher.php

@@ -6,8 +6,8 @@
 
 class FontAwesomePublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/fortawesome/font-awesome';
-    protected string $path = 'font-awesome';
+    protected string $vendorPath = 'fortawesome/font-awesome';
+    protected string $publicPath = 'font-awesome';
 
     /**
      * Reads files from the sources and copies them out to their destinations.

Diff for: src/Publishers/JQueryPublisher.php

@@ -6,6 +6,6 @@
 
 class JQueryPublisher extends FrontendPublisher
 {
-    protected $source      = 'vendor/components/jquery';
-    protected string $path = 'jquery';
+    protected string $vendorPath = 'components/jquery';
+    protected string $publicPath = 'jquery';
 }

Diff for: tests/FrontendPublisherTest.php

@@ -11,12 +11,23 @@ final class FrontendPublisherTest extends CIUnitTestCase
 {
     use AssetsTestTrait;
 
+    public function testPublisherThrowsWithoutSourcePath()
+    {
+        $this->expectException('DomainException');
+        $this->expectExceptionMessage('Invalid relative source path');
+
+        new class () extends FrontendPublisher {
+            protected string $publicPath = 'adminlte';
+        };
+    }
+
     public function testPublisherThrowsWithoutPath()
     {
         $this->expectException('DomainException');
-        $this->expectExceptionMessage('Invalid relative destination $path');
+        $this->expectExceptionMessage('Invalid relative destination path');
 
         new class () extends FrontendPublisher {
+            protected string $vendorPath = 'almasaeed2010/adminlte/dist';
         };
     }
 
@@ -25,8 +36,9 @@ public function testPublisherSetsDestination()
         // Allow publishing to the test folder
         config('Publisher')->restrictions[SUPPORTPATH] = '*';
 
-        $publisher                 = new class () extends FrontendPublisher {
-            protected string $path = 'foobar';
+        $publisher                       = new class () extends FrontendPublisher {
+            protected string $publicPath = 'foobar';
+            protected string $vendorPath = 'almasaeed2010/adminlte/dist';
         };
 
         $this->assertSame($this->assets->directory . 'vendor/foobar/', $publisher->getDestination());