@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if ($result) { |
| 51 | 51 | $this->Flash->success(__d('community', 'The group has been saved.')); |
| 52 | 52 | return $this->App->redirect([ |
| 53 | - 'apply' => ['action' => 'edit', $result->id], |
|
| 53 | + 'apply' => [ 'action' => 'edit', $result->id ], |
|
| 54 | 54 | ]); |
| 55 | 55 | } else { |
| 56 | 56 | $this->Flash->error(__d('community', 'The group could not be saved. Please, try again.')); |
@@ -86,13 +86,13 @@ discard block |
||
| 86 | 86 | public function edit($id) |
| 87 | 87 | { |
| 88 | 88 | /** @var Group $group */ |
| 89 | - $group = $this->Groups->get($id, ['contain' => []]); |
|
| 90 | - if ($this->request->is(['patch', 'post', 'put'])) { |
|
| 89 | + $group = $this->Groups->get($id, [ 'contain' => [ ] ]); |
|
| 90 | + if ($this->request->is([ 'patch', 'post', 'put' ])) { |
|
| 91 | 91 | $group = $this->Groups->patchEntity($group, $this->request->getData()); |
| 92 | 92 | if ($result = $this->Groups->save($group)) { |
| 93 | 93 | $this->Flash->success(__d('community', 'The group has been updated.')); |
| 94 | 94 | return $this->App->redirect([ |
| 95 | - 'apply' => ['action' => 'edit', $result->id] |
|
| 95 | + 'apply' => [ 'action' => 'edit', $result->id ] |
|
| 96 | 96 | ]); |
| 97 | 97 | } else { |
| 98 | 98 | $this->Flash->error(__d('community', 'The group could not be updated. Please, try again.')); |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | /** |
| 38 | 38 | * Edit action. |
| 39 | 39 | * |
| 40 | - * @return mixed |
|
| 40 | + * @return \Cake\Http\Response|null |
|
| 41 | 41 | * |
| 42 | 42 | * @throws RolledbackTransactionException |
| 43 | 43 | */ |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * @param array|\ArrayAccess $options The options to use when saving. |
| 73 | 73 | * @return \Cake\Datasource\EntityInterface|false |
| 74 | 74 | */ |
| 75 | - public function save(EntityInterface $entity, $options = []) |
|
| 75 | + public function save(EntityInterface $entity, $options = [ ]) |
|
| 76 | 76 | { |
| 77 | 77 | EventManager::trigger('Model.User.beforeSave', $this, [ |
| 78 | 78 | 'user' => $entity |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | 'message' => __d('community', 'User with this login already exists.') |
| 106 | 106 | ]) |
| 107 | 107 | ->add('login', 'length', [ |
| 108 | - 'rule' => ['minLength', MIN_LENGTH_LOGIN], |
|
| 108 | + 'rule' => [ 'minLength', MIN_LENGTH_LOGIN ], |
|
| 109 | 109 | 'message' => __d('community', 'The minimum login length must be {0} characters', MIN_LENGTH_LOGIN) |
| 110 | 110 | ]); |
| 111 | 111 | |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | 'message' => __d('community', 'User with this alias already exists.') |
| 119 | 119 | ]) |
| 120 | 120 | ->add('slug', 'length', [ |
| 121 | - 'rule' => ['minLength', MIN_LENGTH_LOGIN], |
|
| 121 | + 'rule' => [ 'minLength', MIN_LENGTH_LOGIN ], |
|
| 122 | 122 | 'message' => __d('community', 'The minimum alias length must be {0} characters', MIN_LENGTH_LOGIN) |
| 123 | 123 | ]); |
| 124 | 124 | |
@@ -142,14 +142,14 @@ discard block |
||
| 142 | 142 | $validator |
| 143 | 143 | ->notEmpty('password', __d('community', 'Please, enter you password.')) |
| 144 | 144 | ->add('password', 'minLength', [ |
| 145 | - 'rule' => ['minLength', MIN_LENGTH_PASS], |
|
| 145 | + 'rule' => [ 'minLength', MIN_LENGTH_PASS ], |
|
| 146 | 146 | 'message' => __d('community', 'The minimum password length is {0}', MIN_LENGTH_PASS) |
| 147 | 147 | ]); |
| 148 | 148 | |
| 149 | 149 | $validator |
| 150 | 150 | ->notEmpty('password_confirm', __d('community', 'Please, confirm you password.')) |
| 151 | 151 | ->add('password_confirm', 'no-misspelling', [ |
| 152 | - 'rule' => ['compareWith', 'password'], |
|
| 152 | + 'rule' => [ 'compareWith', 'password' ], |
|
| 153 | 153 | 'message' => __d('community', 'Passwords are not equal') |
| 154 | 154 | ]); |
| 155 | 155 | |
@@ -16,9 +16,9 @@ |
||
| 16 | 16 | use Cake\Routing\Router; |
| 17 | 17 | use Cake\Routing\RouteBuilder; |
| 18 | 18 | |
| 19 | -Router::plugin('Community', ['path' => '/'], function (RouteBuilder $routeBuilder) { |
|
| 20 | - $routeBuilder->prefix('admin', function (RouteBuilder $routeBuilder) { |
|
| 21 | - $routeBuilder->connect('/community/:controller/:action/*', []); |
|
| 19 | +Router::plugin('Community', [ 'path' => '/' ], function(RouteBuilder $routeBuilder) { |
|
| 20 | + $routeBuilder->prefix('admin', function(RouteBuilder $routeBuilder) { |
|
| 21 | + $routeBuilder->connect('/community/:controller/:action/*', [ ]); |
|
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | 24 | $routeBuilder->connect('profile/:action/*', [ |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $result = $this->Users->save($user); |
| 59 | 59 | if ($result) { |
| 60 | - EventManager::trigger('Controller.Users.successActivate', $this, ['user' => $result]); |
|
| 60 | + EventManager::trigger('Controller.Users.successActivate', $this, [ 'user' => $result ]); |
|
| 61 | 61 | $this->Flash->success(__d( |
| 62 | 62 | 'community', |
| 63 | 63 | '«{0}», you profile has been activate successfully.', |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - return $this->redirect(['action' => 'login']); |
|
| 75 | + return $this->redirect([ 'action' => 'login' ]); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | throw new BadRequestException(__d('community', 'User was not found')); |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - if ($this->request->is(['patch', 'post', 'put'])) { |
|
| 102 | + if ($this->request->is([ 'patch', 'post', 'put' ])) { |
|
| 103 | 103 | $entity = $this->Users->patchEntity($user, $this->request->getData()); |
| 104 | 104 | if ($user->status) { |
| 105 | 105 | $entity->set('token', null); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | ]); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return $this->redirect(['action' => 'login']); |
|
| 125 | + return $this->redirect([ 'action' => 'login' ]); |
|
| 126 | 126 | } else { |
| 127 | 127 | $this->Flash->error(__d('community', 'An error has occurred. Please, try again.')); |
| 128 | 128 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * See https://book.cakephp.org/3.0/ru/orm/behaviors/tree.html |
| 35 | 35 | * @return \Cake\ORM\Query |
| 36 | 36 | */ |
| 37 | - public function getTreeList(array $options = []) |
|
| 37 | + public function getTreeList(array $options = [ ]) |
|
| 38 | 38 | { |
| 39 | 39 | $options = Hash::merge([ |
| 40 | 40 | 'lft' => 'ASC', |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @var array |
| 28 | 28 | */ |
| 29 | - public $records = []; |
|
| 29 | + public $records = [ ]; |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Run the seeder. |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $result->get('login') |
| 56 | 56 | ))); |
| 57 | 57 | |
| 58 | - return $this->App->redirect(['apply' => ['action' => 'edit', $result->id]]); |
|
| 58 | + return $this->App->redirect([ 'apply' => [ 'action' => 'edit', $result->id ] ]); |
|
| 59 | 59 | } else { |
| 60 | 60 | $this->Flash->error(__d('community', 'User could not be updated. Please, try again.')); |
| 61 | 61 | } |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function changePassword($id = null) |
| 78 | 78 | { |
| 79 | - $user = $this->Users->get($id, ['contain' => []]); |
|
| 79 | + $user = $this->Users->get($id, [ 'contain' => [ ] ]); |
|
| 80 | 80 | $user->set('password', null); |
| 81 | 81 | |
| 82 | - if ($this->request->is(['patch', 'post', 'put'])) { |
|
| 82 | + if ($this->request->is([ 'patch', 'post', 'put' ])) { |
|
| 83 | 83 | $user = $this->Users->patchEntity($user, $this->request->getData()); |
| 84 | 84 | if ($result = $this->Users->save($user)) { |
| 85 | 85 | $this->Flash->success(__d('community', 'Password has been updated.')); |
| 86 | - return $this->App->redirect(['apply' => ['action' => 'edit', $result->id]]); |
|
| 86 | + return $this->App->redirect([ 'apply' => [ 'action' => 'edit', $result->id ] ]); |
|
| 87 | 87 | } else { |
| 88 | 88 | $this->Flash->error(__d('community', 'Password could not be updated. Please, try again.')); |
| 89 | 89 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $user = $this->Users->get($id); |
| 111 | 111 | $groups = $this->Users->Groups->getTreeList(); |
| 112 | 112 | |
| 113 | - if ($this->request->is(['patch', 'post', 'put'])) { |
|
| 113 | + if ($this->request->is([ 'patch', 'post', 'put' ])) { |
|
| 114 | 114 | $user = $this->Users->patchEntity($user, $this->request->getData()); |
| 115 | 115 | if ($result = $this->Users->save($user)) { |
| 116 | 116 | $this->Flash->success(__d('community', 'The user {0} has been saved.', sprintf( |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $result->get('login') |
| 119 | 119 | ))); |
| 120 | 120 | return $this->App->redirect([ |
| 121 | - 'apply' => ['action' => 'edit', $result->id] |
|
| 121 | + 'apply' => [ 'action' => 'edit', $result->id ] |
|
| 122 | 122 | ]); |
| 123 | 123 | } else { |
| 124 | 124 | $this->Flash->error(__d('community', 'User could not be updated. Please, try again.')); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | public function initialize() |
| 159 | 159 | { |
| 160 | 160 | parent::initialize(); |
| 161 | - $this->Security->setConfig('unlockedFields', ['password', 'password_confirm']); |
|
| 161 | + $this->Security->setConfig('unlockedFields', [ 'password', 'password_confirm' ]); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | /** |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @var array |
| 28 | 28 | */ |
| 29 | - public $records = []; |
|
| 29 | + public $records = [ ]; |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Run the seeder. |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | 'authenticate' => [ |
| 60 | 60 | 'Form' => [ |
| 61 | 61 | 'userModel' => 'Users', |
| 62 | - 'scope' => ['Users.status' => 1], |
|
| 62 | + 'scope' => [ 'Users.status' => 1 ], |
|
| 63 | 63 | 'fields' => [ |
| 64 | 64 | 'username' => 'login', |
| 65 | 65 | 'password' => 'password' |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | 'flash' => [ |
| 70 | 70 | 'key' => 'auth', |
| 71 | 71 | 'element' => 'error', |
| 72 | - 'params' => ['class' => 'error'] |
|
| 72 | + 'params' => [ 'class' => 'error' ] |
|
| 73 | 73 | ], |
| 74 | 74 | 'loginAction' => [ |
| 75 | 75 | 'controller' => 'Users', |
@@ -81,16 +81,16 @@ discard block |
||
| 81 | 81 | 'controller' => 'Users', |
| 82 | 82 | 'plugin' => 'Community' |
| 83 | 83 | ], |
| 84 | - 'authorize' => ['Community.Base'], |
|
| 84 | + 'authorize' => [ 'Community.Base' ], |
|
| 85 | 85 | 'loginRedirect' => $this->_getLoginRedirect(), |
| 86 | - 'logoutRedirect' => $this->_config['loginAction'], |
|
| 86 | + 'logoutRedirect' => $this->_config[ 'loginAction' ], |
|
| 87 | 87 | 'authError' => __d('community', 'You are not authorized to access that location.') |
| 88 | 88 | ]; |
| 89 | 89 | |
| 90 | 90 | $config = $this->getConfig(); |
| 91 | 91 | foreach ($config as $key => $value) { |
| 92 | 92 | if ($value !== null) { |
| 93 | - unset($defaults[$key]); |
|
| 93 | + unset($defaults[ $key ]); |
|
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |