AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename all models

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-28 19:48:22 -04:00
parent 936376ffe7
commit 14713b0ec7
411 changed files with 4145 additions and 4156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Subscriber/AuthSubscriber.php
View File

@@ -45,9 +45,9 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface
$userAgent = $this->request->getUserAgent();
$ipAddress = $this->request->getIpAddress();
$this->userLocking->resetFailedLogin($this->userSession->getUsername());
$this->userLockingModel->resetFailedLogin($this->userSession->getUsername());
$this->lastLogin->create(
$this->lastLoginModel->create(
$event->getAuthType(),
$this->userSession->getId(),
$ipAddress,
@@ -59,7 +59,7 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface
}
if (isset($this->sessionStorage->hasRememberMe) && $this->sessionStorage->hasRememberMe) {
$session = $this->rememberMeSession->create($this->userSession->getId(), $ipAddress, $userAgent);
$session = $this->rememberMeSessionModel->create($this->userSession->getId(), $ipAddress, $userAgent);
$this->rememberMeCookie->write($session['token'], $session['sequence'], $session['expiration']);
}
}
@@ -75,10 +75,10 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface
$credentials = $this->rememberMeCookie->read();
if ($credentials !== false) {
$session = $this->rememberMeSession->find($credentials['token'], $credentials['sequence']);
$session = $this->rememberMeSessionModel->find($credentials['token'], $credentials['sequence']);
if (! empty($session)) {
$this->rememberMeSession->remove($session['id']);
$this->rememberMeSessionModel->remove($session['id']);
}
$this->rememberMeCookie->remove();
@@ -97,10 +97,10 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface
$username = $event->getUsername();
if (! empty($username)) {
$this->userLocking->incrementFailedLogin($username);
$this->userLockingModel->incrementFailedLogin($username);
if ($this->userLocking->getFailedLogin($username) > BRUTEFORCE_LOCKDOWN) {
$this->userLocking->lock($username, BRUTEFORCE_LOCKDOWN_DURATION);
if ($this->userLockingModel->getFailedLogin($username) > BRUTEFORCE_LOCKDOWN) {
$this->userLockingModel->lock($username, BRUTEFORCE_LOCKDOWN_DURATION);
}
}
}

6
app/Subscriber/BootstrapSubscriber.php
View File

@@ -16,12 +16,12 @@ class BootstrapSubscriber extends BaseSubscriber implements EventSubscriberInter
public function execute()
{
$this->logger->debug('Subscriber executed: '.__METHOD__);
$this->language->loadCurrentLanguage();
$this->timezone->setCurrentTimezone();
$this->languageModel->loadCurrentLanguage();
$this->timezoneModel->setCurrentTimezone();
$this->actionManager->attachEvents();
if ($this->userSession->isLogged()) {
$this->sessionStorage->hasSubtaskInProgress = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
$this->sessionStorage->hasSubtaskInProgress = $this->subtaskModel->hasSubtaskInProgress($this->userSession->getId());
}
}

2
app/Subscriber/LdapUserPhotoSubscriber.php
View File

@@ -42,7 +42,7 @@ class LdapUserPhotoSubscriber extends BaseSubscriber implements EventSubscriberI
if (empty($profile['avatar_path']) && ! empty($photo)) {
$this->logger->info('Saving user photo from LDAP profile');
$this->avatarFile->uploadImageContent($profile['id'], $photo);
$this->avatarFileModel->uploadImageContent($profile['id'], $photo);
}
}
}

38
app/Subscriber/NotificationSubscriber.php
View File

