phpsrbija / unfinished

packages/Admin/src/Mapper/AdminUsersMapper.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -54,12 +54,12 @@ 
      */
     public function updateLogin(string $userId): int
     {
-        return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
+        return $this->update([ 'last_login' => date('Y-m-d H:i:s') ], [ 'admin_user_id' => $userId ]);
     }
 
     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_id', $userId);
 
@@ -69,7 +69,7 @@ 
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()
-            ->where(['status' => 1])
+            ->where([ 'status' => 1 ])
             ->order(new Expression('rand()'))
             ->limit($limit);
 
@@ -78,7 +78,7 @@ 
 
     public function getUuid($adminUserId)
     {
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
 
         if (!$user) {
             throw new \Exception('Admin user does not exist!', 400);

packages/Admin/src/Controller/UserController.php

Spacing +5 added lines, -5 removed lines

@@ -67,14 +67,14 @@ 
     {
         $user = $this->session->getStorage()->user;
         $params = $this->request->getQueryParams();
-        $page = isset($params['page']) ? $params['page'] : 1;
-        $limit = isset($params['limit']) ? $params['limit'] : 15;
+        $page = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
+        $limit = isset($params[ 'limit' ]) ? $params[ 'limit' ] : 15;
 
         $adminUsers = $this->adminUserService->getPagination($page, $limit, $user->admin_user_id);
 
         return new HtmlResponse($this->template->render(
             'admin::user/index',
-            ['list' => $adminUsers, 'layout' => 'layout/admin'])
+            [ 'list' => $adminUsers, 'layout' => 'layout/admin' ])
         );
     }
 
@@ -83,13 +83,13 @@ 
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function edit($errors = []): \Psr\Http\Message\ResponseInterface
+    public function edit($errors = [ ]): \Psr\Http\Message\ResponseInterface
     {
         $id = $this->request->getAttribute('id');
         $user = $this->adminUserService->getUser($id);
 
         if ($this->request->getParsedBody()) {
-            $user = (object)($this->request->getParsedBody() + (array)$user);
+            $user = (object) ($this->request->getParsedBody() + (array) $user);
             $user->admin_user_id = $id;
         }
 

packages/Admin/src/Controller/AuthController.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
 
-        return new HtmlResponse($this->template->render('admin::login', ['layout' => false, 'error' => $error]));
+        return new HtmlResponse($this->template->render('admin::login', [ 'layout' => false, 'error' => $error ]));
     }
 
     /**
@@ -83,8 +83,8 @@ 
         }
 
         $data = $this->request->getParsedBody();
-        $email = isset($data['email']) ? $data['email'] : null;
-        $password = isset($data['password']) ? $data['password'] : null;
+        $email = isset($data[ 'email' ]) ? $data[ 'email' ] : null;
+        $password = isset($data[ 'password' ]) ? $data[ 'password' ] : null;
 
         try {
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);

packages/Admin/src/Service/AdminUserService.php

Spacing +15 added lines, -15 removed lines

@@ -134,10 +134,10 @@ 
             'profile_img' => $this->upload->uploadImage($data, 'profile_img')
         ];
 
-        unset($data['confirm_password']);
-        $data['password'] = $this->crypt->create($data['password']);
-        $data['admin_user_id'] = Uuid::uuid1()->toString();
-        $data['admin_user_uuid'] = (new MysqlUuid($data['admin_user_id']))->toFormat(new Binary);
+        unset($data[ 'confirm_password' ]);
+        $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
+        $data[ 'admin_user_id' ] = Uuid::uuid1()->toString();
+        $data[ 'admin_user_uuid' ] = (new MysqlUuid($data[ 'admin_user_id' ]))->toFormat(new Binary);
 
         return $this->adminUsersMapper->insert($data);
     }
@@ -151,13 +151,13 @@ 
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
         // we dont want to force user to enter the password again
-        if ($data['password'] == '') {
+        if ($data[ 'password' ] == '') {
             $filter->remove('password');
             $filter->remove('confirm_password');
         }
 
         // if we want to keep same email
-        if ($user->email == $data['email']) {
+        if ($user->email == $data[ 'email' ]) {
             $filter->remove('email');
         }
 
@@ -171,24 +171,24 @@ 
         ];
 
         // We don't want to force user to re-upload image on edit
-        if (!$data['face_img']) {
-            unset($data['face_img']);
+        if (!$data[ 'face_img' ]) {
+            unset($data[ 'face_img' ]);
         } else {
             $this->upload->deleteFile($user->face_img);
         }
 
-        if (!$data['profile_img']) {
-            unset($data['profile_img']);
+        if (!$data[ 'profile_img' ]) {
+            unset($data[ 'profile_img' ]);
         } else {
             $this->upload->deleteFile($user->profile_img);
         }
 
-        if (isset($data['password'])) {
-            unset($data['confirm_password']);
-            $data['password'] = $this->crypt->create($data['password']);
+        if (isset($data[ 'password' ])) {
+            unset($data[ 'confirm_password' ]);
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
         }
 
-        return $this->adminUsersMapper->update($data, ['admin_user_id' => $userId]);
+        return $this->adminUsersMapper->update($data, [ 'admin_user_id' => $userId ]);
     }
 
     /**
@@ -207,7 +207,7 @@ 
         $this->upload->deleteFile($adminUser->face_img);
         $this->upload->deleteFile($adminUser->profile_img);
 
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 
     /**

packages/Admin/src/Filter/AdminUserFilter.php

Spacing +17 added lines, -17 removed lines

@@ -26,10 +26,10 @@ 
                 [
                     'name' => 'first_name',
                     'required' => true,
-                    'filters' => [['name' => 'StringTrim']],
+                    'filters' => [ [ 'name' => 'StringTrim' ] ],
                     'validators' => [
-                        ['name' => 'NotEmpty'],
-                        ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                        [ 'name' => 'NotEmpty' ],
+                        [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                     ],
                 ]
             );
@@ -38,10 +38,10 @@ 
                 [
                     'name' => 'last_name',
                     'required' => true,
-                    'filters' => [['name' => 'StringTrim']],
+                    'filters' => [ [ 'name' => 'StringTrim' ] ],
                     'validators' => [
-                        ['name' => 'NotEmpty'],
-                        ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                        [ 'name' => 'NotEmpty' ],
+                        [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                     ],
                 ]
             );
@@ -50,13 +50,13 @@ 
                 [
                     'name' => 'email',
                     'required' => true,
-                    'filters' => [['name' => 'StringTrim']],
+                    'filters' => [ [ 'name' => 'StringTrim' ] ],
                     'validators' => [
-                        ['name' => 'NotEmpty'],
-                        ['name' => 'EmailAddress'],
+                        [ 'name' => 'NotEmpty' ],
+                        [ 'name' => 'EmailAddress' ],
                         [
                             'name' => 'dbnorecordexists',
-                            'options' => ['adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email']
+                            'options' => [ 'adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email' ]
                         ],
                     ],
                 ]
@@ -66,7 +66,7 @@ 
                 [
                     'name' => 'introduction',
                     'required' => false,
-                    'filters' => [['name' => 'StringTrim']]
+                    'filters' => [ [ 'name' => 'StringTrim' ] ]
                 ]
             );
 
@@ -74,7 +74,7 @@ 
                 [
                     'name' => 'biography',
                     'required' => false,
-                    'filters' => [['name' => 'StringTrim']]
+                    'filters' => [ [ 'name' => 'StringTrim' ] ]
                 ]
             );
 
@@ -83,8 +83,8 @@ 
                     'name' => 'password',
                     'required' => true,
                     'validators' => [
-                        ['name' => 'NotEmpty'],
-                        ['name' => 'StringLength', 'options' => ['min' => 7, 'max' => 255]]
+                        [ 'name' => 'NotEmpty' ],
+                        [ 'name' => 'StringLength', 'options' => [ 'min' => 7, 'max' => 255 ] ]
                     ],
                 ]
             );
@@ -94,8 +94,8 @@ 
                     'name' => 'confirm_password',
                     'required' => true,
                     'validators' => [
-                        ['name' => 'NotEmpty'],
-                        ['name' => 'Identical', 'options' => ['token' => 'password']],
+                        [ 'name' => 'NotEmpty' ],
+                        [ 'name' => 'Identical', 'options' => [ 'token' => 'password' ] ],
                     ],
                 ]
             );
@@ -104,7 +104,7 @@ 
                 [
                     'name' => 'status',
                     'required' => true,
-                    'validators' => [['name' => 'NotEmpty'], ['name' => 'Digits']]
+                    'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Digits' ] ]
                 ]
             );
 

packages/Article/src/Mapper/ArticleMapper.php

Spacing +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
     public function getCategories($articleId)
     {
         $select = $this->getSql()->select()
-            ->columns([])
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['name', 'slug', 'category_id'])
-            ->where(['articles.article_id' => $articleId]);
+            ->columns([ ])
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'name', 'slug', 'category_id' ])
+            ->where([ 'articles.article_id' => $articleId ]);
 
         return $this->selectWith($select);
     }

packages/Article/src/Mapper/ArticlePostsMapper.php

Spacing +21 added lines, -21 removed lines

@@ -33,24 +33,24 @@ 
     public function getPaginationSelect()
     {
         return $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('category', 'articles.category_uuid = category.category_uuid', ['category_name' => 'name'], 'left')
-            ->where(['articles.type' => ArticleType::POST])
-            ->order(['created_at' => 'desc']);
+            ->join('category', 'articles.category_uuid = category.category_uuid', [ 'category_name' => 'name' ], 'left')
+            ->where([ 'articles.type' => ArticleType::POST ])
+            ->order([ 'created_at' => 'desc' ]);
     }
 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
             ->join(
                 'category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left'
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left'
             )
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -59,16 +59,16 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['category_slug' => 'slug'])
-            ->where(['articles.status' => 1])
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'category_slug' => 'slug' ])
+            ->where([ 'articles.status' => 1 ])
             ->limit(1);
 
         if ($direction > 0) {
             $select->where->greaterThan('published_at', $publishedAt);
-            $select->order(['published_at' => 'asc']);
+            $select->order([ 'published_at' => 'asc' ]);
         } elseif ($direction < 0) {
             $select->where->lessThan('published_at', $publishedAt);
-            $select->order(['published_at' => 'desc']);
+            $select->order([ 'published_at' => 'desc' ]);
         }
 
         return $this->selectWith($select)->current();
@@ -77,17 +77,17 @@ 
     public function getBySlug($slug)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
             ->join(
                 'category',
                 'category.category_uuid = articles.category_uuid',
-                ['category_name' => 'name', 'category_slug' => 'slug']
+                [ 'category_name' => 'name', 'category_slug' => 'slug' ]
             )->join(
                 'admin_users',
                 'admin_users.admin_user_uuid = articles.admin_user_uuid',
-                ['first_name', 'last_name'])
-            ->where(['articles.slug' => $slug, 'articles.status' => 1]);
+                [ 'first_name', 'last_name' ])
+            ->where([ 'articles.slug' => $slug, 'articles.status' => 1 ]);
 
         return $this->selectWith($select)->current();
     }
@@ -95,7 +95,7 @@ 
     public function getAll()
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', ['article_id', 'slug']);
+            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', [ 'article_id', 'slug' ]);
 
         return $this->selectWith($select);
     }
@@ -104,13 +104,13 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['first_name', 'last_name'])
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'first_name', 'last_name' ])
             ->join(
                 'category', 'category.category_uuid = articles.category_uuid',
-                ['category_name' => 'name', 'category_id', 'category_slug' => 'slug']
+                [ 'category_name' => 'name', 'category_id', 'category_slug' => 'slug' ]
             )
-            ->where(['articles.status' => 1])
-            ->order(['articles.published_at' => 'desc'])
+            ->where([ 'articles.status' => 1 ])
+            ->order([ 'articles.published_at' => 'desc' ])
             ->limit($limit);
 
         return $this->selectWith($select);

packages/Article/src/Mapper/ArticleDiscussionsMapper.php

Spacing +7 added lines, -7 removed lines

@@ -22,23 +22,23 @@
     public function getPaginationSelect()
     {
         return $this->getSql()->select()
-            ->columns(['title', 'body'])
+            ->columns([ 'title', 'body' ])
             ->join('articles', 'article_discussions.article_uuid = articles.article_uuid')
-            ->where(['articles.type' => ArticleType::DISCUSSION])
-            ->order(['created_at' => 'desc']);
+            ->where([ 'articles.type' => ArticleType::DISCUSSION ])
+            ->order([ 'created_at' => 'desc' ]);
     }
 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body'])
+            ->columns([ 'title', 'body' ])
             ->join('articles', 'article_discussions.article_uuid = articles.article_uuid')
             ->join(
                 'category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left'
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left'
             )
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }

packages/Article/src/Service/DiscussionService.php

Spacing +11 added lines, -11 removed lines

@@ -68,16 +68,16 @@ 
 
         $article = $articleFilter->getValues();
         $article += [
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
             'type' => ArticleType::DISCUSSION,
             'article_id' => $id,
             'article_uuid' => $uuId
         ];
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
-        $discussion = $discussionFilter->getValues() + ['article_uuid' => $uuId];
+        $discussion = $discussionFilter->getValues() + [ 'article_uuid' => $uuId ];
 
         $this->articleMapper->insert($article);
         $this->articleDiscussionsMapper->insert($discussion);
@@ -93,15 +93,15 @@ 
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
         $discussion = $discussionFilter->getValues();
 
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleDiscussionsMapper->update($discussion, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleDiscussionsMapper->update($discussion, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
@@ -112,7 +112,7 @@ 
             throw new \Exception('Article not found!');
         }
 
-        $this->articleDiscussionsMapper->delete(['article_uuid' => $discussion->article_uuid]);
+        $this->articleDiscussionsMapper->delete([ 'article_uuid' => $discussion->article_uuid ]);
         $this->delete($discussion->article_uuid);
     }
 }