phpsrbija / unfinished

src/Web/Action/EventsAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -53,7 +53,7 @@ 
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
         $params       = $request->getQueryParams();
-        $page         = isset($params['page']) ? $params['page'] : 1;
+        $page         = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
         $futureEvents = $this->eventService->fetchFutureEvents();
         $pastEvents   = $this->eventService->fetchPastEventsPagination($page, 10);
 

src/Core/Filter/AdminUserFilter.php

Spacing +18 added lines, -18 removed lines

@@ -19,37 +19,37 @@ 
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter){
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
                 '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 ] ]
                 ],
             ]);
 
             $inputFilter->add([
                 '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 ] ]
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'email',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'EmailAddress'],
-                    ['name' => 'dbnorecordexists', 'options' => ['adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'EmailAddress' ],
+                    [ 'name' => 'dbnorecordexists', 'options' => [ 'adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email' ] ],
 
                 ],
             ]);
@@ -57,21 +57,21 @@ 
             $inputFilter->add([
                 'name'     => 'introduction',
                 'required' => false,
-                'filters'  => [['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'biography',
                 'required' => false,
-                'filters'  => [['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
             ]);
 
             $inputFilter->add([
                 'name'       => 'password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 7, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 7, 'max' => 255 ] ]
                 ],
             ]);
 
@@ -79,15 +79,15 @@ 
                 'name'       => 'confirm_password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'Identical', 'options' => ['token' => 'password']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'Identical', 'options' => [ 'token' => 'password' ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'status',
                 'required'   => true,
-                'validators' => [['name' => 'NotEmpty'], ['name' => 'Digits']]
+                'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Digits' ] ]
             ]);
 
             $this->inputFilter = $inputFilter;

src/Core/Factory/Service/MeetupApiServiceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Factory\Service;
 
@@ -16,8 +16,8 @@ 
      */
     public function __invoke(ContainerInterface $container): MeetupApiService
     {
-        $config = $container->get('config')['meetupApi'];
+        $config = $container->get('config')[ 'meetupApi' ];
 
-        return new MeetupApiService($config['key']);
+        return new MeetupApiService($config[ 'key' ]);
     }
 }

src/Menu/src/View/Helper/MenuUrlHelper.php

Spacing +6 added lines, -6 removed lines

@@ -33,16 +33,16 @@
      */
     public function __invoke($menuItem)
     {
-        if($menuItem['href']) {
-            return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
+        if ($menuItem[ 'href' ]) {
+            return strpos($menuItem[ 'href' ], 'http') === 0 ? $menuItem[ 'href' ] : '/' . $menuItem[ 'href' ];
         }
-        elseif($menuItem['article_slug']) {
-            $params = ['segment_1' => $menuItem['category_slug'], 'segment_2' => $menuItem['article_slug']];
+        elseif ($menuItem[ 'article_slug' ]) {
+            $params = [ 'segment_1' => $menuItem[ 'category_slug' ], 'segment_2' => $menuItem[ 'article_slug' ] ];
 
             return $this->url->__invoke('post', $params);
         }
-        elseif($menuItem['category_slug']) {
-            return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
+        elseif ($menuItem[ 'category_slug' ]) {
+            return $this->url->__invoke('category', [ 'category' => $menuItem[ 'category_slug' ] ]);
         }
         else {
             return '#';

src/Core/Mapper/AdminUsersMapper.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Mapper;
 
@@ -33,7 +33,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -55,12 +55,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);
 
@@ -70,7 +70,7 @@ 
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()
-            ->where(['status' => 1])
+            ->where([ 'status' => 1 ])
             ->order(new Expression('rand()'))
             ->limit($limit);
 
@@ -79,9 +79,9 @@ 
 
     public function getUuid($adminUserId)
     {
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('Admin user does not exist!', 400);
         }
 

src/Article/src/Mapper/ArticleDiscussionsMapper.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -21,21 +21,21 @@ 
     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')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+                [ '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 ]);
 
         return $this->selectWith($select)->current();
     }

src/Article/src/Service/EventService.php

Spacing +18 added lines, -18 removed lines

@@ -87,7 +87,7 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
         }
 
