@@ -28,26 +28,26 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -121,8 +121,7 @@ |
||
| 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; |
@@ -33,16 +33,16 @@ |
||
| 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 '#'; |
@@ -35,16 +35,13 @@ |
||
| 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 | } |
@@ -29,16 +29,16 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function getHeaderMenu() |
| 31 | 31 | { |
| 32 | - return $this->menuService->getNestedAll(true, ['is_in_header' => true]); |
|
| 32 | + return $this->menuService->getNestedAll(true, [ 'is_in_header' => true ]); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function getFooterMenu() |
| 36 | 36 | { |
| 37 | - return $this->menuService->getNestedAll(true, ['is_in_footer' => true]); |
|
| 37 | + return $this->menuService->getNestedAll(true, [ 'is_in_footer' => true ]); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function getSideMenu() |
| 41 | 41 | { |
| 42 | - return $this->menuService->getNestedAll(true, ['is_in_side' => true]); |
|
| 42 | + return $this->menuService->getNestedAll(true, [ 'is_in_side' => true ]); |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | \ No newline at end of file |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | ])); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function edit($errors = []) |
|
| 40 | + public function edit($errors = [ ]) |
|
| 41 | 41 | { |
| 42 | 42 | $id = $this->request->getAttribute('id'); |
| 43 | 43 | $item = $this->menuService->get($id); |
| 44 | 44 | |
| 45 | - if($this->request->getParsedBody()){ |
|
| 46 | - $item = (object)($this->request->getParsedBody() + (array)$item); |
|
| 45 | + if ($this->request->getParsedBody()) { |
|
| 46 | + $item = (object) ($this->request->getParsedBody() + (array) $item); |
|
| 47 | 47 | $item->menu_id = $id; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -58,36 +58,36 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | public function save() |
| 60 | 60 | { |
| 61 | - try{ |
|
| 61 | + try { |
|
| 62 | 62 | $id = $this->request->getAttribute('id'); |
| 63 | 63 | $data = $this->request->getParsedBody(); |
| 64 | 64 | |
| 65 | - if($id){ |
|
| 65 | + if ($id) { |
|
| 66 | 66 | $this->menuService->updateMenuItem($data, $id); |
| 67 | 67 | } |
| 68 | - else{ |
|
| 68 | + else { |
|
| 69 | 69 | $this->menuService->addMenuItem($data); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu')); |
| 73 | 73 | } |
| 74 | - catch(FilterException $fe){ |
|
| 74 | + catch (FilterException $fe) { |
|
| 75 | 75 | return $this->edit($fe->getArrayMessages()); |
| 76 | 76 | } |
| 77 | - catch(\Exception $e){ |
|
| 77 | + catch (\Exception $e) { |
|
| 78 | 78 | throw $e; |
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function delete() |
| 83 | 83 | { |
| 84 | - try{ |
|
| 84 | + try { |
|
| 85 | 85 | $id = $this->request->getAttribute('id'); |
| 86 | 86 | $this->menuService->delete($id); |
| 87 | 87 | |
| 88 | 88 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu')); |
| 89 | 89 | } |
| 90 | - catch(\Exception $e){ |
|
| 90 | + catch (\Exception $e) { |
|
| 91 | 91 | throw $e; |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | public function updateOrder() |
| 96 | 96 | { |
| 97 | 97 | $data = $this->request->getParsedBody(); |
| 98 | - $menuOrder = isset($data['order']) ? json_decode($data['order']) : []; |
|
| 98 | + $menuOrder = isset($data[ 'order' ]) ? json_decode($data[ 'order' ]) : [ ]; |
|
| 99 | 99 | $status = $this->menuService->updateMenuOrder($menuOrder); |
| 100 | 100 | |
| 101 | - return new JsonResponse(['status' => $status]); |
|
| 101 | + return new JsonResponse([ 'status' => $status ]); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | \ No newline at end of file |
@@ -64,17 +64,14 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | if($id){ |
| 66 | 66 | $this->menuService->updateMenuItem($data, $id); |
| 67 | - } |
|
| 68 | - else{ |
|
| 67 | + } else{ |
|
| 69 | 68 | $this->menuService->addMenuItem($data); |
| 70 | 69 | } |
| 71 | 70 | |
| 72 | 71 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu')); |
| 73 | - } |
|
| 74 | - catch(FilterException $fe){ |
|
| 72 | + } catch(FilterException $fe){ |
|
| 75 | 73 | return $this->edit($fe->getArrayMessages()); |
| 76 | - } |
|
| 77 | - catch(\Exception $e){ |
|
| 74 | + } catch(\Exception $e){ |
|
| 78 | 75 | throw $e; |
| 79 | 76 | } |
| 80 | 77 | } |
@@ -86,8 +83,7 @@ discard block |
||
| 86 | 83 | $this->menuService->delete($id); |
| 87 | 84 | |
| 88 | 85 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu')); |
| 89 | - } |
|
| 90 | - catch(\Exception $e){ |
|
| 86 | + } catch(\Exception $e){ |
|
| 91 | 87 | throw $e; |
| 92 | 88 | } |
| 93 | 89 | } |
@@ -20,65 +20,65 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function getInputFilter() |
| 22 | 22 | { |
| 23 | - if(!$this->inputFilter){ |
|
| 23 | + if (!$this->inputFilter) { |
|
| 24 | 24 | $inputFilter = new InputFilter(); |
| 25 | 25 | |
| 26 | 26 | $inputFilter->add([ |
| 27 | 27 | 'name' => 'title', |
| 28 | 28 | 'required' => true, |
| 29 | - 'filters' => [['name' => 'StripTags'], ['name' => 'StringTrim']], |
|
| 29 | + 'filters' => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ], |
|
| 30 | 30 | 'validators' => [ |
| 31 | - ['name' => 'NotEmpty'], |
|
| 32 | - ['name' => 'StringLength', 'options' => ['max' => '255']], |
|
| 31 | + [ 'name' => 'NotEmpty' ], |
|
| 32 | + [ 'name' => 'StringLength', 'options' => [ 'max' => '255' ] ], |
|
| 33 | 33 | ], |
| 34 | 34 | ]); |
| 35 | 35 | |
| 36 | 36 | $inputFilter->add([ |
| 37 | 37 | 'name' => 'href', |
| 38 | 38 | 'required' => false, |
| 39 | - 'filters' => [['name' => 'StripTags'], ['name' => 'StringTrim']] |
|
| 39 | + 'filters' => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ] |
|
| 40 | 40 | ]); |
| 41 | 41 | |
| 42 | 42 | $inputFilter->add([ |
| 43 | 43 | 'name' => 'article_id', |
| 44 | 44 | 'required' => false, |
| 45 | - 'filters' => [['name' => 'Null']], |
|
| 45 | + 'filters' => [ [ 'name' => 'Null' ] ], |
|
| 46 | 46 | 'validators' => [ |
| 47 | - ['name' => RecordExists::class, 'options' => ['table' => 'articles', 'field' => 'article_id', 'adapter' => $this->db]] |
|
| 47 | + [ 'name' => RecordExists::class, 'options' => [ 'table' => 'articles', 'field' => 'article_id', 'adapter' => $this->db ] ] |
|
| 48 | 48 | ] |
| 49 | 49 | ]); |
| 50 | 50 | |
| 51 | 51 | $inputFilter->add([ |
| 52 | 52 | 'name' => 'category_id', |
| 53 | 53 | 'required' => false, |
| 54 | - 'filters' => [['name' => 'Null']], |
|
| 54 | + 'filters' => [ [ 'name' => 'Null' ] ], |
|
| 55 | 55 | 'validators' => [ |
| 56 | - ['name' => RecordExists::class, 'options' => ['table' => 'category', 'field' => 'category_id', 'adapter' => $this->db]] |
|
| 56 | + [ 'name' => RecordExists::class, 'options' => [ 'table' => 'category', 'field' => 'category_id', 'adapter' => $this->db ] ] |
|
| 57 | 57 | ] |
| 58 | 58 | ]); |
| 59 | 59 | |
| 60 | 60 | $inputFilter->add([ |
| 61 | 61 | 'name' => 'is_active', |
| 62 | 62 | 'required' => false, |
| 63 | - 'filters' => [['name' => 'Boolean']] |
|
| 63 | + 'filters' => [ [ 'name' => 'Boolean' ] ] |
|
| 64 | 64 | ]); |
| 65 | 65 | |
| 66 | 66 | $inputFilter->add([ |
| 67 | 67 | 'name' => 'is_in_header', |
| 68 | 68 | 'required' => false, |
| 69 | - 'filters' => [['name' => 'Boolean']] |
|
| 69 | + 'filters' => [ [ 'name' => 'Boolean' ] ] |
|
| 70 | 70 | ]); |
| 71 | 71 | |
| 72 | 72 | $inputFilter->add([ |
| 73 | 73 | 'name' => 'is_in_footer', |
| 74 | 74 | 'required' => false, |
| 75 | - 'filters' => [['name' => 'Boolean']] |
|
| 75 | + 'filters' => [ [ 'name' => 'Boolean' ] ] |
|
| 76 | 76 | ]); |
| 77 | 77 | |
| 78 | 78 | $inputFilter->add([ |
| 79 | 79 | 'name' => 'is_in_side', |
| 80 | 80 | 'required' => false, |
| 81 | - 'filters' => [['name' => 'Boolean']] |
|
| 81 | + 'filters' => [ [ 'name' => 'Boolean' ] ] |
|
| 82 | 82 | ]); |
| 83 | 83 | |
| 84 | 84 | $this->inputFilter = $inputFilter; |
@@ -15,24 +15,24 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -12,7 +12,7 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -11,8 +11,8 @@ |
||
| 11 | 11 | { |
| 12 | 12 | public function __invoke(ContainerInterface $container) |
| 13 | 13 | { |
| 14 | - $config = $container->get('config')['upload']; |
|
| 15 | - $upload = new Upload($config['public_path'], $config['non_public_path']); |
|
| 14 | + $config = $container->get('config')[ 'upload' ]; |
|
| 15 | + $upload = new Upload($config[ 'public_path' ], $config[ 'non_public_path' ]); |
|
| 16 | 16 | |
| 17 | 17 | return new PageService( |
| 18 | 18 | $container->get(PageMapper::class), |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | public function index(): HtmlResponse |
| 40 | 40 | { |
| 41 | 41 | $params = $this->request->getQueryParams(); |
| 42 | - $page = isset($params['page']) ? $params['page'] : 1; |
|
| 43 | - $limit = isset($params['limit']) ? $params['limit'] : 15; |
|
| 42 | + $page = isset($params[ 'page' ]) ? $params[ 'page' ] : 1; |
|
| 43 | + $limit = isset($params[ 'limit' ]) ? $params[ 'limit' ] : 15; |
|
| 44 | 44 | $pagination = $this->pageService->getPagination($page, $limit); |
| 45 | 45 | |
| 46 | 46 | return new HtmlResponse($this->template->render('page::index', [ |
@@ -49,14 +49,14 @@ discard block |
||
| 49 | 49 | ])); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - public function edit($errors = []): HtmlResponse |
|
| 52 | + public function edit($errors = [ ]): HtmlResponse |
|
| 53 | 53 | { |
| 54 | 54 | $id = $this->request->getAttribute('id'); |
| 55 | 55 | $page = $this->pageService->getPage($id); |
| 56 | 56 | |
| 57 | - if($this->request->getParsedBody()) { |
|
| 57 | + if ($this->request->getParsedBody()) { |
|
| 58 | 58 | $page = new \Page\Entity\Page(); |
| 59 | - $page->exchangeArray($this->request->getParsedBody() + (array)$page); |
|
| 59 | + $page->exchangeArray($this->request->getParsedBody() + (array) $page); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return new HtmlResponse($this->template->render('page::edit', [ |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | try { |
| 72 | 72 | $pageId = $this->request->getAttribute('id'); |
| 73 | 73 | $data = $this->request->getParsedBody(); |
| 74 | - $data += (new Request())->getFiles()->toArray(); |
|
| 74 | + $data += (new Request())->getFiles()->toArray(); |
|
| 75 | 75 | |
| 76 | - if($pageId) { |
|
| 76 | + if ($pageId) { |
|
| 77 | 77 | $this->pageService->updatePage($data, $pageId); |
| 78 | 78 | } |
| 79 | 79 | else { |
@@ -82,10 +82,10 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 84 | 84 | } |
| 85 | - catch(FilterException $fe) { |
|
| 85 | + catch (FilterException $fe) { |
|
| 86 | 86 | return $this->edit($fe->getArrayMessages()); |
| 87 | 87 | } |
| 88 | - catch(\Exception $e) { |
|
| 88 | + catch (\Exception $e) { |
|
| 89 | 89 | throw $e; |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 100 | 100 | } |
| 101 | - catch(\Exception $e) { |
|
| 101 | + catch (\Exception $e) { |
|
| 102 | 102 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -75,17 +75,14 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | if($pageId) { |
| 77 | 77 | $this->pageService->updatePage($data, $pageId); |
| 78 | - } |
|
| 79 | - else { |
|
| 78 | + } else { |
|
| 80 | 79 | $this->pageService->createPage($data); |
| 81 | 80 | } |
| 82 | 81 | |
| 83 | 82 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 84 | - } |
|
| 85 | - catch(FilterException $fe) { |
|
| 83 | + } catch(FilterException $fe) { |
|
| 86 | 84 | return $this->edit($fe->getArrayMessages()); |
| 87 | - } |
|
| 88 | - catch(\Exception $e) { |
|
| 85 | + } catch(\Exception $e) { |
|
| 89 | 86 | throw $e; |
| 90 | 87 | } |
| 91 | 88 | } |
@@ -97,8 +94,7 @@ discard block |
||
| 97 | 94 | $this->pageService->delete($pageId); |
| 98 | 95 | |
| 99 | 96 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 100 | - } |
|
| 101 | - catch(\Exception $e) { |
|
| 97 | + } catch(\Exception $e) { |
|
| 102 | 98 | return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages')); |
| 103 | 99 | } |
| 104 | 100 | } |