Completed
Pull Request — master (#114)
by
unknown
41:09 queued 21:08
created
packages/Menu/src/Service/MenuService.php 2 patches
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -28,26 +28,26 @@  discard block
 block discarded – undo
28 28
     private function unflattenArray(array $flatArray)
29 29
     {
30 30
         $flatArray = array_reverse($flatArray);
31
-        $refs      = [];
32
-        $result    = [];
31
+        $refs      = [ ];
32
+        $result    = [ ];
33 33
 
34
-        while(count($flatArray) > 0) {
35
-            for($i = count($flatArray) - 1; $i >= 0; $i--) {
36
-                if(!isset($flatArray[$i]['children'])) {
37
-                    $flatArray[$i]['children'] = [];
34
+        while (count($flatArray) > 0) {
35
+            for ($i = count($flatArray) - 1; $i >= 0; $i--) {
36
+                if (!isset($flatArray[ $i ][ 'children' ])) {
37
+                    $flatArray[ $i ][ 'children' ] = [ ];
38 38
                 }
39 39
 
40
-                if(!$flatArray[$i]["parent_id"]) {
41
-                    $result[$flatArray[$i]["menu_id"]] = $flatArray[$i];
42
-                    $refs[$flatArray[$i]["menu_id"]]   = &$result[$flatArray[$i]["menu_id"]];
43
-                    unset($flatArray[$i]);
40
+                if (!$flatArray[ $i ][ "parent_id" ]) {
41
+                    $result[ $flatArray[ $i ][ "menu_id" ] ] = $flatArray[ $i ];
42
+                    $refs[ $flatArray[ $i ][ "menu_id" ] ]   = &$result[ $flatArray[ $i ][ "menu_id" ] ];
43
+                    unset($flatArray[ $i ]);
44 44
                     $flatArray = array_values($flatArray);
45
-                } else if($flatArray[$i]["parent_id"] != 0) {
46
-                    if(array_key_exists($flatArray[$i]["parent_id"], $refs)) {
47
-                        $o                                               = $flatArray[$i];
48
-                        $refs[$flatArray[$i]["menu_id"]]                 = $o;
49
-                        $refs[$flatArray[$i]["parent_id"]]["children"][] = &$refs[$flatArray[$i]["menu_id"]];
50
-                        unset($flatArray[$i]);
45
+                } else if ($flatArray[ $i ][ "parent_id" ] != 0) {
46
+                    if (array_key_exists($flatArray[ $i ][ "parent_id" ], $refs)) {
47
+                        $o                                               = $flatArray[ $i ];
48
+                        $refs[ $flatArray[ $i ][ "menu_id" ] ]                 = $o;
49
+                        $refs[ $flatArray[ $i ][ "parent_id" ] ][ "children" ][ ] = &$refs[ $flatArray[ $i ][ "menu_id" ] ];
50
+                        unset($flatArray[ $i ]);
51 51
                         $flatArray = array_values($flatArray);
52 52
                     }
53 53
                 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         $this->postService     = $postService;
66 66
     }
67 67
 
68
-    public function getNestedAll($isActive = null, $filter = [])
68
+    public function getNestedAll($isActive = null, $filter = [ ])
69 69
     {
70 70
         $items = $this->menuMapper->selectAll($isActive, $filter)->toArray();
71 71
 
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
     {
82 82
         $data = $this->filterMenuItem($data);
83 83
 
84
-        $data['menu_id']   = Uuid::uuid1()->toString();
85
-        $data['menu_uuid'] = (new MysqlUuid($data['menu_id']))->toFormat(new Binary);
84
+        $data[ 'menu_id' ]   = Uuid::uuid1()->toString();
85
+        $data[ 'menu_uuid' ] = (new MysqlUuid($data[ 'menu_id' ]))->toFormat(new Binary);
86 86
 
87 87
         return $this->menuMapper->insertMenuItem($data);
88 88
     }
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 
97 97
     public function delete($id)
98 98
     {
99
-        $children = $this->menuMapper->select(['parent_id' => $id]);
99
+        $children = $this->menuMapper->select([ 'parent_id' => $id ]);
100 100
 
101
-        if($children->count()) {
101
+        if ($children->count()) {
102 102
             throw new \Exception('This Menu Item has child items', 400);
103 103
         }
104 104
 
105
-        return $this->menuMapper->delete(['menu_id' => $id]);
105
+        return $this->menuMapper->delete([ 'menu_id' => $id ]);
106 106
     }
107 107
 
108 108
     public function getForSelect()
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
     public function updateMenuOrder($menuOrder)
114 114
     {
115
-        if(!$menuOrder) {
115
+        if (!$menuOrder) {
116 116
             return true;
117 117
         }
118 118
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             $this->updateLevel(null, $menuOrder, $orderNo);
123 123
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->commit();
124 124
         }
125
-        catch(\Exception $e) {
125
+        catch (\Exception $e) {
126 126
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->rollback();
127 127
 
128 128
             throw $e;
@@ -133,12 +133,12 @@  discard block
 block discarded – undo
133 133
 
134 134
     private function updateLevel($parentId = null, $children, &$orderNo)
135 135
     {
136
-        foreach($children as $v) {
137
-            if(isset($v->children)) {
138
-                $this->menuMapper->update(['order_no' => $orderNo++, 'parent_id' => $parentId], ['menu_id' => $v->id]);
136
+        foreach ($children as $v) {
137
+            if (isset($v->children)) {
138
+                $this->menuMapper->update([ 'order_no' => $orderNo++, 'parent_id' => $parentId ], [ 'menu_id' => $v->id ]);
139 139
                 $this->updateLevel($v->id, $v->children, $orderNo);
140 140
             } else {
141
-                $this->menuMapper->update(['order_no' => $orderNo++, 'parent_id' => $parentId], ['menu_id' => $v->id]);
141
+                $this->menuMapper->update([ 'order_no' => $orderNo++, 'parent_id' => $parentId ], [ 'menu_id' => $v->id ]);
142 142
             }
143 143
         }
144 144
     }
@@ -147,30 +147,30 @@  discard block
 block discarded – undo
147 147
     {
148 148
         $filter = $this->menuFilter->getInputFilter()->setData($data);
149 149
 
150
-        if(!$filter->isValid()) {
150
+        if (!$filter->isValid()) {
151 151
             throw new FilterException($filter->getMessages());
152 152
         }
153 153
 
154
-        if(count(array_filter([$data['article_id'], $data['category_id'], $data['href']])) > 1) {
154
+        if (count(array_filter([ $data[ 'article_id' ], $data[ 'category_id' ], $data[ 'href' ] ])) > 1) {
155 155
             throw new \Exception('You need to set only one link. Post, Category or Href.');
156 156
         }
157 157
 
158 158
         $data = $filter->getValues();
159 159
 
160
-        if($data['article_id']) {
161
-            $article               = $this->postService->fetchSingleArticle($data['article_id']);
162
-            $data['article_uuid']  = $article->article_uuid;
163
-            $data['category_uuid'] = null;
164
-        } elseif($data['category_id']) {
165
-            $category              = $this->categoryService->getCategory($data['category_id']);
166
-            $data['category_uuid'] = $category->category_uuid;
167
-            $data['article_uuid']  = null;
160
+        if ($data[ 'article_id' ]) {
161
+            $article               = $this->postService->fetchSingleArticle($data[ 'article_id' ]);
162
+            $data[ 'article_uuid' ]  = $article->article_uuid;
163
+            $data[ 'category_uuid' ] = null;
164
+        } elseif ($data[ 'category_id' ]) {
165
+            $category              = $this->categoryService->getCategory($data[ 'category_id' ]);
166
+            $data[ 'category_uuid' ] = $category->category_uuid;
167
+            $data[ 'article_uuid' ]  = null;
168 168
         } else {
169
-            $data['article_uuid']  = null;
170
-            $data['category_uuid'] = null;
169
+            $data[ 'article_uuid' ]  = null;
170
+            $data[ 'category_uuid' ] = null;
171 171
         }
172 172
 
173
-        unset($data['article_id'], $data['category_id']);
173
+        unset($data[ 'article_id' ], $data[ 'category_id' ]);
174 174
 
175 175
         return $data;
176 176
     }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,8 +121,7 @@
 block discarded – undo
121 121
             $orderNo = 1;
122 122
             $this->updateLevel(null, $menuOrder, $orderNo);
123 123
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->commit();
124
-        }
125
-        catch(\Exception $e) {
124
+        } catch(\Exception $e) {
126 125
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->rollback();
127 126
 
128 127
             throw $e;
Please login to merge, or discard this patch.
packages/Menu/src/View/Helper/MenuUrlHelper.php 3 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,16 +33,16 @@
 block discarded – undo
33 33
      */
34 34
     public function __invoke($menuItem)
35 35
     {
36
-        if($menuItem['href']) {
37
-            return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
36
+        if ($menuItem[ 'href' ]) {
37
+            return strpos($menuItem[ 'href' ], 'http') === 0 ? $menuItem[ 'href' ] : '/' . $menuItem[ 'href' ];
38 38
         }
39
-        elseif($menuItem['article_slug']) {
40
-            $params = ['segment_1' => $menuItem['category_slug'], 'segment_2' => $menuItem['article_slug']];
39
+        elseif ($menuItem[ 'article_slug' ]) {
40
+            $params = [ 'segment_1' => $menuItem[ 'category_slug' ], 'segment_2' => $menuItem[ 'article_slug' ] ];
41 41
 
42 42
             return $this->url->__invoke('post', $params);
43 43
         }
44
-        elseif($menuItem['category_slug']) {
45
-            return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
44
+        elseif ($menuItem[ 'category_slug' ]) {
45
+            return $this->url->__invoke('category', [ 'category' => $menuItem[ 'category_slug' ] ]);
46 46
         }
47 47
         else {
48 48
             return '#';
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,16 +35,13 @@
 block discarded – undo
35 35
     {
36 36
         if($menuItem['href']) {
37 37
             return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
38
-        }
39
-        elseif($menuItem['article_slug']) {
38
+        } elseif($menuItem['article_slug']) {
40 39
             $params = ['segment_1' => $menuItem['category_slug'], 'segment_2' => $menuItem['article_slug']];
41 40
 
42 41
             return $this->url->__invoke('post', $params);
43
-        }
44
-        elseif($menuItem['category_slug']) {
42
+        } elseif($menuItem['category_slug']) {
45 43
             return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
46
-        }
47
-        else {
44
+        } else {
48 45
             return '#';
49 46
         }
50 47
     }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,14 +11,14 @@
 block discarded – undo
11 11
     /**
12 12
 * 
13 13
      *
14
- * @var UrlHelper 
14
+     * @var UrlHelper 
15 15
 */
16 16
     private $url;
17 17
 
18 18
     /**
19 19
 * 
20 20
      *
21
- * @var PostService 
21
+     * @var PostService 
22 22
 */
23 23
     private $postService;
24 24
 
Please login to merge, or discard this patch.
packages/Menu/src/Mapper/MenuMapper.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -15,24 +15,24 @@  discard block
 block discarded – undo
15 15
         $this->adapter = $adapter;
16 16
     }
17 17
 
18
-    public function selectAll($isActive = null, $filter = [])
18
+    public function selectAll($isActive = null, $filter = [ ])
19 19
     {
20 20
         $select = $this->getSql()->select()
21
-            ->join('category', 'menu.category_uuid = category.category_uuid', ['category_name' => 'name', 'category_slug' => 'slug'], 'left')
22
-            ->join('articles', 'articles.article_uuid = menu.article_uuid', ['article_id', 'article_slug' => 'slug'], 'left')
23
-            ->order(['order_no' => 'asc']);
21
+            ->join('category', 'menu.category_uuid = category.category_uuid', [ 'category_name' => 'name', 'category_slug' => 'slug' ], 'left')
22
+            ->join('articles', 'articles.article_uuid = menu.article_uuid', [ 'article_id', 'article_slug' => 'slug' ], 'left')
23
+            ->order([ 'order_no' => 'asc' ]);
24 24
 
25
-        if($isActive !== null) {
26
-            $select->where(['is_active' => $isActive]);
25
+        if ($isActive !== null) {
26
+            $select->where([ 'is_active' => $isActive ]);
27 27
         }
28 28
 
29
-        if($filter) {
30
-            if(isset($filter['is_in_header'])) {
31
-                $select->where(['is_in_header' => $filter['is_in_header']]);
32
-            } elseif(isset($filter['is_in_footer'])) {
33
-                $select->where(['is_in_footer' => $filter['is_in_footer']]);
34
-            } elseif(isset($filter['is_in_side'])) {
35
-                $select->where(['is_in_side' => $filter['is_in_side']]);
29
+        if ($filter) {
30
+            if (isset($filter[ 'is_in_header' ])) {
31
+                $select->where([ 'is_in_header' => $filter[ 'is_in_header' ] ]);
32
+            } elseif (isset($filter[ 'is_in_footer' ])) {
33
+                $select->where([ 'is_in_footer' => $filter[ 'is_in_footer' ] ]);
34
+            } elseif (isset($filter[ 'is_in_side' ])) {
35
+                $select->where([ 'is_in_side' => $filter[ 'is_in_side' ] ]);
36 36
             }
37 37
         }
38 38
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
     public function updateMenuItem($data, $id)
50 50
     {
51
-        $this->update($data, ['menu_id' => $id]);
51
+        $this->update($data, [ 'menu_id' => $id ]);
52 52
 
53 53
         return $id;
54 54
     }
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
     public function get($id)
57 57
     {
58 58
         $select = $this->getSql()->select()
59
-            ->join('articles', 'articles.article_uuid = menu.article_uuid', ['article_id'], 'left')
60
-            ->join('category', 'category.category_uuid = menu.category_uuid', ['category_id'], 'left')
61
-            ->where(['menu_id' => $id]);
59
+            ->join('articles', 'articles.article_uuid = menu.article_uuid', [ 'article_id' ], 'left')
60
+            ->join('category', 'category.category_uuid = menu.category_uuid', [ 'category_id' ], 'left')
61
+            ->where([ 'menu_id' => $id ]);
62 62
 
63 63
         return $this->selectWith($select)->current();
64 64
     }
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
     public function forSelect()
67 67
     {
68 68
         $select = $this->getSql()->select()
69
-            ->columns(['menu_id', 'title', 'is_active'])
70
-            ->order(['is_active' => 'desc']);
69
+            ->columns([ 'menu_id', 'title', 'is_active' ])
70
+            ->order([ 'is_active' => 'desc' ]);
71 71
 
72 72
         return $this->selectWith($select);
73 73
     }
Please login to merge, or discard this patch.
packages/Menu/src/ConfigProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
                     'partial/menu-level' => __DIR__ . '/../templates/partial/menu-level.phtml',
13 13
                 ],
14 14
                 'paths' => [
15
-                    'menu' => [__DIR__ . '/../templates/menu'],
15
+                    'menu' => [ __DIR__ . '/../templates/menu' ],
16 16
                 ],
17 17
             ],
18 18
 
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
                     'name'            => 'admin.menu',
34 34
                     'path'            => '/admin/menu',
35 35
                     'middleware'      => Controller\IndexController::class,
36
-                    'allowed_methods' => ['GET'],
36
+                    'allowed_methods' => [ 'GET' ],
37 37
                 ],
38 38
                 [
39 39
                     'name'            => 'admin.menu.action',
40 40
                     'path'            => '/admin/menu/:action/:id',
41 41
                     'middleware'      => Controller\IndexController::class,
42
-                    'allowed_methods' => ['GET', 'POST'],
42
+                    'allowed_methods' => [ 'GET', 'POST' ],
43 43
                 ],
44 44
             ],
45 45
 
Please login to merge, or discard this patch.
packages/Page/src/ConfigProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
                     'page/pagination' => __DIR__ . '/../templates/partial/pagination.php',
15 15
                 ],
16 16
                 'paths' => [
17
-                    'page' => [__DIR__ . '/../templates/page'],
17
+                    'page' => [ __DIR__ . '/../templates/page' ],
18 18
                 ],
19 19
             ],
20 20
 
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
                     'name'            => 'admin.pages',
33 33
                     'path'            => '/admin/pages',
34 34
                     'middleware'      => Controller\PageController::class,
35
-                    'allowed_methods' => ['GET'],
35
+                    'allowed_methods' => [ 'GET' ],
36 36
                 ],
37 37
                 [
38 38
                     'name'            => 'admin.pages.action',
39 39
                     'path'            => '/admin/pages/:action/:id',
40 40
                     'middleware'      => Controller\PageController::class,
41
-                    'allowed_methods' => ['GET', 'POST']
41
+                    'allowed_methods' => [ 'GET', 'POST' ]
42 42
                 ]
43 43
             ],
44 44
         ];
Please login to merge, or discard this patch.
packages/Page/templates/partial/pagination.php 2 patches
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,13 +17,16 @@  discard block
 block discarded – undo
17 17
                                 <span class="glyphicon glyphicon-chevron-left"></span>
18 18
                             </a>
19 19
                         </li>
20
-                    <?php else: ?>
20
+                    <?php else {
21
+    : ?>
21 22
                         <li class="disabled">
22 23
                             <a href="#">
23 24
                                 <span class="glyphicon glyphicon-chevron-left"></span>
24 25
                             </a>
25 26
                         </li>
26
-                    <?php endif; ?>
27
+                    <?php endif;
28
+}
29
+?>
27 30
 
28 31
                     <!-- Numbered page links -->
29 32
                     <?php foreach($this->pagesInRange as $page): ?>
@@ -33,9 +36,12 @@  discard block
 block discarded – undo
33 36
                                     <?php echo $page; ?>
34 37
                                 </a>
35 38
                             </li>
36
-                        <?php else: ?>
39
+                        <?php else {
40
+    : ?>
37 41
                             <li class="active">
38
-                                <a href="#"><?php echo $page; ?></a>
42
+                                <a href="#"><?php echo $page;
43
+}
44
+?></a>
39 45
                             </li>
40 46
                         <?php endif; ?>
41 47
                     <?php endforeach; ?>
@@ -47,13 +53,16 @@  discard block
 block discarded – undo
47 53
                                 <span class="glyphicon glyphicon-chevron-right"></span>
48 54
                             </a>
49 55
                         </li>
50
-                    <?php else: ?>
56
+                    <?php else {
57
+    : ?>
51 58
                         <li class="disabled">
52 59
                             <a href="#">
53 60
                                 <span class="glyphicon glyphicon-chevron-right"></span>
54 61
                             </a>
55 62
                         </li>
56
-                    <?php endif; ?>
63
+                    <?php endif;
64
+}
65
+?>
57 66
                 </ul>
58 67
             </div>
59 68
         <?php endif; ?>
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@  discard block
 block discarded – undo
7 7
         </div>
8 8
     </div>
9 9
     <div class="col-sm-7">
10
-        <?php if($this->pageCount > 1) : ?>
10
+        <?php if ($this->pageCount > 1) : ?>
11 11
             <div class="pull-right">
12 12
                 <ul class="pagination" style="margin:0px;">
13 13
                     <!-- Previous page link -->
14
-                    <?php if(isset($this->previous)) : ?>
14
+                    <?php if (isset($this->previous)) : ?>
15 15
                         <li>
16
-                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $this->previous; ?>">
16
+                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $this->previous; ?>">
17 17
                                 <span class="glyphicon glyphicon-chevron-left"></span>
18 18
                             </a>
19 19
                         </li>
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
                     <?php endif; ?>
27 27
 
28 28
                     <!-- Numbered page links -->
29
-                    <?php foreach($this->pagesInRange as $page): ?>
30
-                        <?php if($page != $this->current) : ?>
29
+                    <?php foreach ($this->pagesInRange as $page): ?>
30
+                        <?php if ($page != $this->current) : ?>
31 31
                             <li>
32
-                                <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $page; ?>">
32
+                                <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $page; ?>">
33 33
                                     <?php echo $page; ?>
34 34
                                 </a>
35 35
                             </li>
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
                     <?php endforeach; ?>
42 42
 
43 43
                     <!-- Next page link -->
44
-                    <?php if(isset($this->next)) : ?>
44
+                    <?php if (isset($this->next)) : ?>
45 45
                         <li>
46
-                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $this->next; ?>">
46
+                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $this->next; ?>">
47 47
                                 <span class="glyphicon glyphicon-chevron-right"></span>
48 48
                             </a>
49 49
                         </li>
Please login to merge, or discard this patch.
packages/Admin/src/Controller/AuthController.php 2 patches
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/Admin/src/Controller/UserController.php 2 patches
Spacing   +12 added lines, -12 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 Admin\Controller;
6 6
 
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
     {
65 65
         $user   = $this->session->getStorage()->user;
66 66
         $params = $this->request->getQueryParams();
67
-        $page   = isset($params['page']) ? $params['page'] : 1;
68
-        $limit  = isset($params['limit']) ? $params['limit'] : 15;
67
+        $page   = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
68
+        $limit  = isset($params[ 'limit' ]) ? $params[ 'limit' ] : 15;
69 69
 
70 70
         $adminUsers = $this->adminUserService->getPagination($page, $limit, $user->admin_user_id);
71 71
 
72
-        return new HtmlResponse($this->template->render('admin::user/index', ['list' => $adminUsers, 'layout' => 'layout/admin']));
72
+        return new HtmlResponse($this->template->render('admin::user/index', [ 'list' => $adminUsers, 'layout' => 'layout/admin' ]));
73 73
     }
74 74
 
75 75
     /**
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
      *
78 78
      * @return \Psr\Http\Message\ResponseInterface
79 79
      */
80
-    public function edit($errors = []): \Psr\Http\Message\ResponseInterface
80
+    public function edit($errors = [ ]): \Psr\Http\Message\ResponseInterface
81 81
     {
82 82
         $id   = $this->request->getAttribute('id');
83 83
         $user = $this->adminUserService->getUser($id);
84 84
 
85
-        if($this->request->getParsedBody()) {
86
-            $user                = (object)($this->request->getParsedBody() + (array)$user);
85
+        if ($this->request->getParsedBody()) {
86
+            $user                = (object) ($this->request->getParsedBody() + (array) $user);
87 87
             $user->admin_user_id = $id;
88 88
         }
89 89
 
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
         try {
100 100
             $userId = $this->request->getAttribute('id');
101 101
             $data   = $this->request->getParsedBody();
102
-            $data   += (new Request())->getFiles()->toArray();
102
+            $data += (new Request())->getFiles()->toArray();
103 103
 
104
-            if($userId) {
104
+            if ($userId) {
105 105
                 $this->adminUserService->updateUser($data, $userId);
106 106
             }
107 107
             else {
@@ -110,10 +110,10 @@  discard block
 block discarded – undo
110 110
 
111 111
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
112 112
         }
113
-        catch(FilterException $fe) {
113
+        catch (FilterException $fe) {
114 114
             return $this->edit($fe->getArrayMessages());
115 115
         }
116
-        catch(\Exception $e) {
116
+        catch (\Exception $e) {
117 117
             throw $e;
118 118
         }
119 119
     }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
128 128
         }
129
-        catch(\Exception $e) {
129
+        catch (\Exception $e) {
130 130
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
131 131
         }
132 132
     }
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -103,17 +103,14 @@  discard block
 block discarded – undo
103 103
 
104 104
             if($userId) {
105 105
                 $this->adminUserService->updateUser($data, $userId);
106
-            }
107
-            else {
106
+            } else {
108 107
                 $this->adminUserService->registerNewUser($data);
109 108
             }
110 109
 
111 110
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
112
-        }
113
-        catch(FilterException $fe) {
111
+        } catch(FilterException $fe) {
114 112
             return $this->edit($fe->getArrayMessages());
115
-        }
116
-        catch(\Exception $e) {
113
+        } catch(\Exception $e) {
117 114
             throw $e;
118 115
         }
119 116
     }
@@ -125,8 +122,7 @@  discard block
 block discarded – undo
125 122
             $this->adminUserService->delete($userId);
126 123
 
127 124
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
128
-        }
129
-        catch(\Exception $e) {
125
+        } catch(\Exception $e) {
130 126
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
131 127
         }
132 128
     }
Please login to merge, or discard this patch.
packages/Admin/src/Action/IndexAction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
39 39
      */
40 40
     public function __invoke(Request $request, Response $response, callable $next = null)
41 41
     {
42
-        return new HtmlResponse($this->template->render('admin::index', ['layout' => 'layout/admin']));
42
+        return new HtmlResponse($this->template->render('admin::index', [ 'layout' => 'layout/admin' ]));
43 43
     }
44 44
 }
Please login to merge, or discard this patch.