summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-01-11 21:54:52 -0500
committerFrederic Guillot <fred@kanboard.net>2016-01-11 21:54:52 -0500
commite31185a2bd85d7d8e16a614cb21dfdbff10ce070 (patch)
tree8110ec37f1a4a306bf47853bcf33ea279a0946dd
parent9a661a5e9ede5fc699f573179683b7db973a2fe0 (diff)
Minor fixes
-rw-r--r--app/Controller/PasswordReset.php2
-rw-r--r--app/Core/Base.php1
-rw-r--r--app/Core/Session/SessionStorage.php2
-rw-r--r--app/Validator/PasswordResetValidator.php1
4 files changed, 4 insertions, 2 deletions
diff --git a/app/Controller/PasswordReset.php b/app/Controller/PasswordReset.php
index ebc1f77a..23567c9c 100644
--- a/app/Controller/PasswordReset.php
+++ b/app/Controller/PasswordReset.php
@@ -67,7 +67,7 @@ class PasswordReset extends Base
/**
* Set the new password
*/
- public function update(array $values = array(), array $errors = array())
+ public function update()
{
$this->checkActivation();
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 54a3a7d4..21e80628 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -79,6 +79,7 @@ use Pimple\Container;
* @property \Kanboard\Model\ProjectMetadata $projectMetadata
* @property \Kanboard\Model\ProjectPermission $projectPermission
* @property \Kanboard\Model\ProjectUserRole $projectUserRole
+ * @property \Kanboard\Model\projectUserRoleFilter $projectUserRoleFilter
* @property \Kanboard\Model\ProjectGroupRole $projectGroupRole
* @property \Kanboard\Model\ProjectNotification $projectNotification
* @property \Kanboard\Model\ProjectNotificationType $projectNotificationType
diff --git a/app/Core/Session/SessionStorage.php b/app/Core/Session/SessionStorage.php
index f55a7ee3..5ee1d811 100644
--- a/app/Core/Session/SessionStorage.php
+++ b/app/Core/Session/SessionStorage.php
@@ -20,6 +20,8 @@ namespace Kanboard\Core\Session;
* @property bool $hasSubtaskInProgress
* @property bool $hasRememberMe
* @property bool $boardCollapsed
+ * @property bool $twoFactorBeforeCodeCalled
+ * @property string $twoFactorSecret
*/
class SessionStorage
{
diff --git a/app/Validator/PasswordResetValidator.php b/app/Validator/PasswordResetValidator.php
index 9ef45045..baf2d8d7 100644
--- a/app/Validator/PasswordResetValidator.php
+++ b/app/Validator/PasswordResetValidator.php
@@ -73,7 +73,6 @@ class PasswordResetValidator extends Base
*/
protected function validateCaptcha(array $values)
{
- $result = true;
$errors = array();
if (! isset($this->sessionStorage->captcha)) {