summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.scrutinizer.yml15
-rw-r--r--app/Controller/Action.php2
-rw-r--r--app/Controller/Base.php4
-rw-r--r--app/Controller/Board.php2
-rw-r--r--app/Core/Router.php2
-rw-r--r--app/Model/File.php2
-rw-r--r--app/Model/Task.php2
7 files changed, 12 insertions, 17 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 108d6bd5..26d490b2 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -2,8 +2,7 @@ filter:
excluded_paths:
- 'vendor/*'
- 'tests/*'
- - 'bin/*'
- - 'library/*'
+ - 'app/Templates/*'
paths: { }
tools:
php_sim:
@@ -13,8 +12,7 @@ tools:
excluded_paths:
- 'vendor/*'
- 'tests/*'
- - 'bin/*'
- - 'library/*'
+ - 'app/Templates/*'
paths: { }
php_pdepend:
enabled: true
@@ -26,8 +24,7 @@ tools:
excluded_paths:
- 'vendor/*'
- 'tests/*'
- - 'bin/*'
- - 'library/*'
+ - 'app/Templates/*'
paths: { }
php_analyzer:
enabled: true
@@ -38,8 +35,7 @@ tools:
excluded_paths:
- 'vendor/*'
- 'tests/*'
- - 'bin/*'
- - 'library/*'
+ - 'app/Templates/*'
paths: { }
path_configs: { }
php_changetracking:
@@ -53,6 +49,5 @@ tools:
excluded_paths:
- 'vendor/*'
- 'tests/*'
- - 'bin/*'
- - 'library/*'
+ - 'app/Templates/*'
paths: { }
diff --git a/app/Controller/Action.php b/app/Controller/Action.php
index b32a8906..2aa85c14 100644
--- a/app/Controller/Action.php
+++ b/app/Controller/Action.php
@@ -91,7 +91,7 @@ class Action extends Base
$values = $this->request->getValues();
- list($valid, $errors) = $this->action->validateCreation($values);
+ list($valid,) = $this->action->validateCreation($values);
if ($valid) {
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index f8e7914b..b21d9b8f 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -19,10 +19,10 @@ use Model\LastLogin;
* @property \Model\Config $config
* @property \Model\File $file
* @property \Model\Google $google
- * @property \Model\LastLogin $lastlogin
+ * @property \Model\LastLogin $lastLogin
* @property \Model\Ldap $ldap
* @property \Model\Project $project
- * @property \Model\RememberMe $rememberme
+ * @property \Model\RememberMe $rememberMe
* @property \Model\Task $task
* @property \Model\User $user
*/
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 4cf0d381..53fdeab9 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -144,6 +144,8 @@ class Board extends Base
public function index()
{
$projects = $this->project->getListByStatus(ProjectModel::ACTIVE);
+ $project_id = 0;
+ $project_name = '';
if ($this->acl->isRegularUser()) {
$projects = $this->project->filterListByAccess($projects, $this->acl->getUserId());
diff --git a/app/Core/Router.php b/app/Core/Router.php
index 3a5df715..a7c9764c 100644
--- a/app/Core/Router.php
+++ b/app/Core/Router.php
@@ -46,7 +46,7 @@ class Router
{
$this->registry = $registry;
$this->controller = empty($_GET['controller']) ? $controller : $_GET['controller'];
- $this->action = empty($_GET['action']) ? $controller : $_GET['action'];
+ $this->action = empty($_GET['action']) ? $action : $_GET['action'];
}
/**
diff --git a/app/Model/File.php b/app/Model/File.php
index 1e2e1432..b7015acc 100644
--- a/app/Model/File.php
+++ b/app/Model/File.php
@@ -86,7 +86,7 @@ class File extends Base
*/
public function getAll($task_id)
{
- return $listing = $this->db->table(self::TABLE)
+ return $this->db->table(self::TABLE)
->eq('task_id', $task_id)
->asc('name')
->findAll();
diff --git a/app/Model/Task.php b/app/Model/Task.php
index f31594c9..faa33ca9 100644
--- a/app/Model/Task.php
+++ b/app/Model/Task.php
@@ -215,8 +215,6 @@ class Task extends Base
{
$this->db->startTransaction();
- $boardModel = new Board($this->db, $this->event);
-
// Get the original task
$task = $this->getById($task_id);