Merge https://github.com/kanboard/kanboard

1 files changed, 32 insertions, 5 deletions

diff --git a/app/Core/Base.php b/app/Core/Base.php
index 7b4462e2..68604785 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -35,8 +35,12 @@ use Pimple\Container;
  * @property \Kanboard\Core\Security\AuthenticationManager       $authenticationManager
  * @property \Kanboard\Core\Security\AccessMap                   $applicationAccessMap
  * @property \Kanboard\Core\Security\AccessMap                   $projectAccessMap
+ * @property \Kanboard\Core\Security\AccessMap                   $apiAccessMap
+ * @property \Kanboard\Core\Security\AccessMap                   $apiProjectAccessMap
  * @property \Kanboard\Core\Security\Authorization               $applicationAuthorization
  * @property \Kanboard\Core\Security\Authorization               $projectAuthorization
+ * @property \Kanboard\Core\Security\Authorization               $apiAuthorization
+ * @property \Kanboard\Core\Security\Authorization               $apiProjectAuthorization
  * @property \Kanboard\Core\Security\Role                        $role
  * @property \Kanboard\Core\Security\Token                       $token
  * @property \Kanboard\Core\Session\FlashMessage                 $flash
@@ -82,20 +86,31 @@ use Pimple\Container;
  * @property \Kanboard\Model\ProjectGroupRoleModel               $projectGroupRoleModel
  * @property \Kanboard\Model\ProjectNotificationModel            $projectNotificationModel
  * @property \Kanboard\Model\ProjectNotificationTypeModel        $projectNotificationTypeModel
+ * @property \Kanboard\Model\ProjectTaskDuplicationModel         $projectTaskDuplicationModel
+ * @property \Kanboard\Model\ProjectTaskPriorityModel            $projectTaskPriorityModel
  * @property \Kanboard\Model\RememberMeSessionModel              $rememberMeSessionModel
  * @property \Kanboard\Model\SubtaskModel                        $subtaskModel
+ * @property \Kanboard\Model\SubtaskPositionModel                $subtaskPositionModel
+ * @property \Kanboard\Model\SubtaskStatusModel                  $subtaskStatusModel
+ * @property \Kanboard\Model\SubtaskTaskConversionModel          $subtaskTaskConversionModel
  * @property \Kanboard\Model\SubtaskTimeTrackingModel            $subtaskTimeTrackingModel
  * @property \Kanboard\Model\SwimlaneModel                       $swimlaneModel
+ * @property \Kanboard\Model\TagDuplicationModel                 $tagDuplicationModel
+ * @property \Kanboard\Model\TagModel                            $tagModel
  * @property \Kanboard\Model\TaskModel                           $taskModel
  * @property \Kanboard\Model\TaskAnalyticModel                   $taskAnalyticModel
  * @property \Kanboard\Model\TaskCreationModel                   $taskCreationModel
  * @property \Kanboard\Model\TaskDuplicationModel                $taskDuplicationModel
+ * @property \Kanboard\Model\TaskProjectDuplicationModel         $taskProjectDuplicationModel
+ * @property \Kanboard\Model\TaskProjectMoveModel                $taskProjectMoveModel
+ * @property \Kanboard\Model\TaskRecurrenceModel                 $taskRecurrenceModel
  * @property \Kanboard\Model\TaskExternalLinkModel               $taskExternalLinkModel
  * @property \Kanboard\Model\TaskFinderModel                     $taskFinderModel
  * @property \Kanboard\Model\TaskLinkModel                       $taskLinkModel
  * @property \Kanboard\Model\TaskModificationModel               $taskModificationModel
  * @property \Kanboard\Model\TaskPositionModel                   $taskPositionModel
  * @property \Kanboard\Model\TaskStatusModel                     $taskStatusModel
+ * @property \Kanboard\Model\TaskTagModel                        $taskTagModel
  * @property \Kanboard\Model\TaskMetadataModel                   $taskMetadataModel
  * @property \Kanboard\Model\TimezoneModel                       $timezoneModel
  * @property \Kanboard\Model\TransitionModel                     $transitionModel
