@@ -20,8 +20,8 @@ |
||
| 20 | 20 | public function init() |
| 21 | 21 | { |
| 22 | 22 | $this->setName('base'); |
| 23 | - //->setLabel( /* @translate */ 'General'); |
|
| 24 | - //->setHydrator(new \Core\Model\Hydrator\ModelHydrator()); |
|
| 23 | + //->setLabel( /* @translate */ 'General'); |
|
| 24 | + //->setHydrator(new \Core\Model\Hydrator\ModelHydrator()); |
|
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | $this->add( |
@@ -194,7 +194,7 @@ |
||
| 194 | 194 | $qb->addOr($qb->expr()->field('info.email')->equals($regex)); |
| 195 | 195 | } |
| 196 | 196 | $qb->sort(array('info.lastName' => 1)) |
| 197 | - ->sort(array('info.email' => 1)); |
|
| 197 | + ->sort(array('info.email' => 1)); |
|
| 198 | 198 | |
| 199 | 199 | return $qb->getQuery()->execute(); |
| 200 | 200 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * Gets the Day of the date of birth |
| 31 | 31 | * |
| 32 | 32 | * @return string |
| 33 | - */ |
|
| 33 | + */ |
|
| 34 | 34 | public function getBirthDay(); |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * Gets the month of the date of birth |
| 45 | 45 | * |
| 46 | 46 | * @return string |
| 47 | - */ |
|
| 47 | + */ |
|
| 48 | 48 | public function getBirthMonth(); |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * Gets the Year of the date of birth. |
| 59 | 59 | * |
| 60 | 60 | * @return string |
| 61 | - */ |
|
| 61 | + */ |
|
| 62 | 62 | public function getBirthYear(); |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * Gets the gender |
| 112 | 112 | * |
| 113 | 113 | * @return string |
| 114 | - */ |
|
| 114 | + */ |
|
| 115 | 115 | public function getGender(); |
| 116 | 116 | |
| 117 | 117 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * Gets the users street |
| 155 | 155 | * |
| 156 | 156 | * @return string |
| 157 | - */ |
|
| 157 | + */ |
|
| 158 | 158 | public function getStreet(); |
| 159 | 159 | |
| 160 | 160 | /** |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | public function init() |
| 29 | 29 | { |
| 30 | 30 | $this->setName('data') |
| 31 | - ->setLabel('Group data') |
|
| 32 | - ->setUseAsBaseFieldset(true) |
|
| 33 | - ->setHydrator(new EntityHydrator()); |
|
| 31 | + ->setLabel('Group data') |
|
| 32 | + ->setUseAsBaseFieldset(true) |
|
| 33 | + ->setHydrator(new EntityHydrator()); |
|
| 34 | 34 | |
| 35 | 35 | $this->add( |
| 36 | 36 | array( |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | 'required' => true, |
| 70 | 70 | 'validators' => array( |
| 71 | 71 | array('name' => 'Auth/Form/UniqueGroupName', |
| 72 | - 'options' => array( |
|
| 72 | + 'options' => array( |
|
| 73 | 73 | 'allowName' => 'edit' == $this->getOption('mode') |
| 74 | 74 | ? $this->getObject()->getName() |
| 75 | 75 | : null |
@@ -93,8 +93,8 @@ |
||
| 93 | 93 | // Create a file with the class/file map. |
| 94 | 94 | // Stupid syntax highlighters make separating < from PHP declaration necessary |
| 95 | 95 | $content = '<' . "?php\n" |
| 96 | - . "\n" |
|
| 97 | - . 'return ' . var_export($config, true) . ';'; |
|
| 96 | + . "\n" |
|
| 97 | + . 'return ' . var_export($config, true) . ';'; |
|
| 98 | 98 | |
| 99 | 99 | // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op |
| 100 | 100 | $content = str_replace("\\'", "'", $content); |
@@ -211,14 +211,14 @@ |
||
| 211 | 211 | { |
| 212 | 212 | return $this->repository; |
| 213 | 213 | } |
| 214 | - /** |
|
| 215 | - * @param SocialProfilePlugin |
|
| 216 | - * @return HybridAuth |
|
| 217 | - */ |
|
| 218 | - public function setSocialProfilePlugin(SocialProfilePlugin $socialProfilePlugin) |
|
| 219 | - { |
|
| 220 | - $this->socialProfilePlugin = $socialProfilePlugin; |
|
| 214 | + /** |
|
| 215 | + * @param SocialProfilePlugin |
|
| 216 | + * @return HybridAuth |
|
| 217 | + */ |
|
| 218 | + public function setSocialProfilePlugin(SocialProfilePlugin $socialProfilePlugin) |
|
| 219 | + { |
|
| 220 | + $this->socialProfilePlugin = $socialProfilePlugin; |
|
| 221 | 221 | |
| 222 | - return $this; |
|
| 223 | - } |
|
| 222 | + return $this; |
|
| 223 | + } |
|
| 224 | 224 | } |
@@ -61,14 +61,14 @@ |
||
| 61 | 61 | return $this->useDefaultValidation ? \Zend\Form\Form::isValid() : parent::isValid(); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @param bool $bool |
|
| 66 | - * @return SocialProfiles |
|
| 67 | - */ |
|
| 68 | - public function setUseDefaultValidation($bool) |
|
| 69 | - { |
|
| 70 | - $this->useDefaultValidation = (bool)$bool; |
|
| 64 | + /** |
|
| 65 | + * @param bool $bool |
|
| 66 | + * @return SocialProfiles |
|
| 67 | + */ |
|
| 68 | + public function setUseDefaultValidation($bool) |
|
| 69 | + { |
|
| 70 | + $this->useDefaultValidation = (bool)$bool; |
|
| 71 | 71 | |
| 72 | - return $this; |
|
| 73 | - } |
|
| 72 | + return $this; |
|
| 73 | + } |
|
| 74 | 74 | } |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | 'content' => $content, |
| 97 | 97 | ) |
| 98 | 98 | ); |
| 99 | - } |
|
| 100 | - elseif ($postProfiles) { |
|
| 99 | + } elseif ($postProfiles) { |
|
| 101 | 100 | $formSocialProfiles->setData($this->params()->fromPost()); |
| 102 | 101 | |
| 103 | 102 | if ($formSocialProfiles->isValid()) { |
@@ -28,66 +28,66 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | class ManageController extends AbstractActionController |
| 30 | 30 | { |
| 31 | - private $userProfileContainer; |
|
| 31 | + private $userProfileContainer; |
|
| 32 | 32 | |
| 33 | - private $authService; |
|
| 33 | + private $authService; |
|
| 34 | 34 | |
| 35 | - private $socialProfileForm; |
|
| 35 | + private $socialProfileForm; |
|
| 36 | 36 | |
| 37 | - private $translator; |
|
| 37 | + private $translator; |
|
| 38 | 38 | |
| 39 | - private $repositories; |
|
| 39 | + private $repositories; |
|
| 40 | 40 | |
| 41 | - private $viewHelper; |
|
| 41 | + private $viewHelper; |
|
| 42 | 42 | |
| 43 | - private $hybridAuthAdapter; |
|
| 43 | + private $hybridAuthAdapter; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param ContainerInterface $container |
|
| 47 | - * @return ManageController |
|
| 48 | - */ |
|
| 49 | - static public function factory(ContainerInterface $container) |
|
| 50 | - { |
|
| 51 | - $forms = $container->get('forms'); |
|
| 52 | - $userProfileContainer = $forms->get('Auth/UserProfileContainer'); |
|
| 53 | - $socialProfileForm = $forms->get('Auth/SocialProfiles'); |
|
| 54 | - $authService = $container->get('AuthenticationService'); |
|
| 55 | - $translator = $container->get('translator'); |
|
| 56 | - $repositories = $container->get('repositories'); |
|
| 57 | - $viewHelper = $container->get('ViewHelperManager'); |
|
| 58 | - $hybridAuthAdapter = $container->get('HybridAuthAdapter'); |
|
| 59 | - $controller = new ManageController( |
|
| 60 | - $userProfileContainer, |
|
| 61 | - $authService, |
|
| 62 | - $repositories, |
|
| 63 | - $socialProfileForm, |
|
| 64 | - $translator, |
|
| 65 | - $viewHelper, |
|
| 66 | - $hybridAuthAdapter |
|
| 67 | - ); |
|
| 68 | - return $controller; |
|
| 69 | - } |
|
| 45 | + /** |
|
| 46 | + * @param ContainerInterface $container |
|
| 47 | + * @return ManageController |
|
| 48 | + */ |
|
| 49 | + static public function factory(ContainerInterface $container) |
|
| 50 | + { |
|
| 51 | + $forms = $container->get('forms'); |
|
| 52 | + $userProfileContainer = $forms->get('Auth/UserProfileContainer'); |
|
| 53 | + $socialProfileForm = $forms->get('Auth/SocialProfiles'); |
|
| 54 | + $authService = $container->get('AuthenticationService'); |
|
| 55 | + $translator = $container->get('translator'); |
|
| 56 | + $repositories = $container->get('repositories'); |
|
| 57 | + $viewHelper = $container->get('ViewHelperManager'); |
|
| 58 | + $hybridAuthAdapter = $container->get('HybridAuthAdapter'); |
|
| 59 | + $controller = new ManageController( |
|
| 60 | + $userProfileContainer, |
|
| 61 | + $authService, |
|
| 62 | + $repositories, |
|
| 63 | + $socialProfileForm, |
|
| 64 | + $translator, |
|
| 65 | + $viewHelper, |
|
| 66 | + $hybridAuthAdapter |
|
| 67 | + ); |
|
| 68 | + return $controller; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - public function __construct( |
|
| 72 | - UserProfileContainer $userProfileContainer, |
|
| 73 | - AuthenticationService $authService, |
|
| 74 | - RepositoryService $repositories, |
|
| 75 | - SocialProfiles $socialProfileForm, |
|
| 76 | - Translator $translator, |
|
| 77 | - HelperPluginManager $viewHelper, |
|
| 78 | - HybridAuth $hybridAuthAdapter |
|
| 79 | - ) |
|
| 80 | - { |
|
| 81 | - $this->userProfileContainer = $userProfileContainer; |
|
| 82 | - $this->authService = $authService; |
|
| 83 | - $this->socialProfileForm = $socialProfileForm; |
|
| 84 | - $this->repositories = $repositories; |
|
| 85 | - $this->translator = $translator; |
|
| 86 | - $this->viewHelper = $viewHelper; |
|
| 87 | - $this->hybridAuthAdapter = $hybridAuthAdapter; |
|
| 88 | - } |
|
| 71 | + public function __construct( |
|
| 72 | + UserProfileContainer $userProfileContainer, |
|
| 73 | + AuthenticationService $authService, |
|
| 74 | + RepositoryService $repositories, |
|
| 75 | + SocialProfiles $socialProfileForm, |
|
| 76 | + Translator $translator, |
|
| 77 | + HelperPluginManager $viewHelper, |
|
| 78 | + HybridAuth $hybridAuthAdapter |
|
| 79 | + ) |
|
| 80 | + { |
|
| 81 | + $this->userProfileContainer = $userProfileContainer; |
|
| 82 | + $this->authService = $authService; |
|
| 83 | + $this->socialProfileForm = $socialProfileForm; |
|
| 84 | + $this->repositories = $repositories; |
|
| 85 | + $this->translator = $translator; |
|
| 86 | + $this->viewHelper = $viewHelper; |
|
| 87 | + $this->hybridAuthAdapter = $hybridAuthAdapter; |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - /** |
|
| 90 | + /** |
|
| 91 | 91 | * @return array|JsonModel |
| 92 | 92 | */ |
| 93 | 93 | public function profileAction() |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $postData = $form->getOption('use_post_array') ? $_POST : array(); |
| 122 | 122 | //@TODO: [ZF3] option use_files_array is false by default |
| 123 | 123 | //$filesData = $form->getOption('use_files_array') ? $_FILES : array(); |
| 124 | - $filesData = $_FILES; |
|
| 124 | + $filesData = $_FILES; |
|
| 125 | 125 | $data = array_merge($postData, $filesData); |
| 126 | 126 | $form->setData($data); |
| 127 | 127 | |
@@ -411,8 +411,7 @@ |
||
| 411 | 411 | } else { |
| 412 | 412 | $notFoundUsers[] = $grp_member . $loginSuffix; |
| 413 | 413 | } |
| 414 | - } |
|
| 415 | - catch (\Auth\Exception\UserDeactivatedException $e) |
|
| 414 | + } catch (\Auth\Exception\UserDeactivatedException $e) |
|
| 416 | 415 | { |
| 417 | 416 | $notFoundUsers[] = $grp_member . $loginSuffix; |
| 418 | 417 | } |
@@ -70,28 +70,28 @@ |
||
| 70 | 70 | |
| 71 | 71 | protected $externalAdapter; |
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * IndexController constructor. |
|
| 75 | - * |
|
| 76 | - * @param AuthenticationService $auth |
|
| 77 | - * @param LoggerInterface $logger |
|
| 78 | - * @param $userLoginAdapter |
|
| 79 | - * @param $locale |
|
| 80 | - * @param $urlHelper |
|
| 81 | - * @param array $forms |
|
| 82 | - * @param $options |
|
| 83 | - */ |
|
| 73 | + /** |
|
| 74 | + * IndexController constructor. |
|
| 75 | + * |
|
| 76 | + * @param AuthenticationService $auth |
|
| 77 | + * @param LoggerInterface $logger |
|
| 78 | + * @param $userLoginAdapter |
|
| 79 | + * @param $locale |
|
| 80 | + * @param $urlHelper |
|
| 81 | + * @param array $forms |
|
| 82 | + * @param $options |
|
| 83 | + */ |
|
| 84 | 84 | public function __construct( |
| 85 | - AuthenticationService $auth, |
|
| 86 | - LoggerInterface $logger, |
|
| 87 | - $userLoginAdapter, |
|
| 88 | - $locale, |
|
| 89 | - $urlHelper, |
|
| 90 | - array $forms, |
|
| 91 | - $options, |
|
| 92 | - $hybridAuthAdapter, |
|
| 93 | - $externalAdapter, |
|
| 94 | - RepositoryService $repositories |
|
| 85 | + AuthenticationService $auth, |
|
| 86 | + LoggerInterface $logger, |
|
| 87 | + $userLoginAdapter, |
|
| 88 | + $locale, |
|
| 89 | + $urlHelper, |
|
| 90 | + array $forms, |
|
| 91 | + $options, |
|
| 92 | + $hybridAuthAdapter, |
|
| 93 | + $externalAdapter, |
|
| 94 | + RepositoryService $repositories |
|
| 95 | 95 | ) |
| 96 | 96 | { |
| 97 | 97 | $this->auth = $auth; |