summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-02-14 16:22:26 -0500
committerFrederic Guillot <fred@kanboard.net>2015-02-14 16:22:26 -0500
commit5fd4e290c5e0cc4e721a2c68489529831882f435 (patch)
tree60d4a29eb62c388ce46920da80bc120761cb9e6a
parentf7e4c3928aba9cb7f5222cb4af67846312bbb435 (diff)
Fix PHPAnalyzer issues
-rw-r--r--app/Controller/Base.php2
-rw-r--r--app/Model/ProjectActivity.php8
-rw-r--r--app/Model/ProjectPermission.php4
-rw-r--r--app/Subscriber/Base.php1
4 files changed, 9 insertions, 6 deletions
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 76a81612..f7ebdbab 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -17,11 +17,13 @@ use Symfony\Component\EventDispatcher\Event;
* @package controller
* @author Frederic Guillot
*
+ * @property \Core\Helper $helper
* @property \Core\Session $session
* @property \Core\Template $template
* @property \Core\Paginator $paginator
* @property \Integration\GithubWebhook $githubWebhook
* @property \Integration\GitlabWebhook $gitlabWebhook
+ * @property \Integration\BitbucketWebhook $bitbucketWebhook
* @property \Model\Acl $acl
* @property \Model\Authentication $authentication
* @property \Model\Action $action
diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index 7762d0fd..652cc842 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -62,7 +62,7 @@ class ProjectActivity extends Base
*/
public function getProject($project_id, $limit = 50, $start = null, $end = null)
{
- return $this->getProjects(array($project_id), $limit, $start = null, $end = null);
+ return $this->getProjects(array($project_id), $limit, $start, $end);
}
/**
@@ -91,15 +91,15 @@ class ProjectActivity extends Base
->join(User::TABLE, 'id', 'creator_id')
->desc(self::TABLE.'.id')
->limit($limit);
-
+
if(!is_null($start)){
$query->gte('date_creation', $start);
}
-
+
if(!is_null($end)){
$query->lte('date_creation', $end);
}
-
+
$events = $query->findAll();
foreach ($events as &$event) {
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php
index cd892da4..12bd9309 100644
--- a/app/Model/ProjectPermission.php
+++ b/app/Model/ProjectPermission.php
@@ -326,7 +326,7 @@ class ProjectPermission extends Base
*
* @access public
* @param integer $user_id User id
- * @return []integer
+ * @return array
*/
public function getMemberProjectIds($user_id)
{
@@ -342,7 +342,7 @@ class ProjectPermission extends Base
*
* @access public
* @param integer $user_id User id
- * @return []integer
+ * @return array
*/
public function getActiveMemberProjectIds($user_id)
{
diff --git a/app/Subscriber/Base.php b/app/Subscriber/Base.php
index 489d49b0..f90d9604 100644
--- a/app/Subscriber/Base.php
+++ b/app/Subscriber/Base.php
@@ -10,6 +10,7 @@ use Pimple\Container;
* @package subscriber
* @author Frederic Guillot
*
+ * @property \Model\Board $board
* @property \Model\Config $config
* @property \Model\Comment $comment
* @property \Model\LastLogin $lastLogin