@@ -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 Web\Action; |
6 | 6 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | { |
49 | 49 | $page = $this->pageService->getHomepage(); |
50 | 50 | |
51 | - return new HtmlResponse($this->template->render('web::home', ['page' => $page, 'layout' => 'layout/web'])); |
|
51 | + return new HtmlResponse($this->template->render('web::home', [ 'page' => $page, 'layout' => 'layout/web' ])); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Web\Action; |
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 Web\Factory\Action; |
6 | 6 |
@@ -33,6 +33,6 @@ |
||
33 | 33 | |
34 | 34 | public function getActivePage($urlSlug) |
35 | 35 | { |
36 | - return $this->select(['slug' => $urlSlug, 'is_active' => true]); |
|
36 | + return $this->select([ 'slug' => $urlSlug, 'is_active' => true ]); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 | \ No newline at end of file |
@@ -83,7 +83,7 @@ |
||
83 | 83 | + ['main_img' => $this->upload->uploadImage($data, 'main_img')]; |
84 | 84 | $data['page_id'] = Uuid::uuid1()->toString(); |
85 | 85 | $data['page_uuid'] |
86 | - = (new MysqlUuid($data['page_id']))->toFormat(new Binary); |
|
86 | + = (new MysqlUuid($data['page_id']))->toFormat(new Binary); |
|
87 | 87 | |
88 | 88 | if ($data['is_homepage']) { |
89 | 89 | $this->pageMapper->update(['is_homepage' => false]); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function getPage($pageId) |
51 | 51 | { |
52 | - return $this->pageMapper->select(['page_id' => $pageId])->current(); |
|
52 | + return $this->pageMapper->select([ 'page_id' => $pageId ])->current(); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function getHomepage() |
69 | 69 | { |
70 | - return $this->pageMapper->select(['is_homepage' => true])->current(); |
|
70 | + return $this->pageMapper->select([ 'is_homepage' => true ])->current(); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | $data = $filter->getValues() |
88 | - + ['main_img' => $this->upload->uploadImage($data, 'main_img')]; |
|
89 | - $data['page_id'] = Uuid::uuid1()->toString(); |
|
90 | - $data['page_uuid'] |
|
91 | - = (new MysqlUuid($data['page_id']))->toFormat(new Binary); |
|
88 | + + [ 'main_img' => $this->upload->uploadImage($data, 'main_img') ]; |
|
89 | + $data[ 'page_id' ] = Uuid::uuid1()->toString(); |
|
90 | + $data[ 'page_uuid' ] |
|
91 | + = (new MysqlUuid($data[ 'page_id' ]))->toFormat(new Binary); |
|
92 | 92 | |
93 | - if ($data['is_homepage']) { |
|
94 | - $this->pageMapper->update(['is_homepage' => false]); |
|
93 | + if ($data[ 'is_homepage' ]) { |
|
94 | + $this->pageMapper->update([ 'is_homepage' => false ]); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | return $this->pageMapper->insert($data); |
@@ -110,21 +110,21 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | $data = $filter->getValues() |
113 | - + ['main_img' => $this->upload->uploadImage($data, 'main_img')]; |
|
113 | + + [ 'main_img' => $this->upload->uploadImage($data, 'main_img') ]; |
|
114 | 114 | |
115 | 115 | // We don't want to force user to re-upload image on edit |
116 | - if (!$data['main_img']) { |
|
117 | - unset($data['main_img']); |
|
116 | + if (!$data[ 'main_img' ]) { |
|
117 | + unset($data[ 'main_img' ]); |
|
118 | 118 | } |
119 | 119 | else { |
120 | 120 | $this->upload->deleteFile($page->getMainImg()); |
121 | 121 | } |
122 | 122 | |
123 | - if ($data['is_homepage']) { |
|
124 | - $this->pageMapper->update(['is_homepage' => false]); |
|
123 | + if ($data[ 'is_homepage' ]) { |
|
124 | + $this->pageMapper->update([ 'is_homepage' => false ]); |
|
125 | 125 | } |
126 | 126 | |
127 | - return $this->pageMapper->update($data, ['page_id' => $pageId]); |
|
127 | + return $this->pageMapper->update($data, [ 'page_id' => $pageId ]); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | public function delete($pageId) |
@@ -135,6 +135,6 @@ discard block |
||
135 | 135 | |
136 | 136 | $this->upload->deleteFile($page->getMainImg()); |
137 | 137 | |
138 | - return (bool)$this->pageMapper->delete(['page_id' => $pageId]); |
|
138 | + return (bool) $this->pageMapper->delete([ 'page_id' => $pageId ]); |
|
139 | 139 | } |
140 | 140 | } |
141 | 141 | \ No newline at end of file |
@@ -115,8 +115,7 @@ |
||
115 | 115 | // We don't want to force user to re-upload image on edit |
116 | 116 | if (!$data['main_img']) { |
117 | 117 | unset($data['main_img']); |
118 | - } |
|
119 | - else { |
|
118 | + } else { |
|
120 | 119 | $this->upload->deleteFile($page->getMainImg()); |
121 | 120 | } |
122 | 121 |
@@ -22,6 +22,9 @@ |
||
22 | 22 | return $this; |
23 | 23 | } |
24 | 24 | |
25 | + /** |
|
26 | + * @return boolean |
|
27 | + */ |
|
25 | 28 | public function current() |
26 | 29 | { |
27 | 30 | return $this->session->getStorage()->user; |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | public function testIndexMethodShouldReturnHtmlResponse() |
8 | 8 | { |
9 | 9 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
10 | - ->setMethods(['render']) |
|
10 | + ->setMethods([ 'render' ]) |
|
11 | 11 | ->getMockForAbstractClass(); |
12 | 12 | $template->expects(static::once()) |
13 | 13 | ->method('render') |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
44 | 44 | $sessionStorage->user = $user; |
45 | 45 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
46 | - ->setMethods(['render']) |
|
46 | + ->setMethods([ 'render' ]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | $template->expects(static::once()) |
49 | 49 | ->method('render') |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
81 | 81 | $sessionStorage->user = $user; |
82 | 82 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
83 | - ->setMethods(['render']) |
|
83 | + ->setMethods([ 'render' ]) |
|
84 | 84 | ->getMockForAbstractClass(); |
85 | 85 | $template->expects(static::once()) |
86 | 86 | ->method('render') |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $request = new \Zend\Diactoros\ServerRequest(); |
100 | 100 | $request = $request->withAttribute('action', 'edit'); |
101 | 101 | $request = $request->withAttribute('id', 1); |
102 | - $request = $request->withParsedBody(['discussion' => 'test']); |
|
102 | + $request = $request->withParsedBody([ 'discussion' => 'test' ]); |
|
103 | 103 | $response = new \Zend\Diactoros\Response(); |
104 | 104 | $discussionController = new \Article\Controller\DiscussionController( |
105 | 105 | $template, |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | ->will(static::returnValue('http://unfinished.dev/admin')); |
136 | 136 | $request = new \Zend\Diactoros\ServerRequest(); |
137 | 137 | $request = $request->withAttribute('action', 'save'); |
138 | - $request = $request->withParsedBody(['user' => 'test']); |
|
138 | + $request = $request->withParsedBody([ 'user' => 'test' ]); |
|
139 | 139 | $response = new \Zend\Diactoros\Response(); |
140 | 140 | $discussionController = new \Article\Controller\DiscussionController( |
141 | 141 | $template, |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $request = new \Zend\Diactoros\ServerRequest(); |
175 | 175 | $request = $request->withAttribute('action', 'save'); |
176 | 176 | $request = $request->withAttribute('id', 2); |
177 | - $request = $request->withParsedBody(['user' => 'test']); |
|
177 | + $request = $request->withParsedBody([ 'user' => 'test' ]); |
|
178 | 178 | $response = new \Zend\Diactoros\Response(); |
179 | 179 | $discussionController = new \Article\Controller\DiscussionController( |
180 | 180 | $template, |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | ->getMock(); |
208 | 208 | $discussionService->expects(static::once()) |
209 | 209 | ->method('updateArticle') |
210 | - ->willThrowException(new \Core\Exception\FilterException(['test error'])); |
|
210 | + ->willThrowException(new \Core\Exception\FilterException([ 'test error' ])); |
|
211 | 211 | $categoryService = $this->getMockBuilder(\Category\Service\CategoryService::class) |
212 | 212 | ->disableOriginalConstructor() |
213 | 213 | ->getMock(); |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $request = new \Zend\Diactoros\ServerRequest(); |
217 | 217 | $request = $request->withAttribute('action', 'save'); |
218 | 218 | $request = $request->withAttribute('id', 2); |
219 | - $request = $request->withParsedBody(['user' => 'test']); |
|
219 | + $request = $request->withParsedBody([ 'user' => 'test' ]); |
|
220 | 220 | $response = new \Zend\Diactoros\Response(); |
221 | 221 | $discussionController = new \Article\Controller\DiscussionController( |
222 | 222 | $template, |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $request = new \Zend\Diactoros\ServerRequest(); |
261 | 261 | $request = $request->withAttribute('action', 'save'); |
262 | 262 | $request = $request->withAttribute('id', 2); |
263 | - $request = $request->withParsedBody(['user' => 'test']); |
|
263 | + $request = $request->withParsedBody([ 'user' => 'test' ]); |
|
264 | 264 | $response = new \Zend\Diactoros\Response(); |
265 | 265 | $discussionController = new \Article\Controller\DiscussionController( |
266 | 266 | $template, |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | public function testIndexMethodShouldReturnHtmlResponse() |
8 | 8 | { |
9 | 9 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
10 | - ->setMethods(['render']) |
|
10 | + ->setMethods([ 'render' ]) |
|
11 | 11 | ->getMockForAbstractClass(); |
12 | 12 | $template->expects(static::once()) |
13 | 13 | ->method('render') |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
44 | 44 | $sessionStorage->user = $user; |
45 | 45 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
46 | - ->setMethods(['render']) |
|
46 | + ->setMethods([ 'render' ]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | $template->expects(static::once()) |
49 | 49 | ->method('render') |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
81 | 81 | $sessionStorage->user = $user; |
82 | 82 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
83 | - ->setMethods(['render']) |
|
83 | + ->setMethods([ 'render' ]) |
|
84 | 84 | ->getMockForAbstractClass(); |
85 | 85 | $template->expects(static::once()) |
86 | 86 | ->method('render') |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $request = new \Zend\Diactoros\ServerRequest(); |
100 | 100 | $request = $request->withAttribute('action', 'edit'); |
101 | 101 | $request = $request->withAttribute('id', 1); |
102 | - $request = $request->withParsedBody(['event' => 'test']); |
|
102 | + $request = $request->withParsedBody([ 'event' => 'test' ]); |
|
103 | 103 | $response = new \Zend\Diactoros\Response(); |
104 | 104 | $eventController = new \Article\Controller\EventController( |
105 | 105 | $template, |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | ->will(static::returnValue('http://unfinished.dev/admin')); |
136 | 136 | $request = new \Zend\Diactoros\ServerRequest(); |
137 | 137 | $request = $request->withAttribute('action', 'save'); |
138 | - $request = $request->withParsedBody(['event' => 'test']); |
|
138 | + $request = $request->withParsedBody([ 'event' => 'test' ]); |
|
139 | 139 | $response = new \Zend\Diactoros\Response(); |
140 | 140 | $eventController = new \Article\Controller\EventController( |
141 | 141 | $template, |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $request = new \Zend\Diactoros\ServerRequest(); |
175 | 175 | $request = $request->withAttribute('action', 'save'); |
176 | 176 | $request = $request->withAttribute('id', 2); |
177 | - $request = $request->withParsedBody(['event' => 'test']); |
|
177 | + $request = $request->withParsedBody([ 'event' => 'test' ]); |
|
178 | 178 | $response = new \Zend\Diactoros\Response(); |
179 | 179 | $eventController = new \Article\Controller\EventController( |
180 | 180 | $template, |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | ->getMock(); |
208 | 208 | $eventService->expects(static::once()) |
209 | 209 | ->method('updateArticle') |
210 | - ->willThrowException(new \Core\Exception\FilterException(['test error'])); |
|
210 | + ->willThrowException(new \Core\Exception\FilterException([ 'test error' ])); |
|
211 | 211 | $categoryService = $this->getMockBuilder(\Category\Service\CategoryService::class) |
212 | 212 | ->disableOriginalConstructor() |
213 | 213 | ->getMock(); |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $request = new \Zend\Diactoros\ServerRequest(); |
217 | 217 | $request = $request->withAttribute('action', 'save'); |
218 | 218 | $request = $request->withAttribute('id', 2); |
219 | - $request = $request->withParsedBody(['event' => 'test']); |
|
219 | + $request = $request->withParsedBody([ 'event' => 'test' ]); |
|
220 | 220 | $response = new \Zend\Diactoros\Response(); |
221 | 221 | $eventController = new \Article\Controller\EventController( |
222 | 222 | $template, |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $request = new \Zend\Diactoros\ServerRequest(); |
261 | 261 | $request = $request->withAttribute('action', 'save'); |
262 | 262 | $request = $request->withAttribute('id', 2); |
263 | - $request = $request->withParsedBody(['event' => 'test']); |
|
263 | + $request = $request->withParsedBody([ 'event' => 'test' ]); |
|
264 | 264 | $response = new \Zend\Diactoros\Response(); |
265 | 265 | $eventController = new \Article\Controller\EventController( |
266 | 266 | $template, |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | public function testIndexMethodShouldReturnHtmlResponse() |
8 | 8 | { |
9 | 9 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
10 | - ->setMethods(['render']) |
|
10 | + ->setMethods([ 'render' ]) |
|
11 | 11 | ->getMockForAbstractClass(); |
12 | 12 | $template->expects(static::once()) |
13 | 13 | ->method('render') |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
44 | 44 | $sessionStorage->user = $user; |
45 | 45 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
46 | - ->setMethods(['render']) |
|
46 | + ->setMethods([ 'render' ]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | $template->expects(static::once()) |
49 | 49 | ->method('render') |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $sessionStorage = new \Zend\Session\Storage\ArrayStorage(); |
81 | 81 | $sessionStorage->user = $user; |
82 | 82 | $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class) |
83 | - ->setMethods(['render']) |
|
83 | + ->setMethods([ 'render' ]) |
|
84 | 84 | ->getMockForAbstractClass(); |
85 | 85 | $template->expects(static::once()) |
86 | 86 | ->method('render') |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $request = new \Zend\Diactoros\ServerRequest(); |
100 | 100 | $request = $request->withAttribute('action', 'edit'); |
101 | 101 | $request = $request->withAttribute('id', 1); |
102 | - $request = $request->withParsedBody(['post' => 'test']); |
|
102 | + $request = $request->withParsedBody([ 'post' => 'test' ]); |
|
103 | 103 | $response = new \Zend\Diactoros\Response(); |
104 | 104 | $postController = new \Article\Controller\PostController( |
105 | 105 | $template, |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | ->will(static::returnValue('http://unfinished.dev/admin')); |
136 | 136 | $request = new \Zend\Diactoros\ServerRequest(); |
137 | 137 | $request = $request->withAttribute('action', 'save'); |
138 | - $request = $request->withParsedBody(['post' => 'test']); |
|
138 | + $request = $request->withParsedBody([ 'post' => 'test' ]); |
|
139 | 139 | $response = new \Zend\Diactoros\Response(); |
140 | 140 | $postController = new \Article\Controller\PostController( |
141 | 141 | $template, |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $request = new \Zend\Diactoros\ServerRequest(); |
175 | 175 | $request = $request->withAttribute('action', 'save'); |
176 | 176 | $request = $request->withAttribute('id', 2); |
177 | - $request = $request->withParsedBody(['post' => 'test']); |
|
177 | + $request = $request->withParsedBody([ 'post' => 'test' ]); |
|
178 | 178 | $response = new \Zend\Diactoros\Response(); |
179 | 179 | $postController = new \Article\Controller\PostController( |
180 | 180 | $template, |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | ->getMock(); |
208 | 208 | $postService->expects(static::once()) |
209 | 209 | ->method('updateArticle') |
210 | - ->willThrowException(new \Core\Exception\FilterException(['test error'])); |
|
210 | + ->willThrowException(new \Core\Exception\FilterException([ 'test error' ])); |
|
211 | 211 | $categoryService = $this->getMockBuilder(\Category\Service\CategoryService::class) |
212 | 212 | ->disableOriginalConstructor() |
213 | 213 | ->getMock(); |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $request = new \Zend\Diactoros\ServerRequest(); |
217 | 217 | $request = $request->withAttribute('action', 'save'); |
218 | 218 | $request = $request->withAttribute('id', 2); |
219 | - $request = $request->withParsedBody(['post' => 'test']); |
|
219 | + $request = $request->withParsedBody([ 'post' => 'test' ]); |
|
220 | 220 | $response = new \Zend\Diactoros\Response(); |
221 | 221 | $postController = new \Article\Controller\PostController( |
222 | 222 | $template, |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $request = new \Zend\Diactoros\ServerRequest(); |
261 | 261 | $request = $request->withAttribute('action', 'save'); |
262 | 262 | $request = $request->withAttribute('id', 2); |
263 | - $request = $request->withParsedBody(['post' => 'test']); |
|
263 | + $request = $request->withParsedBody([ 'post' => 'test' ]); |
|
264 | 264 | $response = new \Zend\Diactoros\Response(); |
265 | 265 | $postController = new \Article\Controller\PostController( |
266 | 266 | $template, |