@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Article\Mapper; |
| 6 | 6 | |
@@ -21,21 +21,21 @@ discard block |
||
| 21 | 21 | public function getPaginationSelect() |
| 22 | 22 | { |
| 23 | 23 | return $this->getSql()->select() |
| 24 | - ->columns(['title', 'body']) |
|
| 24 | + ->columns([ 'title', 'body' ]) |
|
| 25 | 25 | ->join('articles', 'article_discussions.article_uuid = articles.article_uuid') |
| 26 | - ->where(['articles.type' => ArticleType::DISCUSSION]) |
|
| 27 | - ->order(['created_at' => 'desc']); |
|
| 26 | + ->where([ 'articles.type' => ArticleType::DISCUSSION ]) |
|
| 27 | + ->order([ 'created_at' => 'desc' ]); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function get($id) |
| 31 | 31 | { |
| 32 | 32 | $select = $this->getSql()->select() |
| 33 | - ->columns(['title', 'body']) |
|
| 33 | + ->columns([ 'title', 'body' ]) |
|
| 34 | 34 | ->join('articles', 'article_discussions.article_uuid = articles.article_uuid') |
| 35 | 35 | ->join('category', 'category.category_uuid = articles.category_uuid', |
| 36 | - ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left') |
|
| 37 | - ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id'], 'left') |
|
| 38 | - ->where(['articles.article_id' => $id]); |
|
| 36 | + [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left') |
|
| 37 | + ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id' ], 'left') |
|
| 38 | + ->where([ 'articles.article_id' => $id ]); |
|
| 39 | 39 | |
| 40 | 40 | return $this->selectWith($select)->current(); |
| 41 | 41 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -53,7 +53,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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,23 +104,23 @@ discard block |
||
| 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 | - if($post['is_homepage']) { |
|
| 123 | - $this->articlePostsMapper->update(['is_homepage' => false]); |
|
| 122 | + if ($post[ 'is_homepage' ]) { |
|
| 123 | + $this->articlePostsMapper->update([ 'is_homepage' => false ]); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $this->articleMapper->insert($article); |
@@ -133,46 +133,46 @@ discard block |
||
| 133 | 133 | $articleFilter = $this->articleFilter->getInputFilter()->setData($data); |
| 134 | 134 | $postFilter = $this->postFilter->getInputFilter()->setData($data); |
| 135 | 135 | |
| 136 | - if(!$articleFilter->isValid() || !$postFilter->isValid()) { |
|
| 136 | + if (!$articleFilter->isValid() || !$postFilter->isValid()) { |
|
| 137 | 137 | throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages()); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid]; |
|
| 140 | + $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ]; |
|
| 141 | 141 | $post = $postFilter->getValues() + [ |
| 142 | 142 | 'featured_img' => $this->upload->uploadImage($data, 'featured_img'), |
| 143 | 143 | 'main_img' => $this->upload->uploadImage($data, 'main_img') |
| 144 | 144 | ]; |
| 145 | 145 | |
| 146 | - $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']); |
|
| 147 | - $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid; |
|
| 148 | - unset($article['category_id'], $article['admin_user_id']); |
|
| 146 | + $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]); |
|
| 147 | + $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid; |
|
| 148 | + unset($article[ 'category_id' ], $article[ 'admin_user_id' ]); |
|
| 149 | 149 | |
| 150 | 150 | // We dont want to force user to re-upload image on edit |
| 151 | - if(!$post['featured_img']) { |
|
| 152 | - unset($post['featured_img']); |
|
| 151 | + if (!$post[ 'featured_img' ]) { |
|
| 152 | + unset($post[ 'featured_img' ]); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - if(!$post['main_img']) { |
|
| 156 | - unset($post['main_img']); |
|
| 155 | + if (!$post[ 'main_img' ]) { |
|
| 156 | + unset($post[ 'main_img' ]); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - if($post['is_homepage']) { |
|
| 160 | - $this->articlePostsMapper->update(['is_homepage' => false]); |
|
| 159 | + if ($post[ 'is_homepage' ]) { |
|
| 160 | + $this->articlePostsMapper->update([ 'is_homepage' => false ]); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]); |
|
| 164 | - $this->articlePostsMapper->update($post, ['article_uuid' => $article['article_uuid']]); |
|
| 163 | + $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]); |
|
| 164 | + $this->articlePostsMapper->update($post, [ 'article_uuid' => $article[ 'article_uuid' ] ]); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | public function deleteArticle($id) |
| 168 | 168 | { |
| 169 | 169 | $post = $this->articlePostsMapper->get($id); |
| 170 | 170 | |
| 171 | - if(!$post) { |
|
| 171 | + if (!$post) { |
|
| 172 | 172 | throw new \Exception('Article not found!'); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - $this->articlePostsMapper->delete(['article_uuid' => $post->article_uuid]); |
|
| 175 | + $this->articlePostsMapper->delete([ 'article_uuid' => $post->article_uuid ]); |
|
| 176 | 176 | $this->delete($post->article_uuid); |
| 177 | 177 | } |
| 178 | 178 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Newsletter\Mapper; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Newsletter\Web\Action; |
| 6 | 6 | |
@@ -20,14 +20,14 @@ |
||
| 20 | 20 | { |
| 21 | 21 | try { |
| 22 | 22 | $data = $request->getParsedBody(); |
| 23 | - $email = isset($data['email']) ? $data['email'] : null; |
|
| 23 | + $email = isset($data[ 'email' ]) ? $data[ 'email' ] : null; |
|
| 24 | 24 | |
| 25 | 25 | $this->newsletterService->registerNew($email); |
| 26 | 26 | |
| 27 | - return new JsonResponse(['message' => 'Uspešno ste se prijavili.']); |
|
| 27 | + return new JsonResponse([ 'message' => 'Uspešno ste se prijavili.' ]); |
|
| 28 | 28 | } |
| 29 | - catch(\Exception $e) { |
|
| 30 | - return new JsonResponse(['message' => $e->getMessage()], $e->getCode()); |
|
| 29 | + catch (\Exception $e) { |
|
| 30 | + return new JsonResponse([ 'message' => $e->getMessage() ], $e->getCode()); |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Newsletter\Service; |
| 6 | 6 | |
@@ -15,14 +15,14 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function registerNew($email) |
| 17 | 17 | { |
| 18 | - if(!filter_var($email, FILTER_VALIDATE_EMAIL)) { |
|
| 18 | + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { |
|
| 19 | 19 | throw new \Exception('Email is not valid!', 400); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - $current = $this->newsletterMapper->select(['email' => $email])->current(); |
|
| 22 | + $current = $this->newsletterMapper->select([ 'email' => $email ])->current(); |
|
| 23 | 23 | |
| 24 | - if(!$current) { |
|
| 25 | - return $this->newsletterMapper->insert(['email' => $email]); |
|
| 24 | + if (!$current) { |
|
| 25 | + return $this->newsletterMapper->insert([ 'email' => $email ]); |
|
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | 28 | } |