@@ -96,15 +96,15 @@ 
 
         $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::EVENT,
             'article_id'      => $id,
             'article_uuid'    => $uuId
         ];
-        unset($article['admin_user_id']);
+        unset($article[ 'admin_user_id' ]);
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ]);
 
         $event = $eventFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -122,42 +122,42 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
         $event   = $eventFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img'     => $this->upload->uploadImage($data, 'main_img')
             ];
 
-        $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' ]);
 
         // We dont want to force user to re-upload image on edit
-        if(!$event['featured_img']) {
-            unset($event['featured_img']);
+        if (!$event[ 'featured_img' ]) {
+            unset($event[ 'featured_img' ]);
         }
 
-        if(!$event['main_img']) {
-            unset($event['main_img']);
+        if (!$event[ 'main_img' ]) {
+            unset($event[ 'main_img' ]);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleEventsMapper->update($event, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleEventsMapper->update($event, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
     {
         $event = $this->articleEventsMapper->get($id);
 
-        if(!$event) {
+        if (!$event) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articleEventsMapper->delete(['article_uuid' => $event->article_uuid]);
+        $this->articleEventsMapper->delete([ 'article_uuid' => $event->article_uuid ]);
         $this->delete($event->article_uuid);
     }
 

src/Article/src/Service/DiscussionService.php

Spacing +14 added lines, -14 removed lines

@@ -53,7 +53,7 @@ 
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
         }
 
@@ -62,16 +62,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);
@@ -83,30 +83,30 @@ 
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
             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)
     {
         $discussion = $this->articleDiscussionsMapper->get($id);
 
-        if(!$discussion) {
+        if (!$discussion) {
             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);
     }
 }

src/Article/src/Service/PostService.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Service;
 
@@ -95,7 +95,7 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
         }
 
@@ -104,23 +104,23 @@ 
 
         $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::POST,
             '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' ]);
 
         $post = $postFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img'     => $this->upload->uploadImage($data, 'main_img'),
-                'article_uuid' => $article['article_uuid']
+                'article_uuid' => $article[ 'article_uuid' ]
             ];
 
-        if($post['is_homepage']) {
-            $this->articlePostsMapper->update(['is_homepage' => false]);
+        if ($post[ 'is_homepage' ]) {
+            $this->articlePostsMapper->update([ 'is_homepage' => false ]);
         }
 
         $this->articleMapper->insert($article);
@@ -133,46 +133,46 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
         $post    = $postFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img'     => $this->upload->uploadImage($data, 'main_img')
             ];
 
-        $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' ]);
 
         // We dont want to force user to re-upload image on edit
-        if(!$post['featured_img']) {
-            unset($post['featured_img']);
+        if (!$post[ 'featured_img' ]) {
+            unset($post[ 'featured_img' ]);
         }
 
-        if(!$post['main_img']) {
-            unset($post['main_img']);
+        if (!$post[ 'main_img' ]) {
+            unset($post[ 'main_img' ]);
         }
 
-        if($post['is_homepage']) {
-            $this->articlePostsMapper->update(['is_homepage' => false]);
+        if ($post[ 'is_homepage' ]) {
+            $this->articlePostsMapper->update([ 'is_homepage' => false ]);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articlePostsMapper->update($post, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articlePostsMapper->update($post, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
     {
         $post = $this->articlePostsMapper->get($id);
 
-        if(!$post) {
+        if (!$post) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articlePostsMapper->delete(['article_uuid' => $post->article_uuid]);
+        $this->articlePostsMapper->delete([ 'article_uuid' => $post->article_uuid ]);
         $this->delete($post->article_uuid);
     }