@@ -4,10 +4,10 @@ namespace Kanboard\Subscriber;
use Kanboard\Event\GenericEvent;
use Kanboard\Job\NotificationJob;
use Kanboard\Model\Task;
use Kanboard\Model\Comment;
use Kanboard\Model\Subtask;
use Kanboard\Model\TaskFile;
use Kanboard\Model\TaskModel;
use Kanboard\Model\CommentModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\TaskFileModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class NotificationSubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -15,21 +15,21 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn
public static function getSubscribedEvents()
{
return array(
Task::EVENT_USER_MENTION => 'handleEvent',
Task::EVENT_CREATE => 'handleEvent',
Task::EVENT_UPDATE => 'handleEvent',
Task::EVENT_CLOSE => 'handleEvent',
Task::EVENT_OPEN => 'handleEvent',
Task::EVENT_MOVE_COLUMN => 'handleEvent',
Task::EVENT_MOVE_POSITION => 'handleEvent',
Task::EVENT_MOVE_SWIMLANE => 'handleEvent',
Task::EVENT_ASSIGNEE_CHANGE => 'handleEvent',
Subtask::EVENT_CREATE => 'handleEvent',
Subtask::EVENT_UPDATE => 'handleEvent',
Comment::EVENT_CREATE => 'handleEvent',
Comment::EVENT_UPDATE => 'handleEvent',
Comment::EVENT_USER_MENTION => 'handleEvent',
TaskFile::EVENT_CREATE => 'handleEvent',
TaskModel::EVENT_USER_MENTION => 'handleEvent',
TaskModel::EVENT_CREATE => 'handleEvent',
TaskModel::EVENT_UPDATE => 'handleEvent',
TaskModel::EVENT_CLOSE => 'handleEvent',
TaskModel::EVENT_OPEN => 'handleEvent',
TaskModel::EVENT_MOVE_COLUMN => 'handleEvent',
TaskModel::EVENT_MOVE_POSITION => 'handleEvent',
TaskModel::EVENT_MOVE_SWIMLANE => 'handleEvent',
TaskModel::EVENT_ASSIGNEE_CHANGE => 'handleEvent',
SubtaskModel::EVENT_CREATE => 'handleEvent',
SubtaskModel::EVENT_UPDATE => 'handleEvent',
CommentModel::EVENT_CREATE => 'handleEvent',
CommentModel::EVENT_UPDATE => 'handleEvent',
CommentModel::EVENT_USER_MENTION => 'handleEvent',
TaskFileModel::EVENT_CREATE => 'handleEvent',
);
}

12
app/Subscriber/ProjectDailySummarySubscriber.php
View File

@@ -4,7 +4,7 @@ namespace Kanboard\Subscriber;
use Kanboard\Event\TaskEvent;
use Kanboard\Job\ProjectMetricJob;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -12,11 +12,11 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc
public static function getSubscribedEvents()
{
return array(
Task::EVENT_CREATE_UPDATE => 'execute',
Task::EVENT_CLOSE => 'execute',
Task::EVENT_OPEN => 'execute',
Task::EVENT_MOVE_COLUMN => 'execute',
Task::EVENT_MOVE_SWIMLANE => 'execute',
TaskModel::EVENT_CREATE_UPDATE => 'execute',
TaskModel::EVENT_CLOSE => 'execute',
TaskModel::EVENT_OPEN => 'execute',
TaskModel::EVENT_MOVE_COLUMN => 'execute',
TaskModel::EVENT_MOVE_SWIMLANE => 'execute',
);
}

20
app/Subscriber/ProjectModificationDateSubscriber.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Subscriber;
use Kanboard\Event\GenericEvent;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class ProjectModificationDateSubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -11,14 +11,14 @@ class ProjectModificationDateSubscriber extends BaseSubscriber implements EventS
public static function getSubscribedEvents()
{
return array(
Task::EVENT_CREATE_UPDATE => 'execute',
Task::EVENT_CLOSE => 'execute',
Task::EVENT_OPEN => 'execute',
Task::EVENT_MOVE_SWIMLANE => 'execute',
Task::EVENT_MOVE_COLUMN => 'execute',
Task::EVENT_MOVE_POSITION => 'execute',
Task::EVENT_MOVE_PROJECT => 'execute',
Task::EVENT_ASSIGNEE_CHANGE => 'execute',
TaskModel::EVENT_CREATE_UPDATE => 'execute',
TaskModel::EVENT_CLOSE => 'execute',
TaskModel::EVENT_OPEN => 'execute',
TaskModel::EVENT_MOVE_SWIMLANE => 'execute',
TaskModel::EVENT_MOVE_COLUMN => 'execute',
TaskModel::EVENT_MOVE_POSITION => 'execute',
TaskModel::EVENT_MOVE_PROJECT => 'execute',
TaskModel::EVENT_ASSIGNEE_CHANGE => 'execute',
);
}
@@ -26,7 +26,7 @@ class ProjectModificationDateSubscriber extends BaseSubscriber implements EventS
{
if (isset($event['project_id']) && !$this->isExecuted()) {
$this->logger->debug('Subscriber executed: '.__METHOD__);
$this->project->updateModificationDate($event['project_id']);
$this->projectModel->updateModificationDate($event['project_id']);
}
}
}

