Completed
Push — master ( d92200...afdec2 )
by Aleksandar
22s
created
packages/Admin/src/Controller/AuthController.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
     /**
99 99
      * Clears user session.
100 100
      *
101
-     * @return static
101
+     * @return \Psr\Http\Message\ResponseInterface
102 102
      */
103 103
     public function logout(): \Psr\Http\Message\ResponseInterface
104 104
     {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Admin\Controller;
5 5
 
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
      */
61 61
     public function login($error = false): \Psr\Http\Message\ResponseInterface
62 62
     {
63
-        if($this->session->getStorage()->user) {
63
+        if ($this->session->getStorage()->user) {
64 64
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
65 65
         }
66 66
 
67
-        return new HtmlResponse($this->template->render('admin::login', ['layout' => false, 'error' => $error]));
67
+        return new HtmlResponse($this->template->render('admin::login', [ 'layout' => false, 'error' => $error ]));
68 68
     }
69 69
 
70 70
     /**
@@ -74,20 +74,20 @@  discard block
 block discarded – undo
74 74
      */
75 75
     public function loginHandle(): \Psr\Http\Message\ResponseInterface
76 76
     {
77
-        if($this->session->getStorage()->user) {
77
+        if ($this->session->getStorage()->user) {
78 78
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
79 79
         }
80 80
 
81 81
         $data     = $this->request->getParsedBody();
82
-        $email    = isset($data['email']) ? $data['email'] : null;
83
-        $password = isset($data['password']) ? $data['password'] : null;
82
+        $email    = isset($data[ 'email' ]) ? $data[ 'email' ] : null;
83
+        $password = isset($data[ 'password' ]) ? $data[ 'password' ] : null;
84 84
 
85 85
         try {
86 86
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
87 87
 
88 88
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
89 89
         }
90
-        catch(\Exception $e) {
90
+        catch (\Exception $e) {
91 91
             return $this->login($e->getMessage());
92 92
 
93 93
             //@todo set $e->getMessage() to flash messanger and print messages in next page
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@
 block discarded – undo
86 86
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
87 87
 
88 88
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
89
-        }
90
-        catch(\Exception $e) {
89
+        } catch(\Exception $e) {
91 90
             return $this->login($e->getMessage());
92 91
 
93 92
             //@todo set $e->getMessage() to flash messanger and print messages in next page
Please login to merge, or discard this patch.
packages/Article/src/Mapper/ArticleMapper.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,6 @@
 block discarded – undo
7 7
 use Zend\Db\Adapter\AdapterAwareInterface;
8 8
 use Zend\Db\TableGateway\AbstractTableGateway;
9 9
 use Zend\Db\Sql\Delete;
10
-use Zend\Db\Sql\Insert;
11 10
 
12 11
 /**
13 12
  * Class ArticleMapper.
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Article\Mapper;
5 5
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
     public function getCategories($articleId)
46 46
     {
47 47
         $select = $this->getSql()->select()
48
-            ->columns([])
49
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['name', 'slug', 'category_id'])
50
-            ->where(['articles.article_id' => $articleId]);
48
+            ->columns([ ])
49
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'name', 'slug', 'category_id' ])
50
+            ->where([ 'articles.article_id' => $articleId ]);
51 51
 
52 52
         return $this->selectWith($select);
53 53
     }
Please login to merge, or discard this patch.
packages/Article/src/Service/ArticleServiceInterface.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,6 @@
 block discarded – undo
12 12
     /**
13 13
      * Fetches a list of ArticleEntity models.
14 14
      *
15
-     * @param array $params
16 15
      * @return ArrayObject
17 16
      */
18 17
     public function fetchAllArticles($page, $limit);
Please login to merge, or discard this patch.
packages/Article/src/Service/EventService.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -63,6 +63,9 @@
 block discarded – undo
63 63
         return $this->getPagination($select, $page, $limit);
64 64
     }
65 65
 
66
+    /**
67
+     * @param integer $limit
68
+     */
66 69
     public function fetchLatest($limit)
67 70
     {
68 71
         return $this->articleEventsMapper->getLatest($limit);
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
88 88
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
89 89
 
90
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
90
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
91 91
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
92 92
         }
93 93
 
@@ -96,15 +96,15 @@  discard block
 block discarded – undo
96 96
 
97 97
         $article = $articleFilter->getValues();
98 98
         $article += [
99
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
99
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
100 100
             'type'            => ArticleType::EVENT,
101 101
             'article_id'      => $id,
102 102
             'article_uuid'    => $uuId
103 103
         ];
104
-        unset($article['admin_user_id']);
104
+        unset($article[ 'admin_user_id' ]);
105 105
 
106
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
107
-        unset($article['category_id']);
106
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
107
+        unset($article[ 'category_id' ]);
108 108
 
109 109
         $event = $eventFilter->getValues() + [
110 110
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -122,42 +122,42 @@  discard block
 block discarded – undo
122 122
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
123 123
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
124 124
 
125
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
125
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
126 126
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
127 127
         }
128 128
 
129
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
129
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
130 130
         $event   = $eventFilter->getValues() + [
131 131
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
132 132
                 'main_img'     => $this->upload->uploadImage($data, 'main_img')
133 133
             ];
134 134
 
135
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
136
-        $article['category_uuid']   = $this->categoryMapper->get($article['category_id'])->category_uuid;
137
-        unset($article['category_id'], $article['admin_user_id']);
135
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
136
+        $article[ 'category_uuid' ]   = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
137
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
138 138
 
139 139
         // We dont want to force user to re-upload image on edit
140
-        if(!$event['featured_img']) {
141
-            unset($event['featured_img']);
140
+        if (!$event[ 'featured_img' ]) {
141
+            unset($event[ 'featured_img' ]);
142 142
         }
143 143
 
144
-        if(!$event['main_img']) {
145
-            unset($event['main_img']);
144
+        if (!$event[ 'main_img' ]) {
145
+            unset($event[ 'main_img' ]);
146 146
         }
147 147
 
148
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
149
-        $this->articleEventsMapper->update($event, ['article_uuid' => $article['article_uuid']]);
148
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
149
+        $this->articleEventsMapper->update($event, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
150 150
     }
151 151
 
152 152
     public function deleteArticle($id)
153 153
     {
154 154
         $event = $this->articleEventsMapper->get($id);
155 155
 
156
-        if(!$event) {
156
+        if (!$event) {
157 157
             throw new \Exception('Article not found!');
158 158
         }
159 159
 
160
-        $this->articleEventsMapper->delete(['article_uuid' => $event->article_uuid]);
160
+        $this->articleEventsMapper->delete([ 'article_uuid' => $event->article_uuid ]);
161 161
         $this->delete($event->article_uuid);
162 162
     }
163 163
 
Please login to merge, or discard this patch.
packages/Article/src/Service/PostService.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -203,6 +203,9 @@
 block discarded – undo
203 203
         return $this->articleMapper->getCategories($articleId);
204 204
     }
205 205
 
206
+    /**
207
+     * @param integer $limit
208
+     */
206 209
     public function getLatestWeb($limit)
207 210
     {
208 211
         return $this->articlePostsMapper->getLatest($limit);
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Article\Service;
6 6
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
96 96
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
97 97
 
98
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
98
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
99 99
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
100 100
         }
101 101
 
@@ -104,19 +104,19 @@  discard block
 block discarded – undo
104 104
 
105 105
         $article = $articleFilter->getValues();
106 106
         $article += [
107
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
107
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
108 108
             'type'            => ArticleType::POST,
109 109
             'article_id'      => $id,
110 110
             'article_uuid'    => $uuId
111 111
         ];
112 112
 
113
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
114
-        unset($article['category_id'], $article['admin_user_id']);
113
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
114
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
115 115
 
116 116
         $post = $postFilter->getValues() + [
117 117
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
118 118
                 'main_img'     => $this->upload->uploadImage($data, 'main_img'),
119
-                'article_uuid' => $article['article_uuid']
119
+                'article_uuid' => $article[ 'article_uuid' ]
120 120
             ];
121 121
 
122 122
         $this->articleMapper->insert($article);
@@ -129,42 +129,42 @@  discard block
 block discarded – undo
129 129
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
130 130
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
131 131
 
132
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
132
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
133 133
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
134 134
         }
135 135
 
136
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
136
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
137 137
         $post    = $postFilter->getValues() + [
138 138
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
139 139
                 'main_img'     => $this->upload->uploadImage($data, 'main_img')
140 140
             ];
141 141
 
142
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
143
-        $article['category_uuid']   = $this->categoryMapper->get($article['category_id'])->category_uuid;
144
-        unset($article['category_id'], $article['admin_user_id']);
142
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
143
+        $article[ 'category_uuid' ]   = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
144
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
145 145
 
146 146
         // We dont want to force user to re-upload image on edit
147
-        if(!$post['featured_img']) {
148
-            unset($post['featured_img']);
147
+        if (!$post[ 'featured_img' ]) {
148
+            unset($post[ 'featured_img' ]);
149 149
         }
150 150
 
151
-        if(!$post['main_img']) {
152
-            unset($post['main_img']);
151
+        if (!$post[ 'main_img' ]) {
152
+            unset($post[ 'main_img' ]);
153 153
         }
154 154
 
155
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
156
-        $this->articlePostsMapper->update($post, ['article_uuid' => $article['article_uuid']]);
155
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
156
+        $this->articlePostsMapper->update($post, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
157 157
     }
158 158
 
159 159
     public function deleteArticle($id)
160 160
     {
161 161
         $post = $this->articlePostsMapper->get($id);
162 162
 
163
-        if(!$post) {
163
+        if (!$post) {
164 164
             throw new \Exception('Article not found!');
165 165
         }
166 166
 
167
-        $this->articlePostsMapper->delete(['article_uuid' => $post->article_uuid]);
167
+        $this->articlePostsMapper->delete([ 'article_uuid' => $post->article_uuid ]);
168 168
         $this->delete($post->article_uuid);
169 169
     }
170 170
 
Please login to merge, or discard this patch.
packages/Article/src/Service/VideoService.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -91,6 +91,9 @@
 block discarded – undo
91 91
         return $this->getPagination($select, $page, $limit);
92 92
     }
93 93
 
94
+    /**
95
+     * @param integer $limit
96
+     */
94 97
     public function fetchLatest($limit)
95 98
     {
96 99
         return $this->articleVideosMapper->getLatest($limit);
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Article\Service;
6 6
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
107 107
         $videosFilter  = $this->videosFilter->getInputFilter()->setData($data);
108 108
 
109
-        if(!$articleFilter->isValid() || !$videosFilter->isValid()) {
109
+        if (!$articleFilter->isValid() || !$videosFilter->isValid()) {
110 110
             throw new FilterException($articleFilter->getMessages() + $videosFilter->getMessages());
111 111
         }
112 112
 
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 
116 116
         $article = $articleFilter->getValues();
117 117
         $article += [
118
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
118
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
119 119
             'type'            => ArticleType::VIDEO,
120 120
             'article_id'      => $id,
121 121
             'article_uuid'    => $uuId
122 122
         ];
123 123
 
124
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
125
-        unset($article['category_id'], $article['admin_user_id']);
124
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
125
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
126 126
 
127 127
         $videos = $videosFilter->getValues() + [
128 128
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -140,15 +140,15 @@  discard block
 block discarded – undo
140 140
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
141 141
         $videosFilter  = $this->videosFilter->getInputFilter()->setData($data);
142 142
 
143
-        if(!$articleFilter->isValid() || !$videosFilter->isValid()) {
143
+        if (!$articleFilter->isValid() || !$videosFilter->isValid()) {
144 144
             throw new FilterException($articleFilter->getMessages() + $videosFilter->getMessages());
145 145
         }
146 146
 
147
-        $article                    = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
148
-        $article['category_uuid']   = $this->categoryMapper->get($article['category_id'])->category_uuid;
149
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
150
-        unset($article['category_id']);
151
-        unset($article['admin_user_id']);
147
+        $article                    = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
148
+        $article[ 'category_uuid' ]   = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
149
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
150
+        unset($article[ 'category_id' ]);
151
+        unset($article[ 'admin_user_id' ]);
152 152
 
153 153
         $videos = $videosFilter->getValues() + [
154 154
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -156,27 +156,27 @@  discard block
 block discarded – undo
156 156
             ];
157 157
 
158 158
         // We dont want to force user to re-upload image on edit
159
-        if(!$videos['featured_img']) {
160
-            unset($videos['featured_img']);
159
+        if (!$videos[ 'featured_img' ]) {
160
+            unset($videos[ 'featured_img' ]);
161 161
         }
162 162
 
163
-        if(!$videos['main_img']) {
164
-            unset($videos['main_img']);
163
+        if (!$videos[ 'main_img' ]) {
164
+            unset($videos[ 'main_img' ]);
165 165
         }
166 166
 
167
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
168
-        $this->articleVideosMapper->update($videos, ['article_uuid' => $article['article_uuid']]);
167
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
168
+        $this->articleVideosMapper->update($videos, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
169 169
     }
170 170
 
171 171
     public function deleteArticle($id)
172 172
     {
173 173
         $video = $this->articleVideosMapper->get($id);
174 174
 
175
-        if(!$video) {
175
+        if (!$video) {
176 176
             throw new \Exception('Article not found!');
177 177
         }
178 178
 
179
-        $this->articleVideosMapper->delete(['article_uuid' => $video->article_uuid]);
179
+        $this->articleVideosMapper->delete([ 'article_uuid' => $video->article_uuid ]);
180 180
         $this->delete($video->article_uuid);
181 181
     }
182 182
 
Please login to merge, or discard this patch.
packages/Category/src/Mapper/CategoryMapper.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -44,6 +44,9 @@
 block discarded – undo
44 44
         return $select;
45 45
     }
46 46
 
47
+    /**
48
+     * @param integer $limit
49
+     */
47 50
     public function getCategoryPostsSelect($categoryId = null, $limit = null)
48 51
     {
49 52
         $select = $this->getSql()->select()
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Category\Mapper;
6 6
 
@@ -34,12 +34,12 @@  discard block
 block discarded – undo
34 34
 
35 35
     public function get($id)
36 36
     {
37
-        return $this->select(['category_id' => $id])->current();
37
+        return $this->select([ 'category_id' => $id ])->current();
38 38
     }
39 39
 
40 40
     public function getPaginationSelect()
41 41
     {
42
-        $select = $this->getSql()->select()->order(['name' => 'asc']);
42
+        $select = $this->getSql()->select()->order([ 'name' => 'asc' ]);
43 43
 
44 44
         return $select;
45 45
     }
@@ -47,18 +47,18 @@  discard block
 block discarded – undo
47 47
     public function getCategoryPostsSelect($categoryId = null, $limit = null)
48 48
     {
49 49
         $select = $this->getSql()->select()
50
-            ->columns(['category_name' => 'name', 'category_slug' => 'slug'])
51
-            ->join('articles', 'articles.category_uuid = category.category_uuid', ['article_id', 'slug', 'admin_user_uuid', 'published_at'])
52
-            ->join('article_posts', 'article_posts.article_uuid = articles.article_uuid', ['*'], 'right')
53
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id', 'first_name', 'last_name', 'face_img'])
54
-            ->where(['articles.status' => 1])
55
-            ->order(['published_at' => 'desc']);
56
-
57
-        if($categoryId) {
58
-            $select->where(['category_id' => $categoryId]);
50
+            ->columns([ 'category_name' => 'name', 'category_slug' => 'slug' ])
51
+            ->join('articles', 'articles.category_uuid = category.category_uuid', [ 'article_id', 'slug', 'admin_user_uuid', 'published_at' ])
52
+            ->join('article_posts', 'article_posts.article_uuid = articles.article_uuid', [ '*' ], 'right')
53
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id', 'first_name', 'last_name', 'face_img' ])
54
+            ->where([ 'articles.status' => 1 ])
55
+            ->order([ 'published_at' => 'desc' ]);
56
+
57
+        if ($categoryId) {
58
+            $select->where([ 'category_id' => $categoryId ]);
59 59
         }
60 60
 
61
-        if($limit) {
61
+        if ($limit) {
62 62
             $select->limit($limit);
63 63
         }
64 64
 
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
         $select->where->notEqualTo('slug', 'videos');
75 75
         $select->where->notEqualTo('slug', 'events');
76 76
 
77
-        if($limit) {
77
+        if ($limit) {
78 78
             $select->limit($limit);
79 79
         }
80 80
 
81
-        if($order) {
81
+        if ($order) {
82 82
             $select->order($order);
83 83
         } else {
84 84
             $select->order(new Expression('rand()'));
Please login to merge, or discard this patch.
packages/Core/Mapper/AdminUsersMapper.php 2 patches
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,6 +31,9 @@  discard block
 block discarded – undo
31 31
         $this->adapter = $adapter;
32 32
     }
33 33
 
34
+    /**
35
+     * @param string $id
36
+     */
34 37
     public function get($id)
35 38
     {
36 39
         return $this->select(['admin_user_id' => $id])->current();
@@ -40,7 +43,7 @@  discard block
 block discarded – undo
40 43
      * Get admin user by email.
41 44
      *
42 45
      * @param  string $email email
43
-     * @return array|\ArrayObject|null
46
+     * @return string
44 47
      */
45 48
     public function getByEmail(string $email)
46 49
     {
@@ -50,7 +53,6 @@  discard block
 block discarded – undo
50 53
     /**
51 54
      * Updates login data.
52 55
      *
53
-     * @param  string $uuid admin user id
54 56
      * @return int number of affected rows
55 57
      */
56 58
     public function updateLogin(string $userId): int
@@ -58,6 +60,9 @@  discard block
 block discarded – undo
58 60
         return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
59 61
     }
60 62
 
63
+    /**
64
+     * @param string $userId
65
+     */
61 66
     public function getPaginationSelect($userId)
62 67
     {
63 68
         $select = $this->getSql()->select()->order(['created_at' => 'desc']);
@@ -67,6 +72,9 @@  discard block
 block discarded – undo
67 72
         return $select;
68 73
     }
69 74
 
75
+    /**
76
+     * @param integer $limit
77
+     */
70 78
     public function getRandom($limit)
71 79
     {
72 80
         $select = $this->getSql()->select()
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Core\Mapper;
5 5
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
     public function get($id)
35 35
     {
36
-        return $this->select(['admin_user_id' => $id])->current();
36
+        return $this->select([ 'admin_user_id' => $id ])->current();
37 37
     }
38 38
 
39 39
     /**
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
      */
45 45
     public function getByEmail(string $email)
46 46
     {
47
-        return $this->select(['email' => $email])->current();
47
+        return $this->select([ 'email' => $email ])->current();
48 48
     }
49 49
 
50 50
     /**
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
      */
56 56
     public function updateLogin(string $userId): int
57 57
     {
58
-        return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
58
+        return $this->update([ 'last_login' => date('Y-m-d H:i:s') ], [ 'admin_user_id' => $userId ]);
59 59
     }
60 60
 
61 61
     public function getPaginationSelect($userId)
62 62
     {
63
-        $select = $this->getSql()->select()->order(['created_at' => 'desc']);
63
+        $select = $this->getSql()->select()->order([ 'created_at' => 'desc' ]);
64 64
 
65 65
         $select->where->notEqualTo('admin_user_id', $userId);
66 66
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     public function getRandom($limit)
71 71
     {
72 72
         $select = $this->getSql()->select()
73
-            ->where(['status' => 1])
73
+            ->where([ 'status' => 1 ])
74 74
             ->order(new Expression('rand()'))
75 75
             ->limit($limit);
76 76
 
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 
80 80
     public function getUuid($adminUserId)
81 81
     {
82
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
82
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
83 83
 
84
-        if(!$user) {
84
+        if (!$user) {
85 85
             throw new \Exception('Admin user does not exist!', 400);
86 86
         }
87 87
 
Please login to merge, or discard this patch.
packages/Article/src/Service/DiscussionService.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
54 54
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
55 55
 
56
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
56
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
57 57
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
58 58
         }
59 59
 
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
 
63 63
         $article = $articleFilter->getValues();
64 64
         $article += [
65
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
65
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
66 66
             'type'            => ArticleType::DISCUSSION,
67 67
             'article_id'      => $id,
68 68
             'article_uuid'    => $uuId
69 69
         ];
70 70
 
71
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
72
-        unset($article['category_id'], $article['admin_user_id']);
71
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
72
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
73 73
 
74
-        $discussion = $discussionFilter->getValues() + ['article_uuid' => $uuId];
74
+        $discussion = $discussionFilter->getValues() + [ 'article_uuid' => $uuId ];
75 75
 
76 76
         $this->articleMapper->insert($article);
77 77
         $this->articleDiscussionsMapper->insert($discussion);
@@ -83,30 +83,30 @@  discard block
 block discarded – undo
83 83
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
84 84
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
85 85
 
86
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
86
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
87 87
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
88 88
         }
89 89
 
90
-        $article    = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
90
+        $article    = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
91 91
         $discussion = $discussionFilter->getValues();
92 92
 
93
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
94
-        $article['category_uuid']   = $this->categoryMapper->get($article['category_id'])->category_uuid;
95
-        unset($article['category_id'], $article['admin_user_id']);
93
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
94
+        $article[ 'category_uuid' ]   = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
95
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
96 96
 
97
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
98
-        $this->articleDiscussionsMapper->update($discussion, ['article_uuid' => $article['article_uuid']]);
97
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
98
+        $this->articleDiscussionsMapper->update($discussion, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
99 99
     }
100 100
 
101 101
     public function deleteArticle($id)
102 102
     {
103 103
         $discussion = $this->articleDiscussionsMapper->get($id);
104 104
 
105
-        if(!$discussion) {
105
+        if (!$discussion) {
106 106
             throw new \Exception('Article not found!');
107 107
         }
108 108
 
109
-        $this->articleDiscussionsMapper->delete(['article_uuid' => $discussion->article_uuid]);
109
+        $this->articleDiscussionsMapper->delete([ 'article_uuid' => $discussion->article_uuid ]);
110 110
         $this->delete($discussion->article_uuid);
111 111
     }
112 112
 }
Please login to merge, or discard this patch.