summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Guillot <fguillot@users.noreply.github.com>2014-05-03 22:44:00 -0400
committerFrédéric Guillot <fguillot@users.noreply.github.com>2014-05-03 22:44:00 -0400
commit8ab4c38373932a3f40c4810cf88c278a2f478976 (patch)
treeaf36edb9f5f4539c9b56ff3881364ea3f2ac5fbc
parent560a12f0bd6347a335f8ed5201d6d9562d03d4bc (diff)
Remove some warnings for Scrutinizer-ci
-rw-r--r--actions/task_assign_color_user.php8
-rw-r--r--actions/task_assign_current_user.php16
-rw-r--r--actions/task_assign_specific_user.php8
-rw-r--r--actions/task_close.php8
-rw-r--r--actions/task_duplicate_another_project.php8
-rw-r--r--controllers/base.php32
-rw-r--r--core/session.php2
-rw-r--r--locales/es_ES/translations.php1
-rw-r--r--locales/fr_FR/translations.php1
-rw-r--r--locales/pl_PL/translations.php1
-rw-r--r--locales/pt_BR/translations.php1
-rw-r--r--models/google.php4
12 files changed, 88 insertions, 2 deletions
diff --git a/actions/task_assign_color_user.php b/actions/task_assign_color_user.php
index cd8bee44..d3ce1fbe 100644
--- a/actions/task_assign_color_user.php
+++ b/actions/task_assign_color_user.php
@@ -13,6 +13,14 @@ require_once __DIR__.'/base.php';
class TaskAssignColorUser extends Base
{
/**
+ * Task model
+ *
+ * @accesss private
+ * @var \Model\Task
+ */
+ private $task;
+
+ /**
* Constructor
*
* @access public
diff --git a/actions/task_assign_current_user.php b/actions/task_assign_current_user.php
index c3843d85..a3d9559e 100644
--- a/actions/task_assign_current_user.php
+++ b/actions/task_assign_current_user.php
@@ -13,6 +13,22 @@ require_once __DIR__.'/base.php';
class TaskAssignCurrentUser extends Base
{
/**
+ * Task model
+ *
+ * @accesss private
+ * @var \Model\Task
+ */
+ private $task;
+
+ /**
+ * Acl model
+ *
+ * @accesss private
+ * @var \Model\Acl
+ */
+ private $acl;
+
+ /**
* Constructor
*
* @access public
diff --git a/actions/task_assign_specific_user.php b/actions/task_assign_specific_user.php
index 0d5b1b51..aabe5420 100644
--- a/actions/task_assign_specific_user.php
+++ b/actions/task_assign_specific_user.php
@@ -13,6 +13,14 @@ require_once __DIR__.'/base.php';
class TaskAssignSpecificUser extends Base
{
/**
+ * Task model
+ *
+ * @accesss private
+ * @var \Model\Task
+ */
+ private $task;
+
+ /**
* Constructor
*
* @access public
diff --git a/actions/task_close.php b/actions/task_close.php
index 8a6c8999..22d61f29 100644
--- a/actions/task_close.php
+++ b/actions/task_close.php
@@ -13,6 +13,14 @@ require_once __DIR__.'/base.php';
class TaskClose extends Base
{
/**
+ * Task model
+ *
+ * @accesss private
+ * @var \Model\Task
+ */
+ private $task;
+
+ /**
* Constructor
*
* @access public
diff --git a/actions/task_duplicate_another_project.php b/actions/task_duplicate_another_project.php
index 614e2dda..6e1ee84b 100644
--- a/actions/task_duplicate_another_project.php
+++ b/actions/task_duplicate_another_project.php
@@ -13,6 +13,14 @@ require_once __DIR__.'/base.php';
class TaskDuplicateAnotherProject extends Base
{
/**
+ * Task model
+ *
+ * @accesss private
+ * @var \Model\Task
+ */
+ private $task;
+
+ /**
* Constructor
*
* @access public
diff --git a/controllers/base.php b/controllers/base.php
index 6b5555c4..b4f438c3 100644
--- a/controllers/base.php
+++ b/controllers/base.php
@@ -11,6 +11,38 @@ namespace Controller;
abstract class Base
{
/**
+ * Request instance
+ *
+ * @accesss public
+ * @var \Core\Request
+ */
+ public $request;
+
+ /**
+ * Response instance
+ *
+ * @accesss public
+ * @var \Core\Response
+ */
+ public $response;
+
+ /**
+ * Template instance
+ *
+ * @accesss public
+ * @var \Core\Template
+ */
+ public $template;
+
+ /**
+ * Session instance
+ *
+ * @accesss public
+ * @var \Core\Session
+ */
+ public $session;
+
+ /**
* Acl model
*
* @accesss protected
diff --git a/core/session.php b/core/session.php
index aa4b2516..0c3ec2d9 100644
--- a/core/session.php
+++ b/core/session.php
@@ -20,7 +20,7 @@ class Session
);
// Avoid session id in the URL
- ini_set('session.use_only_cookies', true);
+ ini_set('session.use_only_cookies', '1');
// Ensure session ID integrity
ini_set('session.entropy_file', '/dev/urandom');
diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php
index 652c5f03..e101c7ce 100644
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@@ -303,4 +303,5 @@ return array(
// 'Link my Google Account' => '',
// 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '',
+ // 'Project not found.' => '',
);
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index 626aa946..a77a5f57 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -303,4 +303,5 @@ return array(
'Link my Google Account' => 'Lier mon compte Google',
'Unlink my Google Account' => 'Ne plus utiliser mon compte Google',
'Login with my Google Account' => 'Se connecter avec mon compte Google',
+ 'Project not found.' => 'Projet introuvable.'
);
diff --git a/locales/pl_PL/translations.php b/locales/pl_PL/translations.php
index 732ab654..0b6d8480 100644
--- a/locales/pl_PL/translations.php
+++ b/locales/pl_PL/translations.php
@@ -308,4 +308,5 @@ return array(
// 'Link my Google Account' => '',
// 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '',
+ // 'Project not found.' => '',
);
diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php
index 79e1cbe0..b9d273a0 100644
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@@ -304,4 +304,5 @@ return array(
// 'Link my Google Account' => '',
// 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '',
+ // 'Project not found.' => '',
);
diff --git a/models/google.php b/models/google.php
index 51367a60..4f83a41e 100644
--- a/models/google.php
+++ b/models/google.php
@@ -144,7 +144,9 @@ class Google extends Base
$googleService->requestAccessToken($code);
return json_decode($googleService->request('https://www.googleapis.com/oauth2/v1/userinfo'), true);
}
- catch (TokenResponseException $e) {}
+ catch (TokenResponseException $e) {
+ return false;
+ }
return false;
}