Commit 8630693a authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'master'

Release 06-06-2019

See merge request !166
parents 1d8355be c28b6845
Pipeline #7166 passed with stages
in 4 minutes and 19 seconds
......@@ -38,7 +38,7 @@ class SlackUserController extends ActionController
* action new
*
* @param \T3o\T3oSlack\Domain\Model\SlackUser $newSlackUser
* @dontvalidate $newSlackUser
* @ignorevalidation $newSlackUser
*/
public function newAction(SlackUser $newSlackUser = null)
{
......@@ -68,7 +68,7 @@ class SlackUserController extends ActionController
* action for errors and messages
*
* @param \T3o\T3oSlack\Domain\Model\SlackUser $newSlackUser
* @dontvalidate $newSlackUser
* @ignorevalidation $newSlackUser
*/
public function messageAction(SlackUser $newSlackUser = null)
{
......@@ -142,7 +142,7 @@ class SlackUserController extends ActionController
$logger->error(
'not handled exception in t3o_slack',
[
'response' => $error
'response' => $error,
]
);
if ($response['error']) {
......@@ -242,7 +242,7 @@ class SlackUserController extends ActionController
/**
* @param \T3o\T3oSlack\Domain\Model\SlackUser $newSlackUser
* @dontvalidate $newSlackUser
* @ignorevalidation $newSlackUser
*/
public function sendConfirmationMailAction($newSlackUser)
{
......@@ -286,7 +286,7 @@ class SlackUserController extends ActionController
/**
* @param \T3o\T3oSlack\Domain\Model\SlackUser $newSlackUser
* @dontvalidate $newSlackUser
* @ignorevalidation $newSlackUser
* @return bool
*/
public function sendConfirmationMail($newSlackUser)
......@@ -308,7 +308,7 @@ class SlackUserController extends ActionController
[
'user' => $user,
'hash' => HashUtility::createHashForUser($user),
'mail' => $newSlackUser->getEmail()
'mail' => $newSlackUser->getEmail(),
],
$femanagerSettings['new.']['email.']['createUserConfirmation.']
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment