Permalink
Browse files

Fix Coding Standards PSR-2

  - Braces
  - Line feed (CRLF)
  - eof_ending
  - elseif
  • Loading branch information...
1 parent 334c5aa commit f39e9ea8a8da789d76aface2ad8ac0d3ad120623 @b-durand b-durand committed Sep 26, 2012
View
@@ -41,4 +41,4 @@
'ZfcUser\Mapper\UserHydrator' => __DIR__ . '/src/ZfcUser/Mapper/UserHydrator.php',
'ZfcUser\Mapper\UserInterface' => __DIR__ . '/src/ZfcUser/Mapper/UserInterface.php',
'ZfcUser\Mapper\User' => __DIR__ . '/src/ZfcUser/Mapper/User.php',
-);
+);
@@ -102,7 +102,7 @@ public function logoutAction()
$redirect = ($this->getRequest()->getPost()->get('redirect')) ? $this->getRequest()->getPost()->get('redirect') : false;
- if($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
+ if ($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
return $this->redirect()->toUrl($redirect);
}
@@ -169,7 +169,7 @@ public function registerAction()
if ($prg instanceof Response) {
return $prg;
- } else if ($prg === false) {
+ } elseif ($prg === false) {
return array(
'registerForm' => $form,
'enableRegistration' => $this->getOptions()->getEnableRegistration(),
@@ -192,7 +192,7 @@ public function registerAction()
$identityFields = $service->getOptions()->getAuthIdentityFields();
if (in_array('email', $identityFields)) {
$post['identity'] = $user->getEmail();
- } elseif(in_array('username', $identityFields)) {
+ } elseif (in_array('username', $identityFields)) {
$post['identity'] = $user->getUsername();
}
$post['credential'] = $post['password'];
@@ -207,7 +207,8 @@ public function registerAction()
/**
* Change the users password
*/
- public function changepasswordAction() {
+ public function changepasswordAction()
+ {
$form = $this->getChangePasswordForm();
$prg = $this->prg('zfcuser/changepassword');
@@ -220,7 +221,7 @@ public function changepasswordAction() {
if ($prg instanceof Response) {
return $prg;
- } else if ($prg === false) {
+ } elseif ($prg === false) {
return array(
'status' => $status,
'changePasswordForm' => $form,
@@ -263,7 +264,7 @@ public function changeEmailAction()
$prg = $this->prg('zfcuser/changeemail');
if ($prg instanceof Response) {
return $prg;
- } else if ($prg === false) {
+ } elseif ($prg === false) {
return array(
'status' => $status,
'changeEmailForm' => $form,
@@ -344,14 +345,16 @@ public function setLoginForm(Form $loginForm)
return $this;
}
- public function getChangePasswordForm() {
+ public function getChangePasswordForm()
+ {
if (!$this->changePasswordForm) {
$this->setChangePasswordForm($this->getServiceLocator()->get('zfcuser_change_password_form'));
}
return $this->changePasswordForm;
}
- public function setChangePasswordForm(Form $changePasswordForm) {
+ public function setChangePasswordForm(Form $changePasswordForm)
+ {
$this->changePasswordForm = $changePasswordForm;
return $this;
}
@@ -76,10 +76,10 @@ public function __construct()
}
$submitElement = new Element\Button('submit');
- $submitElement
- ->setLabel('Submit')
- ->setAttributes(array(
- 'type' => 'submit',
+ $submitElement
+ ->setLabel('Submit')
+ ->setAttributes(array(
+ 'type' => 'submit',
));
$this->add($submitElement, array(
@@ -5,4 +5,4 @@
use ZfcBase\Mapper\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{}
@@ -3,4 +3,4 @@
namespace ZfcUser\Validator\Exception;
interface ExceptionInterface
-{}
+{}
@@ -3,4 +3,4 @@
namespace ZfcUser\Validator\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{}
+{}

0 comments on commit f39e9ea

Please sign in to comment.