Completed
Push — master ( d127e1...fbccd8 )
by Aleksandar
26:32
created
packages/Page/src/Entity/Page.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -228,10 +228,10 @@  discard block
 block discarded – undo
228 228
      *
229 229
      * @param array $data
230 230
      */
231
-    public function exchangeArray($data = [])
231
+    public function exchangeArray($data = [ ])
232 232
     {
233 233
         foreach (array_keys(get_object_vars($this)) as $property) {
234
-            $this->{$property} = isset($data[$property]) ? $data[$property]
234
+            $this->{$property} = isset($data[ $property ]) ? $data[ $property ]
235 235
                 : null;
236 236
         }
237 237
     }
@@ -242,18 +242,18 @@  discard block
 block discarded – undo
242 242
     public function getArrayCopy()
243 243
     {
244 244
         return [
245
-            'page_uuid'         => (binary)$this->page_uuid,
246
-            'page_id'           => (string)$this->page_id,
247
-            'title'             => (string)$this->title,
248
-            'body'              => (string)$this->body,
249
-            'description'       => (string)$this->description,
250
-            'main_img'          => (string)$this->main_img,
251
-            'has_layout'        => (boolean)$this->has_layout,
252
-            'is_homepage'       => (boolean)$this->is_homepage,
253
-            'is_active'         => (boolean)$this->is_active,
254
-            'is_wysiwyg_editor' => (boolean)$this->is_wysiwyg_editor,
255
-            'created_at'        => (string)$this->created_at,
256
-            'slug'              => (string)$this->slug
245
+            'page_uuid'         => (binary) $this->page_uuid,
246
+            'page_id'           => (string) $this->page_id,
247
+            'title'             => (string) $this->title,
248
+            'body'              => (string) $this->body,
249
+            'description'       => (string) $this->description,
250
+            'main_img'          => (string) $this->main_img,
251
+            'has_layout'        => (boolean) $this->has_layout,
252
+            'is_homepage'       => (boolean) $this->is_homepage,
253
+            'is_active'         => (boolean) $this->is_active,
254
+            'is_wysiwyg_editor' => (boolean) $this->is_wysiwyg_editor,
255
+            'created_at'        => (string) $this->created_at,
256
+            'slug'              => (string) $this->slug
257 257
         ];
258 258
     }