20
app/Subscriber/RecurringTaskSubscriber.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Subscriber;
use Kanboard\Event\TaskEvent;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -11,8 +11,8 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
public static function getSubscribedEvents()
{
return array(
Task::EVENT_MOVE_COLUMN => 'onMove',
Task::EVENT_CLOSE => 'onClose',
TaskModel::EVENT_MOVE_COLUMN => 'onMove',
TaskModel::EVENT_CLOSE => 'onClose',
);
}
@@ -20,11 +20,11 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
{
$this->logger->debug('Subscriber executed: '.__METHOD__);
if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING) {
if ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_FIRST_COLUMN && $this->column->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
$this->taskDuplication->duplicateRecurringTask($event['task_id']);
} elseif ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_LAST_COLUMN && $this->column->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
$this->taskDuplication->duplicateRecurringTask($event['task_id']);
if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
if ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
} elseif ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
}
}
}
@@ -33,8 +33,8 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
{
$this->logger->debug('Subscriber executed: '.__METHOD__);
if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == Task::RECURRING_TRIGGER_CLOSE) {
$this->taskDuplication->duplicateRecurringTask($event['task_id']);
if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
}
}
}

20
app/Subscriber/SubtaskTimeTrackingSubscriber.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Subscriber;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Kanboard\Model\Subtask;
use Kanboard\Model\SubtaskModel;
use Kanboard\Event\SubtaskEvent;
class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -11,9 +11,9 @@ class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubsc
public static function getSubscribedEvents()
{
return array(
Subtask::EVENT_CREATE => 'updateTaskTime',
Subtask::EVENT_DELETE => 'updateTaskTime',
Subtask::EVENT_UPDATE => array(
SubtaskModel::EVENT_CREATE => 'updateTaskTime',
SubtaskModel::EVENT_DELETE => 'updateTaskTime',
SubtaskModel::EVENT_UPDATE => array(
array('logStartEnd', 10),
array('updateTaskTime', 0),
)
@@ -24,24 +24,24 @@ class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubsc
{
if (isset($event['task_id'])) {
$this->logger->debug('Subscriber executed: '.__METHOD__);
$this->subtaskTimeTracking->updateTaskTimeTracking($event['task_id']);
$this->subtaskTimeTrackingModel->updateTaskTimeTracking($event['task_id']);
}
}
public function logStartEnd(SubtaskEvent $event)
{
if (isset($event['status']) && $this->config->get('subtask_time_tracking') == 1) {
if (isset($event['status']) && $this->configModel->get('subtask_time_tracking') == 1) {
$this->logger->debug('Subscriber executed: '.__METHOD__);
$subtask = $this->subtask->getById($event['id']);
$subtask = $this->subtaskModel->getById($event['id']);
if (empty($subtask['user_id'])) {
return false;
}
if ($subtask['status'] == Subtask::STATUS_INPROGRESS) {
return $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
if ($subtask['status'] == SubtaskModel::STATUS_INPROGRESS) {
return $this->subtaskTimeTrackingModel->logStartTime($subtask['id'], $subtask['user_id']);
} else {
return $this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']);
return $this->subtaskTimeTrackingModel->logEndTime($subtask['id'], $subtask['user_id']);
}
}
}

6
app/Subscriber/TransitionSubscriber.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Subscriber;
use Kanboard\Event\TaskEvent;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInterface
@@ -11,7 +11,7 @@ class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInte
public static function getSubscribedEvents()
{
return array(
Task::EVENT_MOVE_COLUMN => 'execute',
TaskModel::EVENT_MOVE_COLUMN => 'execute',
);
}
@@ -22,7 +22,7 @@ class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInte
$user_id = $this->userSession->getId();
if (! empty($user_id)) {
$this->transition->save($user_id, $event->getAll());
$this->transitionModel->save($user_id, $event->getAll());
}
}
}