Template helpers refactoring

2 files changed, 72 insertions, 63 deletions

diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
new file mode 100644
index 00000000..02e5004e
--- /dev/null
+++ b/app/ServiceProvider/ClassProvider.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace ServiceProvider;
+
+use Model\Config;
+use Model\Project;
+use Model\Webhook;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class ClassProvider implements ServiceProviderInterface
+{
+    private $classes = array(
+        'Model' => array(
+            'Acl',
+            'Action',
+            'Authentication',
+            'Board',
+            'Category',
+            'Color',
+            'Comment',
+            'Config',
+            'DateParser',
+            'File',
+            'GithubWebhook',
+            'LastLogin',
+            'Notification',
+            'Project',
+            'ProjectActivity',
+            'ProjectAnalytics',
+            'ProjectDailySummary',
+            'ProjectPaginator',
+            'ProjectPermission',
+            'SubTask',
+            'SubtaskPaginator',
+            'Swimlane',
+            'Task',
+            'TaskCreation',
+            'TaskDuplication',
+            'TaskExport',
+            'TaskFinder',
+            'TaskModification',
+            'TaskPaginator',
+            'TaskPermission',
+            'TaskPosition',
+            'TaskStatus',
+            'TaskValidator',
+            'TimeTracking',
+            'User',
+            'Webhook',
+        ),
+        'Core' => array(
+            'Template',
+            'Session',
+        ),
+    );
+
+    public function register(Container $container)
+    {
+        foreach ($this->classes as $namespace => $classes) {
+
+            foreach ($classes as $name) {
+
+                $class = '\\'.$namespace.'\\'.$name;
+
+                $container[lcfirst($name)] = function ($c) use ($class) {
+                    return new $class($c);
+                };
+            }
+        }
+    }
+}
diff --git a/app/ServiceProvider/ModelProvider.php b/app/ServiceProvider/ModelProvider.php
deleted file mode 100644
index 1a940058..00000000
--- a/app/ServiceProvider/ModelProvider.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace ServiceProvider;
-
-use Model\Config;
-use Model\Project;
-use Model\Webhook;
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-
-class ModelProvider implements ServiceProviderInterface
-{
-    private $models = array(
-        'Acl',
-        'Action',
-        'Authentication',
-        'Board',
-        'Category',
-        'Color',
-        'Comment',
-        'Config',
-        'DateParser',
-        'File',
-        'GithubWebhook',
-        'LastLogin',
-        'Notification',
-        'Project',
-        'ProjectActivity',
-        'ProjectAnalytics',
-        'ProjectDailySummary',
-        'ProjectPaginator',
-        'ProjectPermission',
-        'SubTask',
-        'SubtaskPaginator',
-        'Swimlane',
-        'Task',
-        'TaskCreation',
-        'TaskDuplication',
-        'TaskExport',
-        'TaskFinder',
-        'TaskModification',
-        'TaskPaginator',
-        'TaskPermission',
-        'TaskPosition',
-        'TaskStatus',
-        'TaskValidator',
-        'TimeTracking',
-        'User',
-        'Webhook',
-    );
-
-    public function register(Container $container)
-    {
-        foreach ($this->models as $model) {
-
-            $class = '\Model\\'.$model;
-
-            $container[lcfirst($model)] = function ($c) use ($class) {
-                return new $class($c);
-            };
-        }
-    }
-}