' . implode('
', $faker->paragraphs(rand(3, 20), false)) . '
', diff --git a/config/Seeds/SignaturesSeed.php b/config/Seeds/SignaturesSeed.php index d24eb66..ae02225 100644 --- a/config/Seeds/SignaturesSeed.php +++ b/config/Seeds/SignaturesSeed.php @@ -22,7 +22,7 @@ public function run() $data = []; - for ($i=0; $i < 100; $i++) { + for ($i = 0; $i < 100; $i++) { $data[] = [ 'first_name' => $faker->firstName, 'last_name' => $faker->lastName, diff --git a/config/Seeds/UsersSeed.php b/config/Seeds/UsersSeed.php index af7ef84..9a889b9 100644 --- a/config/Seeds/UsersSeed.php +++ b/config/Seeds/UsersSeed.php @@ -1,6 +1,7 @@ 'user1', @@ -41,7 +43,7 @@ public function run() ] ]; - for ($i=0; $i < 20; $i++) { + for ($i = 0; $i < 20; $i++) { $data[] = [ 'login' => $faker->lastName . $faker->numberBetween(1, 5555), 'email' => $faker->safeEmail, diff --git a/config/bootstrap.php b/config/bootstrap.php index 705e667..3eaa663 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -162,10 +162,14 @@ */ Request::addDetector('mobile', function ($request) { $detector = new \Detection\MobileDetect(); + + return $detector->isMobile(); }); Request::addDetector('tablet', function ($request) { $detector = new \Detection\MobileDetect(); + + return $detector->isTablet(); }); diff --git a/config/routes.php b/config/routes.php index aa3cb3a..0b4672a 100644 --- a/config/routes.php +++ b/config/routes.php @@ -45,17 +45,17 @@ Router::scope('/auth', function (RouteBuilder $routes) { $routes->connect('/', ['controller' => 'Auth', 'action' => 'login'], ['_name' => 'auth.login']); - $routes->connect('/logout', ['controller' => 'Auth', 'action' => 'logout',], [ '_name' => 'auth.logout']); + $routes->connect('/logout', ['controller' => 'Auth', 'action' => 'logout', ], [ '_name' => 'auth.logout']); }); Router::scope('/petition', function (RouteBuilder $routes) { $routes->connect('/', ['controller' => 'Petition', 'action' => 'index'], ['_name' => 'petition.index']); - $routes->connect('/form', ['controller' => 'Petition', 'action' => 'add',], [ '_name' => 'petition.add']); - $routes->connect('/thank-you', ['controller' => 'Petition', 'action' => 'thank',], [ '_name' => 'petition.thank']); + $routes->connect('/form', ['controller' => 'Petition', 'action' => 'add', ], [ '_name' => 'petition.add']); + $routes->connect('/thank-you', ['controller' => 'Petition', 'action' => 'thank', ], [ '_name' => 'petition.thank']); }); -Router::scope('/', function (RouteBuilder $routes){ +Router::scope('/', function (RouteBuilder $routes) { $routes->connect('/', ['controller' => 'Blog', 'action' => 'index']); $routes->connect('/:id/*', ['controller' => 'Blog', 'action' => 'view'], ['pass' => ['id'], 'id' => '\d+']); diff --git a/src/Console/Installer.php b/src/Console/Installer.php index 9a09e9f..7b61441 100644 --- a/src/Console/Installer.php +++ b/src/Console/Installer.php @@ -179,12 +179,16 @@ public static function setSecuritySalt($dir, $io) if ($count == 0) { $io->write('No Security.salt placeholder to replace.'); + + return; } $result = file_put_contents($config, $content); if ($result) { $io->write('Updated Security.salt value in config/app.php'); + + return; } $io->write('Unable to update Security.salt value.'); diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index 0da9f7c..685841c 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -77,7 +77,7 @@ public function initialize() 'controller' => 'Auth', 'action' => 'login' ], - 'unauthorizedRedirect'=>$this->referer() + 'unauthorizedRedirect' => $this->referer() ]); } diff --git a/src/Controller/AuthController.php b/src/Controller/AuthController.php index 18c47b5..39a5868 100644 --- a/src/Controller/AuthController.php +++ b/src/Controller/AuthController.php @@ -28,6 +28,8 @@ public function login() $user = $this->Auth->identify(); if ($user) { $this->Auth->setUser($user); + + return $this->redirect($this->Auth->redirectUrl()); } $this->Flash->error(__('Invalid username or password, try again')); @@ -43,5 +45,4 @@ public function logout() { return $this->redirect($this->Auth->logout()); } - } diff --git a/src/Controller/PetitionController.php b/src/Controller/PetitionController.php index 11e9053..b924b76 100644 --- a/src/Controller/PetitionController.php +++ b/src/Controller/PetitionController.php @@ -36,7 +36,8 @@ public function index() $this->add(); } - public function listSignature(){ + public function listSignature() + { $signatures = $this->paginate($this->Signatures); $this->set(compact('signatures')); @@ -50,6 +51,8 @@ public function add() $petition = $this->Signatures->patchEntity($signature, $this->request->data); if ($this->Signatures->save($signature)) { $this->Flash->success(__('The signature has been saved.')); + + return $this->redirect(['action' => 'thank']); } else { $this->Flash->error(__('The signature could not be saved. Please, try again.')); @@ -66,8 +69,5 @@ public function add() */ public function thank() { - } - - } diff --git a/src/Controller/PostsController.php b/src/Controller/PostsController.php index 4ed2b59..e1b61d7 100644 --- a/src/Controller/PostsController.php +++ b/src/Controller/PostsController.php @@ -61,6 +61,8 @@ public function add() $post->user_id = $this->Auth->user('id'); if ($this->Posts->save($post)) { $this->Flash->success(__('The post has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The post could not be saved. Please, try again.')); @@ -88,6 +90,8 @@ public function edit($id = null) $post = $this->Posts->patchEntity($post, $this->request->data); if ($this->Posts->save($post)) { $this->Flash->success(__('The post has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The post could not be saved. Please, try again.')); @@ -114,7 +118,8 @@ public function delete($id = null) } else { $this->Flash->error(__('The post could not be deleted. Please, try again.')); } + + return $this->redirect(['action' => 'index']); } - } diff --git a/src/Controller/SignaturesController.php b/src/Controller/SignaturesController.php index 0d38ce2..2004ae9 100644 --- a/src/Controller/SignaturesController.php +++ b/src/Controller/SignaturesController.php @@ -53,6 +53,8 @@ public function add() $signature = $this->Signatures->patchEntity($signature, $this->request->data); if ($this->Signatures->save($signature)) { $this->Flash->success(__('The signature has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The signature could not be saved. Please, try again.')); @@ -78,6 +80,8 @@ public function edit($id = null) $signature = $this->Signatures->patchEntity($signature, $this->request->data); if ($this->Signatures->save($signature)) { $this->Flash->success(__('The signature has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The signature could not be saved. Please, try again.')); @@ -103,6 +107,8 @@ public function delete($id = null) } else { $this->Flash->error(__('The signature could not be deleted. Please, try again.')); } + + return $this->redirect(['action' => 'index']); } } diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php index a94895f..8457ac0 100644 --- a/src/Controller/UsersController.php +++ b/src/Controller/UsersController.php @@ -53,6 +53,8 @@ public function add() $user = $this->Users->patchEntity($user, $this->request->data); if ($this->Users->save($user)) { $this->Flash->success(__('The user has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The user could not be saved. Please, try again.')); @@ -78,6 +80,8 @@ public function edit($id = null) $user = $this->Users->patchEntity($user, $this->request->data); if ($this->Users->save($user)) { $this->Flash->success(__('The user has been saved.')); + + return $this->redirect(['action' => 'index']); } else { $this->Flash->error(__('The user could not be saved. Please, try again.')); @@ -103,6 +107,8 @@ public function delete($id = null) } else { $this->Flash->error(__('The user could not be deleted. Please, try again.')); } + + return $this->redirect(['action' => 'index']); } } diff --git a/src/Model/Entity/Post.php b/src/Model/Entity/Post.php index 6780fa5..a24bcf5 100644 --- a/src/Model/Entity/Post.php +++ b/src/Model/Entity/Post.php @@ -35,7 +35,8 @@ class Post extends Entity 'id' => false ]; - public function isHasBennModifited(){ + public function isHasBennModifited() + { // Lte = Less or equal return $this->created->modify('+15 minutes')->lte($this->modified); } diff --git a/src/Model/Entity/User.php b/src/Model/Entity/User.php index 1006f30..2977420 100644 --- a/src/Model/Entity/User.php +++ b/src/Model/Entity/User.php @@ -44,7 +44,7 @@ class User extends Entity protected function _setPassword($password) { - if(strlen($password) > 0){ + if (strlen($password) > 0) { return (new DefaultPasswordHasher)->hash($password); } } diff --git a/src/Model/Table/PostsTable.php b/src/Model/Table/PostsTable.php index 5207b60..91920ac 100644 --- a/src/Model/Table/PostsTable.php +++ b/src/Model/Table/PostsTable.php @@ -76,7 +76,7 @@ public function validationDefault(Validator $validator) $validator ->requirePresence('link_target', 'create') - ->allowEmpty('link_target', function($context) { + ->allowEmpty('link_target', function ($context) { return $context && $context['data'] && $context['data']['type'] != 'link'; }); @@ -93,6 +93,8 @@ public function validationDefault(Validator $validator) public function buildRules(RulesChecker $rules) { $rules->add($rules->existsIn(['user_id'], 'Users')); + + return $rules; } diff --git a/src/Model/Table/SignaturesTable.php b/src/Model/Table/SignaturesTable.php index 3e79287..6f1394a 100644 --- a/src/Model/Table/SignaturesTable.php +++ b/src/Model/Table/SignaturesTable.php @@ -86,6 +86,8 @@ public function validationDefault(Validator $validator) public function buildRules(RulesChecker $rules) { $rules->add($rules->isUnique(['email'])); + + return $rules; } } diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php index b8bff7b..3eac473 100644 --- a/src/Model/Table/UsersTable.php +++ b/src/Model/Table/UsersTable.php @@ -90,6 +90,8 @@ public function buildRules(RulesChecker $rules) { $rules->add($rules->isUnique(['login'])); $rules->add($rules->isUnique(['email'])); + + return $rules; } } diff --git a/src/Shell/ConsoleShell.php b/src/Shell/ConsoleShell.php index 2b38906..8d04572 100644 --- a/src/Shell/ConsoleShell.php +++ b/src/Shell/ConsoleShell.php @@ -42,6 +42,8 @@ public function main() $this->err(''); $this->err('