Merge pull request #1 from sanderborgman/v1.1

V1.1
krzysztof-kabala · Feb 9, 2017 · 8578455 · 8578455
2 parents 8ad04b8 + aa23843
commit 8578455
Show file tree

Hide file tree

Showing 20 changed files with 583 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 5.4
+  - 5.6
 
 services:
   - mongodb

diff --git a/src/DI/Scaffolding.php b/src/DI/Scaffolding.php
@@ -76,6 +76,13 @@ class Scaffolding implements ScaffoldingInterface
      */
     protected $formName;
 
+    /**
+     * Query
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * {@inheritdoc}
      */
@@ -135,6 +142,15 @@ public function setModelName($name)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->adapter->setQuery($query);
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -194,7 +210,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/DI/Scaffolding/Adapter/Mongo.php b/src/DI/Scaffolding/Adapter/Mongo.php
@@ -38,6 +38,13 @@ class Mongo implements AdapterInterface, ScaffoldingAdapterInterface
      */
     protected $scaffolding;
 
+    /**
+     * Query for paginator
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Constructor
      * Verifies services required by Mongo
@@ -49,6 +56,16 @@ public function __construct()
         $this->setupExtraServices($di);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -69,6 +86,7 @@ public function retrieveOne($id)
     public function getPaginator($page = 1, $limit = 10)
     {
         return new PaginatorAdapterMongo(array(
+            'query' => $this->query,
             'model' => $this->scaffolding->getRecord(),
             'limit' => $limit,
             'page' => $page

diff --git a/src/DI/Scaffolding/Adapter/Mysql.php b/src/DI/Scaffolding/Adapter/Mysql.php
@@ -38,6 +38,13 @@ class Mysql implements AdapterInterface, ScaffoldingAdapterInterface
      */
     protected $scaffolding;
 
+    /**
+     * Query for paginator
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Constructor
      */
@@ -47,6 +54,16 @@ public function __construct()
         $this->verifyRequiredServices($di);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -71,7 +88,7 @@ public function getPaginator($page = 1, $limit = 10)
         $this->ensureScaffolding();
 
         return new PaginatorAdapterModel(array(
-            'data' => (object) call_user_func(array($this->scaffolding->getRecord(), 'find')),
+            'data' => call_user_func(array($this->scaffolding->getRecord(), 'find'), $this->query),
             'limit' => $limit,
             'page' => $page
         ));

diff --git a/src/DI/Scaffolding/AdapterInterface.php b/src/DI/Scaffolding/AdapterInterface.php
@@ -27,6 +27,14 @@ interface AdapterInterface
      */
     public function retrieveOne($id);
 
+    /**
+     * Sets query for the paginator
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function setQuery($query);
+
     /**
      * Retrieve list of records as paginator object.
      *

diff --git a/src/DI/ScaffoldingInterface.php b/src/DI/ScaffoldingInterface.php
@@ -57,6 +57,14 @@ public function getForm($entity = null);
      */
     public function setFormName($name);
 
+    /**
+     * Sets query for paginator
+     *
+     * @param $query
+     * @return mixed
+     */
+    public function setQuery($query);
+
     /**
      * Sets model name
      *

diff --git a/src/Mvc/Controller/CrudAbstract.php b/src/Mvc/Controller/CrudAbstract.php
@@ -77,6 +77,13 @@ public function initialize()
      */
     protected $modelName;
 
+    /**
+     * Query that will be used in index action
+     *
+     * @var array
+     */
+    protected $query = [];
+
     /**
      * Array of fields names that will be used in index action
      *
@@ -104,6 +111,7 @@ protected function initializeScaffolding()
 
         $this->scaffolding->setModelName($this->modelName);
         $this->scaffolding->setFormName($this->formName);
+        $this->scaffolding->setQuery($this->query);
     }
 
     /**

diff --git a/src/Mvc/Dispatcher/ExceptionResolver.php b/src/Mvc/Dispatcher/ExceptionResolver.php
@@ -41,6 +41,16 @@ public function resolve(\Exception $exception)
             throw $exception;
         }
 
+        error_log(
+            sprintf(
+                'Vegas %d error: %s in %s on line %d',
+                $exception->getCode(),
+                $exception->getMessage(),
+                $exception->getFile(),
+                $exception->getLine()
+            ),
+            0
+        );
         $error = $this->prepareLiveEnvException($exception);
 
         try {

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
      *