Merge pull request #47 from sanderborgman/master

Copy vendor module assets & Scaffolding fix
vegas-cmf · Jun 22, 2015 · 4c5b9ae · 4c5b9ae
2 parents d858d3b + 293ba4a
commit 4c5b9ae
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/DI/Scaffolding.php b/src/DI/Scaffolding.php
@@ -194,7 +194,7 @@ public function doDelete($id)
      */
     private function processForm($values)
     {
-        $form = $this->getForm();
+        $form = $this->getForm($this->record);
         $form->bind($values, $this->record);
 
         if ($form->isValid()) {

diff --git a/src/Mvc/Module/Loader.php b/src/Mvc/Module/Loader.php
@@ -100,7 +100,7 @@ public function dump($inputDirectory, $outputDirectory, $dumpVendorModules = tru
      * @param $modulesList
      * @return mixed
      */
-    private function dumpModulesFromVendor(array &$modulesList)
+    public function dumpModulesFromVendor(array &$modulesList)
     {
         if (!file_exists(APP_ROOT.'/composer.json')) {
             return $modulesList;

diff --git a/src/Task/AssetsTask.php b/src/Task/AssetsTask.php
@@ -16,6 +16,7 @@
 use Vegas\Cli\Task\Option;
 use Vegas\Cli\Task;
 use Vegas\Cli\TaskAbstract;
+use Vegas\Mvc\Module\Loader;
 
 /**
  * Class AssetsTask
@@ -28,16 +29,20 @@ class AssetsTask extends TaskAbstract
      */
     public function publishAction()
     {
-        $this->putText("Copying assets...");
-        $this->copyAllAssets();
+        $this->putText("Copying Vegas CMF assets...");
+        $this->copyCmfAssets();
+
+        $this->putText("Copying vendor assets:");
+        $this->copyVendorAssets();
+
         $this->putSuccess("Done.");
     }
 
     /**
      * Copies all assets from vegas-cmf libraries
      * @internal
      */
-    private function copyAllAssets()
+    private function copyCmfAssets()
     {
         $vegasCmfPath = APP_ROOT . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'vegas-cmf';
         $publicAssetsDir = $this->getOption('d', APP_ROOT.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'assets');
@@ -59,6 +64,32 @@ private function copyAllAssets()
         }
     }
 
+    /**
+     * Copies all assets vendor modules
+     * @internal
+     */
+    private function copyVendorAssets()
+    {
+        $modules = [];
+        $moduleLoader = new Loader($this->di);
+        $moduleLoader->dumpModulesFromVendor($modules);
+
+        $publicAssetsDir = $this->getOption('d', APP_ROOT.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'assets');
+
+
+        if ($modules) {
+            foreach ($modules as $moduleName => $module) {
+                $assetsDir = dirname($module['path']) . '/../assets';
+
+                if (file_exists($assetsDir)) {
+                    $this->putText("- " . $moduleName . "...");
+
+                    $this->copyRecursive($assetsDir, $publicAssetsDir);
+                }
+            }
+        }
+    }
+
     /**
      * Copies assets recursively
      *