Rename all models

2016-05-28 19:48:22 -04:00
parent 936376ffe7
commit 14713b0ec7
411 changed files with 4145 additions and 4156 deletions
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -27,60 +27,60 @@ class ClassProvider implements ServiceProviderInterface
            'AverageTimeSpentColumnAnalytic',
        ),
        'Model' => array(
-            'Action',
-            'ActionParameter',
-            'AvatarFile',
-            'Board',
-            'Category',
-            'Color',
-            'Column',
-            'Comment',
-            'Config',
-            'Currency',
-            'CustomFilter',
-            'Group',
-            'GroupMember',
-            'Language',
-            'LastLogin',
-            'Link',
-            'Notification',
-            'PasswordReset',
-            'Project',
-            'ProjectFile',
-            'ProjectActivity',
-            'ProjectDuplication',
-            'ProjectDailyColumnStats',
-            'ProjectDailyStats',
-            'ProjectPermission',
-            'ProjectNotification',
-            'ProjectMetadata',
-            'ProjectGroupRole',
-            'ProjectUserRole',
-            'RememberMeSession',
-            'Subtask',
-            'SubtaskTimeTracking',
-            'Swimlane',
-            'Task',
-            'TaskAnalytic',
-            'TaskCreation',
-            'TaskDuplication',
-            'TaskExternalLink',
-            'TaskFinder',
-            'TaskFile',
-            'TaskLink',
-            'TaskModification',
-            'TaskPosition',
-            'TaskStatus',
-            'TaskMetadata',
-            'Timezone',
-            'Transition',
-            'User',
-            'UserLocking',
-            'UserMention',
-            'UserNotification',
-            'UserNotificationFilter',
-            'UserUnreadNotification',
-            'UserMetadata',
+            'ActionModel',
+            'ActionParameterModel',
+            'AvatarFileModel',
+            'BoardModel',
+            'CategoryModel',
+            'ColorModel',
+            'ColumnModel',
+            'CommentModel',
+            'ConfigModel',
+            'CurrencyModel',
+            'CustomFilterModel',
+            'GroupModel',
+            'GroupMemberModel',
+            'LanguageModel',
+            'LastLoginModel',
+            'LinkModel',
+            'NotificationModel',
+            'PasswordResetModel',
+            'ProjectModel',
+            'ProjectFileModel',
+            'ProjectActivityModel',
+            'ProjectDuplicationModel',
+            'ProjectDailyColumnStatsModel',
+            'ProjectDailyStatsModel',
+            'ProjectPermissionModel',
+            'ProjectNotificationModel',
+            'ProjectMetadataModel',
+            'ProjectGroupRoleModel',
+            'ProjectUserRoleModel',
+            'RememberMeSessionModel',
+            'SubtaskModel',
+            'SubtaskTimeTrackingModel',
+            'SwimlaneModel',
+            'TaskModel',
+            'TaskAnalyticModel',
+            'TaskCreationModel',
+            'TaskDuplicationModel',
+            'TaskExternalLinkModel',
+            'TaskFinderModel',
+            'TaskFileModel',
+            'TaskLinkModel',
+            'TaskModificationModel',
+            'TaskPositionModel',
+            'TaskStatusModel',
+            'TaskMetadataModel',
+            'TimezoneModel',
+            'TransitionModel',
+            'UserModel',
+            'UserLockingModel',
+            'UserMentionModel',
+            'UserNotificationModel',
+            'UserNotificationFilterModel',
+            'UserUnreadNotificationModel',
+            'UserMetadataModel',
        ),
        'Validator' => array(
            'ActionValidator',
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -27,10 +27,10 @@ use Kanboard\Filter\TaskStatusFilter;
 use Kanboard\Filter\TaskSubtaskAssigneeFilter;
 use Kanboard\Filter\TaskSwimlaneFilter;
 use Kanboard\Filter\TaskTitleFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectGroupRole;
-use Kanboard\Model\ProjectUserRole;
-use Kanboard\Model\User;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectGroupRoleModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\UserModel;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;

@@ -61,7 +61,7 @@ class FilterProvider implements ServiceProviderInterface
    {
        $container['userQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(User::TABLE));
+            $builder->withQuery($c['db']->table(UserModel::TABLE));
            return $builder;
        });

@@ -72,26 +72,26 @@ class FilterProvider implements ServiceProviderInterface
    {
        $container['projectGroupRoleQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(ProjectGroupRole::TABLE));
+            $builder->withQuery($c['db']->table(ProjectGroupRoleModel::TABLE));
            return $builder;
        });

        $container['projectUserRoleQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(ProjectUserRole::TABLE));
+            $builder->withQuery($c['db']->table(ProjectUserRoleModel::TABLE));
            return $builder;
        });

        $container['projectQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(Project::TABLE));
+            $builder->withQuery($c['db']->table(ProjectModel::TABLE));
            return $builder;
        });

        $container['projectActivityLexer'] = $container->factory(function ($c) {
            $builder = new LexerBuilder();
            $builder
-                ->withQuery($c['projectActivity']->getQuery())
+                ->withQuery($c['projectActivityModel']->getQuery())
                ->withFilter(new ProjectActivityTaskTitleFilter(), true)
                ->withFilter(new ProjectActivityTaskStatusFilter())
                ->withFilter(new ProjectActivityProjectNameFilter())
@@ -108,7 +108,7 @@ class FilterProvider implements ServiceProviderInterface

        $container['projectActivityQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['projectActivity']->getQuery());
+            $builder->withQuery($c['projectActivityModel']->getQuery());

            return $builder;
        });
@@ -120,7 +120,7 @@ class FilterProvider implements ServiceProviderInterface
    {
        $container['taskQuery'] = $container->factory(function ($c) {
            $builder = new QueryBuilder();
-            $builder->withQuery($c['taskFinder']->getExtendedQuery());
+            $builder->withQuery($c['taskFinderModel']->getExtendedQuery());
            return $builder;
        });

@@ -128,13 +128,13 @@ class FilterProvider implements ServiceProviderInterface
            $builder = new LexerBuilder();

            $builder
-                ->withQuery($c['taskFinder']->getExtendedQuery())
+                ->withQuery($c['taskFinderModel']->getExtendedQuery())
                ->withFilter(TaskAssigneeFilter::getInstance()
                    ->setCurrentUserId($c['userSession']->getId())
                )
                ->withFilter(new TaskCategoryFilter())
                ->withFilter(TaskColorFilter::getInstance()
-                    ->setColorModel($c['color'])
+                    ->setColorModel($c['colorModel'])
                )
                ->withFilter(new TaskColumnFilter())
                ->withFilter(new TaskCommentFilter())
--- a/app/ServiceProvider/NotificationProvider.php
+++ b/app/ServiceProvider/NotificationProvider.php
@@ -4,8 +4,8 @@ namespace Kanboard\ServiceProvider;

 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Kanboard\Model\UserNotificationType;
-use Kanboard\Model\ProjectNotificationType;
+use Kanboard\Model\UserNotificationTypeModel;
+use Kanboard\Model\ProjectNotificationTypeModel;
 use Kanboard\Notification\MailNotification as MailNotification;
 use Kanboard\Notification\WebNotification as WebNotification;

@@ -26,15 +26,15 @@ class NotificationProvider implements ServiceProviderInterface
     */
    public function register(Container $container)
    {
-        $container['userNotificationType'] = function ($container) {
-            $type = new UserNotificationType($container);
+        $container['userNotificationTypeModel'] = function ($container) {
+            $type = new UserNotificationTypeModel($container);
            $type->setType(MailNotification::TYPE, t('Email'), '\Kanboard\Notification\MailNotification');
            $type->setType(WebNotification::TYPE, t('Web'), '\Kanboard\Notification\WebNotification');
            return $type;
        };

-        $container['projectNotificationType'] = function ($container) {
-            $type = new ProjectNotificationType($container);
+        $container['projectNotificationTypeModel'] = function ($container) {
+            $type = new ProjectNotificationTypeModel($container);
            $type->setType('webhook', 'Webhook', '\Kanboard\Notification\WebhookNotification', true);
            $type->setType('activity_stream', 'ActivityStream', '\Kanboard\Notification\ActivityStreamNotification', true);
            return $type;