phpsrbija / unfinished

src/Web/Middleware/Layout.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
         if (0 === strpos($request->getUri()->getPath(), '/admin')) {
-            $this->config['templates']['layout'] = 'layout/admin';
+            $this->config[ 'templates' ][ 'layout' ] = 'layout/admin';
         }
 
         return $next($request, $response);

src/Core/Service/AdminUserService.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 namespace Core\Service;
 
 use Core\Mapper\AdminUsersMapper;
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\Sql\Predicate\Expression;
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Paginator\Paginator;
 use Zend\Crypt\Password\Bcrypt;

Doc Comments +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
      * Update or Insert user.
      *
      * @param Array $data  Data from POST
-     * @param null $userId UUID of user if we want to edit or 0 to add new user
+     * @param integer $userId UUID of user if we want to edit or 0 to add new user
      * @throws \Exception
      */
     public function save($data, $userId = 0)

Spacing +12 added lines, -12 removed lines

@@ -52,15 +52,15 @@ 
     {
         $user = $this->adminUsersMapper->getByEmail($email);
 
-        if(!$user){
+        if (!$user) {
             throw new \Exception('User does not exist.');
         }
 
-        if(!$this->crypt->verify($password, $user->password)){
+        if (!$this->crypt->verify($password, $user->password)) {
             throw new \Exception('Password does not match.');
         }
 
-        if($user->status != 1){
+        if ($user->status != 1) {
             throw new \Exception('User is not active.');
         }
 
@@ -112,18 +112,18 @@ 
     public function save($data, $userId = 0)
     {
         //@todo Validate data
-        if($data['password'] == ''){
-            unset($data['password']);
+        if ($data[ 'password' ] == '') {
+            unset($data[ 'password' ]);
         }
-        else{
-            $data['password'] = $this->crypt->create($data['password']);
+        else {
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
         }
 
-        if($userId){
-            $this->adminUsersMapper->update($data, ['admin_user_uuid' => $userId]);
+        if ($userId) {
+            $this->adminUsersMapper->update($data, [ 'admin_user_uuid' => $userId ]);
         }
-        else{
-            $data['admin_user_uuid'] = Uuid::uuid1()->toString();
+        else {
+            $data[ 'admin_user_uuid' ] = Uuid::uuid1()->toString();
             $this->adminUsersMapper->insert($data);
         }
     }
@@ -136,6 +136,6 @@ 
      */
     public function delete($userId)
     {
-        return (bool)$this->adminUsersMapper->delete(['admin_user_uuid' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_uuid' => $userId ]);
     }
 }

Braces +2 added lines, -4 removed lines

@@ -114,15 +114,13 @@
         //@todo Validate data
         if($data['password'] == ''){
             unset($data['password']);
-        }
-        else{
+        } else{
             $data['password'] = $this->crypt->create($data['password']);
         }
 
         if($userId){
             $this->adminUsersMapper->update($data, ['admin_user_uuid' => $userId]);
-        }
-        else{
+        } else{
             $data['admin_user_uuid'] = Uuid::uuid1()->toString();
             $this->adminUsersMapper->insert($data);
         }

data/phinx/migrations/20160908142829_admin_users.php

Spacing +10 added lines, -10 removed lines

@@ -6,27 +6,27 @@
 {
     public function up()
     {
-        $this->table('admin_users', ['id' => false, 'primary_key' => 'admin_user_uuid'])
-            ->addColumn('admin_user_uuid', 'binary', ['limit' => 16])
+        $this->table('admin_users', [ 'id' => false, 'primary_key' => 'admin_user_uuid' ])
+            ->addColumn('admin_user_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('first_name', 'text')
             ->addColumn('last_name', 'text')
-            ->addColumn('email', 'string', ['limit' => 128])
-            ->addColumn('password', 'char', ['limit' => 60])
-            ->addColumn('status', 'integer', ['default' => 0])// 0 => not active, 1 = active
-            ->addColumn('created_at', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
-            ->addColumn('last_login', 'datetime', ['null' => true])
-            ->addIndex(['email'], ['name' => 'email_INDEX'])
+            ->addColumn('email', 'string', [ 'limit' => 128 ])
+            ->addColumn('password', 'char', [ 'limit' => 60 ])
+            ->addColumn('status', 'integer', [ 'default' => 0 ])// 0 => not active, 1 = active
+            ->addColumn('created_at', 'datetime', [ 'default' => 'CURRENT_TIMESTAMP' ])
+            ->addColumn('last_login', 'datetime', [ 'null' => true ])
+            ->addIndex([ 'email' ], [ 'name' => 'email_INDEX' ])
             ->create();
 
         $faker = Faker\Factory::create();
         $count = rand(100, 150);
-        for($i = 0; $i < $count; $i++){
+        for ($i = 0; $i < $count; $i++) {
             $data = [
                 'admin_user_uuid' => $faker->uuid,
                 'email'           => $faker->email,
                 'first_name'      => $faker->firstName,
                 'last_name'       => $faker->lastName,
-                'password'        => '$2y$10$jhGH8RXl269ho1CrLaDiregVuW84HegLHmBFUCKTgDQTH2XgPZyBK',//password = testtest
+                'password'        => '$2y$10$jhGH8RXl269ho1CrLaDiregVuW84HegLHmBFUCKTgDQTH2XgPZyBK', //password = testtest
                 'status'          => rand(0, 1),
                 'last_login'      => rand(0, 10) === 7 ? null : $faker->dateTimeBetween('-10 days', 'now')->format('Y-m-d H:i:s'),
                 'created_at'      => $faker->dateTimeBetween('-20 days', '-10 days')->format('Y-m-d H:i:s'),

config/autoload/routes.global.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
             'name'            => 'home',
             'path'            => '/',
             'middleware'      => Web\Action\IndexAction::class,
-            'allowed_methods' => ['GET'],
+            'allowed_methods' => [ 'GET' ],
         ],
         [
             'name'       => 'about',
@@ -40,13 +40,13 @@ 
             'name'            => 'api.ping',
             'path'            => '/api/ping',
             'middleware'      => Web\Action\PingAction::class,
-            'allowed_methods' => ['GET'],
+            'allowed_methods' => [ 'GET' ],
         ],
         [
             'name'            => 'auth',
             'path'            => '/auth/:action',
             'middleware'      => Admin\Controller\AuthController::class,
-            'allowed_methods' => ['GET', 'POST'],
+            'allowed_methods' => [ 'GET', 'POST' ],
         ],
 
         // Admin
@@ -54,31 +54,31 @@ 
             'name'            => 'admin',
             'path'            => '/admin',
             'middleware'      => Admin\Action\IndexAction::class,
-            'allowed_methods' => ['GET'],
+            'allowed_methods' => [ 'GET' ],
         ],
         [
             'name'            => 'admin.users',
             'path'            => '/admin/users',
             'middleware'      => Admin\Controller\UserController::class,
-            'allowed_methods' => ['GET']
+            'allowed_methods' => [ 'GET' ]
         ],
         [
             'name'            => 'admin.users.action',
             'path'            => '/admin/users/:action/:id',
             'middleware'      => Admin\Controller\UserController::class,
-            'allowed_methods' => ['GET', 'POST']
+            'allowed_methods' => [ 'GET', 'POST' ]
         ],
         [
             'name'            => 'admin.tags',
             'path'            => '/admin/tags',
             'middleware'      => Admin\Controller\TagController::class,
-            'allowed_methods' => ['GET'],
+            'allowed_methods' => [ 'GET' ],
         ],
         [
             'name'            => 'admin.posts',
             'path'            => '/admin/posts',
             'middleware'      => Admin\Controller\PostController::class,
-            'allowed_methods' => ['GET'],
+            'allowed_methods' => [ 'GET' ],
         ],
     ],
 ];

src/Core/Mapper/AdminUsersMapper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_uuid' => $id])->current();
+        return $this->select([ 'admin_user_uuid' => $id ])->current();
     }
 
     /**
@@ -42,7 +42,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -53,12 +53,12 @@ 
      */
     public function updateLogin(string $uuid) : int
     {
-        return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_uuid' => $uuid]);
+        return $this->update([ 'last_login' => date('Y-m-d H:i:s') ], [ 'admin_user_uuid' => $uuid ]);
     }
 
     public function getPaginationSelect($userId)
     {
-        $select = $this->getSql()->select()->order(['created_at' => 'desc']);
+        $select = $this->getSql()->select()->order([ 'created_at' => 'desc' ]);
 
         $select->where->notEqualTo('admin_user_uuid', $userId);
 

src/Admin/Controller/UserController.php

Spacing +9 added lines, -9 removed lines

@@ -64,8 +64,8 @@ 
     {
         $user   = $this->session->getStorage()->user;
         $params = $this->request->getQueryParams();
-        $page   = isset($params['page']) ? $params['page'] : self::DEFAUTL_PAGE;
-        $limit  = isset($params['limit']) ? $params['limit'] : self::DEFAUTL_LIMIT;
+        $page   = isset($params[ 'page' ]) ? $params[ 'page' ] : self::DEFAUTL_PAGE;
+        $limit  = isset($params[ 'limit' ]) ? $params[ 'limit' ] : self::DEFAUTL_LIMIT;
 
         //$filter = [
         //    'first_name' => isset($params['first_name']) ? $params['first_name'] : '',
@@ -74,7 +74,7 @@ 
 
         $adminUsers = $this->adminUserService->getPagination($page, $limit, $user->admin_user_uuid);
 
-        return new HtmlResponse($this->template->render('admin::user/index', ['list' => $adminUsers]));
+        return new HtmlResponse($this->template->render('admin::user/index', [ 'list' => $adminUsers ]));
     }
 
     /**
@@ -87,12 +87,12 @@ 
         $userId = $this->request->getAttribute('id');
         $user   = $this->adminUserService->getUser($userId);
 
-        return new HtmlResponse($this->template->render('admin::user/edit', ['user' => $user]));
+        return new HtmlResponse($this->template->render('admin::user/edit', [ 'user' => $user ]));
     }
 
     public function doedit()
     {
-        try{
+        try {
             $userId = $this->request->getAttribute('id');
             $data   = $this->request->getParsedBody();
 
@@ -100,23 +100,23 @@ 
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
-        catch(\Exception $e){
+        catch (\Exception $e) {
             return $this->response->withStatus(302)->withHeader(
                 'Location',
-                $this->router->generateUri('admin.users.action', ['action' => 'edit', 'id' => $userId])
+                $this->router->generateUri('admin.users.action', [ 'action' => 'edit', 'id' => $userId ])
             );
         }
     }
 
     public function delete()
     {
-        try{
+        try {
             $userId = $this->request->getAttribute('id');
             $this->adminUserService->delete($userId);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
-        catch(\Exception $e){
+        catch (\Exception $e) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
     }

Braces +2 added lines, -4 removed lines

@@ -99,8 +99,7 @@ 
             $this->adminUserService->save($data, $userId);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
-        }
-        catch(\Exception $e){
+        } catch(\Exception $e){
             return $this->response->withStatus(302)->withHeader(
                 'Location',
                 $this->router->generateUri('admin.users.action', ['action' => 'edit', 'id' => $userId])
@@ -115,8 +114,7 @@ 
             $this->adminUserService->delete($userId);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
-        }
-        catch(\Exception $e){
+        } catch(\Exception $e){
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
     }