@@ -107,6 +122,10 @@ use Pimple\Container;
  * @property \Kanboard\Model\UserNotificationFilterModel         $userNotificationFilterModel
  * @property \Kanboard\Model\UserUnreadNotificationModel         $userUnreadNotificationModel
  * @property \Kanboard\Model\UserMetadataModel                   $userMetadataModel
+ * @property \Kanboard\Pagination\TaskPagination                 $taskPagination
+ * @property \Kanboard\Pagination\SubtaskPagination              $subtaskPagination
+ * @property \Kanboard\Pagination\ProjectPagination              $projectPagination
+ * @property \Kanboard\Pagination\UserPagination                 $userPagination
  * @property \Kanboard\Validator\ActionValidator                 $actionValidator
  * @property \Kanboard\Validator\AuthValidator                   $authValidator
  * @property \Kanboard\Validator\ColumnValidator                 $columnValidator
@@ -114,14 +133,15 @@ use Pimple\Container;
  * @property \Kanboard\Validator\CommentValidator                $commentValidator
  * @property \Kanboard\Validator\CurrencyValidator               $currencyValidator
  * @property \Kanboard\Validator\CustomFilterValidator           $customFilterValidator
+ * @property \Kanboard\Validator\ExternalLinkValidator           $externalLinkValidator
  * @property \Kanboard\Validator\GroupValidator                  $groupValidator
  * @property \Kanboard\Validator\LinkValidator                   $linkValidator
  * @property \Kanboard\Validator\PasswordResetValidator          $passwordResetValidator
  * @property \Kanboard\Validator\ProjectValidator                $projectValidator
  * @property \Kanboard\Validator\SubtaskValidator                $subtaskValidator
  * @property \Kanboard\Validator\SwimlaneValidator               $swimlaneValidator
+ * @property \Kanboard\Validator\TagValidator                    $tagValidator
  * @property \Kanboard\Validator\TaskLinkValidator               $taskLinkValidator
- * @property \Kanboard\Validator\ExternalLinkValidator           $externalLinkValidator
  * @property \Kanboard\Validator\TaskValidator                   $taskValidator
  * @property \Kanboard\Validator\UserValidator                   $userValidator
  * @property \Kanboard\Import\TaskImport                         $taskImport
@@ -137,6 +157,14 @@ use Pimple\Container;
  * @property \Kanboard\Core\Filter\QueryBuilder                  $taskQuery
  * @property \Kanboard\Core\Filter\LexerBuilder                  $taskLexer
  * @property \Kanboard\Core\Filter\LexerBuilder                  $projectActivityLexer
+ * @property \Kanboard\Job\CommentEventJob                       $commentEventJob
+ * @property \Kanboard\Job\SubtaskEventJob                       $subtaskEventJob
+ * @property \Kanboard\Job\TaskEventJob                          $taskEventJob
+ * @property \Kanboard\Job\TaskFileEventJob                      $taskFileEventJob
+ * @property \Kanboard\Job\TaskLinkEventJob                      $taskLinkEventJob
+ * @property \Kanboard\Job\ProjectFileEventJob                   $projectFileEventJob
+ * @property \Kanboard\Job\NotificationJob                       $notificationJob
+ * @property \Kanboard\Job\ProjectMetricJob                      $projectMetricJob
  * @property \Psr\Log\LoggerInterface                            $logger
  * @property \PicoDb\Database                                    $db
  * @property \Symfony\Component\EventDispatcher\EventDispatcher  $dispatcher
@@ -165,10 +193,10 @@ abstract class Base
     }
 
     /**
-     * Load automatically models
+     * Load automatically dependencies
      *
      * @access public
-     * @param  string $name Model name
+     * @param  string $name Class name
      * @return mixed
      */
     public function __get($name)
@@ -186,7 +214,6 @@ abstract class Base
      */
     public static function getInstance(Container $container)
     {
-        $self = new static($container);
-        return $self;
+        return new static($container);
     }
 }