259 259
 
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('page', 'page.page_uuid = menu.page_uuid', ['page_id', 'page_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('page', 'page.page_uuid = menu.page_uuid', [ 'page_id', 'page_slug' => 'slug' ], 'left')
23
+            ->order([ 'order_no' => 'asc' ]);
24 24
 
25
-        if($isActive !== null) {
26
-            $select->where(['menu.is_active' => $isActive]);
25
+        if ($isActive !== null) {
26
+            $select->where([ 'menu.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('page', 'page.page_uuid = menu.page_uuid', ['page_id'], 'left')
60
-            ->join('category', 'category.category_uuid = menu.category_uuid', ['category_id'], 'left')
61
-            ->where(['menu_id' => $id]);
59
+            ->join('page', 'page.page_uuid = menu.page_uuid', [ 'page_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/View/Helper/MenuUrlHelper.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
      */
32 32
     public function __invoke($menuItem)
33 33
     {
34
-        if($menuItem['href']) {
35
-            return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
34
+        if ($menuItem[ 'href' ]) {
35
+            return strpos($menuItem[ 'href' ], 'http') === 0 ? $menuItem[ 'href' ] : '/' . $menuItem[ 'href' ];
36 36
         }
37
-        elseif($menuItem['page_slug']) {
38
-            return $this->url->__invoke('page', ['url_slug' => $menuItem['page_slug']]);
37
+        elseif ($menuItem[ 'page_slug' ]) {
38
+            return $this->url->__invoke('page', [ 'url_slug' => $menuItem[ 'page_slug' ] ]);
39 39
         }
40
-        elseif($menuItem['category_slug']) {
41
-            return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
40
+        elseif ($menuItem[ 'category_slug' ]) {
41
+            return $this->url->__invoke('category', [ 'category' => $menuItem[ 'category_slug' ] ]);
42 42
         }
43 43
         else {
44 44
             return '#';
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,14 +33,11 @@
 block discarded – undo
33 33
     {
34 34
         if($menuItem['href']) {
35 35
             return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
36
-        }
37
-        elseif($menuItem['page_slug']) {
36
+        } elseif($menuItem['page_slug']) {
38 37
             return $this->url->__invoke('page', ['url_slug' => $menuItem['page_slug']]);
39
-        }
40
-        elseif($menuItem['category_slug']) {
38
+        } elseif($menuItem['category_slug']) {
41 39
             return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
42
-        }
43
-        else {
40
+        } else {
44 41
             return '#';
45 42
         }
46 43
     }
Please login to merge, or discard this patch.
packages/Menu/src/Filter/MenuFilter.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -20,17 +20,17 @@  discard block
 block discarded – undo
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
                 [
28 28
                 'name'       => 'title',
29 29
                 'required'   => true,
30
-                'filters'    => [['name' => 'StripTags'], ['name' => 'StringTrim']],
30
+                'filters'    => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ],
31 31
                 'validators' => [
32
-                    ['name' => 'NotEmpty'],
33
-                    ['name' => 'StringLength', 'options' => ['max' => '255']],
32
+                    [ 'name' => 'NotEmpty' ],
33
+                    [ 'name' => 'StringLength', 'options' => [ 'max' => '255' ] ],
34 34
                 ],
35 35
                 ]
36 36
             );
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                 [
40 40
                 'name'     => 'href',
41 41
                 'required' => false,
42
-                'filters'  => [['name' => 'StripTags'], ['name' => 'StringTrim']]
42
+                'filters'  => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ]
43 43
                 ]
44 44
             );
45 45
 
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
                 [
48 48
                 'name'       => 'page_id',
49 49
                 'required'   => false,
50
-                'filters'    => [['name' => 'Null']],
50
+                'filters'    => [ [ 'name' => 'Null' ] ],
51 51
                 'validators' => [
52
-                    ['name' => RecordExists::class, 'options' => ['table' => 'page', 'field' => 'page_id', 'adapter' => $this->db]]
52
+                    [ 'name' => RecordExists::class, 'options' => [ 'table' => 'page', 'field' => 'page_id', 'adapter' => $this->db ] ]
53 53
                 ]
54 54
                 ]
55 55
             );
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
                 [
59 59
                 'name'       => 'category_id',
60 60
                 'required'   => false,
61
-                'filters'    => [['name' => 'Null']],
61
+                'filters'    => [ [ 'name' => 'Null' ] ],
62 62
                 'validators' => [
63
-                    ['name' => RecordExists::class, 'options' => ['table' => 'category', 'field' => 'category_id', 'adapter' => $this->db]]
63
+                    [ 'name' => RecordExists::class, 'options' => [ 'table' => 'category', 'field' => 'category_id', 'adapter' => $this->db ] ]
64 64
                 ]
65 65
                 ]
66 66
             );
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 [
70 70
                 'name'     => 'is_active',
71 71
                 'required' => false,
72
-                'filters'  => [['name' => 'Boolean']]
72
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
73 73
                 ]
74 74
             );
75 75
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                 [
78 78
                 'name'     => 'is_in_header',
79 79
                 'required' => false,
80
-                'filters'  => [['name' => 'Boolean']]
80
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
81 81
                 ]
82 82
             );
83 83
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                 [
86 86
                 'name'     => 'is_in_footer',
87 87
                 'required' => false,
88
-                'filters'  => [['name' => 'Boolean']]
88
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
89 89
                 ]
90 90
             );
91 91
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
                 [
94 94
                 'name'     => 'is_in_side',
95 95
                 'required' => false,
96
-                'filters'  => [['name' => 'Boolean']]
96
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
97 97
                 ]
98 98
             );
99 99
 
Please login to merge, or discard this patch.
data/phinx/migrations/20161003183351_page.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 {
7 7
     public function change()
8 8
     {
9
-        $this->table('page', ['id' => false, 'primary_key' => 'page_uuid'])
10
-            ->addColumn('page_uuid', 'binary', ['limit' => 16])
9
+        $this->table('page', [ 'id' => false, 'primary_key' => 'page_uuid' ])
10
+            ->addColumn('page_uuid', 'binary', [ 'limit' => 16 ])
11 11
             ->addColumn('page_id', 'text')
12 12
             ->addColumn('title', 'text')
13 13
             ->addColumn('body', 'text')
14 14
             ->addColumn('description', 'text')
15 15
             ->addColumn('slug', 'text')
16
-            ->addColumn('main_img', 'text', ['null' => true])
17
-            ->addColumn('has_layout', 'boolean', ['default' => true])
18
-            ->addColumn('is_homepage', 'boolean', ['default' => false])
19
-            ->addColumn('is_active', 'boolean', ['default' => false])
20
-            ->addColumn('is_wysiwyg_editor', 'boolean', ['default' => false])
21
-            ->addColumn('created_at', 'timestamp', ['default' => 'CURRENT_TIMESTAMP'])
16
+            ->addColumn('main_img', 'text', [ 'null' => true ])
17
+            ->addColumn('has_layout', 'boolean', [ 'default' => true ])
18
+            ->addColumn('is_homepage', 'boolean', [ 'default' => false ])
19
+            ->addColumn('is_active', 'boolean', [ 'default' => false ])
20
+            ->addColumn('is_wysiwyg_editor', 'boolean', [ 'default' => false ])
21
+            ->addColumn('created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ])
22 22
             ->create();
23 23
     }
24 24
 }
Please login to merge, or discard this patch.
data/phinx/migrations/20170214131105_menu.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -7,23 +7,23 @@
 block discarded – undo
7 7
 
8 8
     public function up()
9 9
     {
10
-        $this->table('menu', ['id' => false, 'primary_key' => 'menu_uuid'])
11
-            ->addColumn('menu_uuid', 'binary', ['limit' => 16])
10
+        $this->table('menu', [ 'id' => false, 'primary_key' => 'menu_uuid' ])
11
+            ->addColumn('menu_uuid', 'binary', [ 'limit' => 16 ])
12 12
             ->addColumn('menu_id', 'text')
13
-            ->addColumn('parent_id', 'text', ['null' => true])
13
+            ->addColumn('parent_id', 'text', [ 'null' => true ])
14 14
             ->addColumn('title', 'text')
15
-            ->addColumn('href', 'text', ['null' => true])
16
-            ->addColumn('is_active', 'boolean', ['default' => false])
17
-            ->addColumn('is_in_header', 'boolean', ['default' => true])
18
-            ->addColumn('is_in_footer', 'boolean', ['default' => true])
19
-            ->addColumn('is_in_side', 'boolean', ['default' => true])
20
-            ->addColumn('order_no', 'integer', ['default' => 0])
21
-            ->addColumn('created_at', 'datetime', ['null' => true])
15
+            ->addColumn('href', 'text', [ 'null' => true ])
16
+            ->addColumn('is_active', 'boolean', [ 'default' => false ])
17
+            ->addColumn('is_in_header', 'boolean', [ 'default' => true ])
18
+            ->addColumn('is_in_footer', 'boolean', [ 'default' => true ])
19
+            ->addColumn('is_in_side', 'boolean', [ 'default' => true ])
20
+            ->addColumn('order_no', 'integer', [ 'default' => 0 ])
21
+            ->addColumn('created_at', 'datetime', [ 'null' => true ])
22 22
             //->addForeignKey('parent_id', 'menu', 'id', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION']) # we can not add constraints
23
-            ->addColumn('page_uuid', 'binary', ['limit' => 16, 'null' => true])
24
-            ->addColumn('category_uuid', 'binary', ['limit' => 16, 'null' => true])
25
-            ->addForeignKey('page_uuid', 'page', 'page_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
26
-            ->addForeignKey('category_uuid', 'category', 'category_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
23
+            ->addColumn('page_uuid', 'binary', [ 'limit' => 16, 'null' => true ])
24
+            ->addColumn('category_uuid', 'binary', [ 'limit' => 16, 'null' => true ])
25
+            ->addForeignKey('page_uuid', 'page', 'page_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
26
+            ->addForeignKey('category_uuid', 'category', 'category_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
27 27
             ->create();
28 28
     }
29 29
 
Please login to merge, or discard this patch.
data/phinx/seeds/Menu.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             'is_in_side'    => false,
41 41
             'order_no'      => 2,
42 42
             'page_uuid'     => null,
43
-            'category_uuid' => $categoryVideo['category_uuid']
43
+            'category_uuid' => $categoryVideo[ 'category_uuid' ]
44 44
         ])->save();
45 45
 
46 46
         // Insert events category in Menu
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
             'is_in_side'    => false,
58 58
             'order_no'      => 3,
59 59
             'page_uuid'     => null,
60
-            'category_uuid' => $categoryEvent['category_uuid']
60
+            'category_uuid' => $categoryEvent[ 'category_uuid' ]
61 61
         ])->save();
62 62
 
63 63
         // Insert link to external web site
Please login to merge, or discard this patch.