o2system / framework

src/Libraries/Ui/Components/Form/Elements/Select.php

Spacing +4 added lines, -4 removed lines

@@ -36,10 +36,10 @@
     {
         parent::__construct('select');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName('select-' . $attributes[ 'id' ]);
-        } elseif (isset($attributes[ 'name' ])) {
-            $this->entity->setEntityName('select-' . $attributes[ 'name' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName('select-' . $attributes['id']);
+        } elseif (isset($attributes['name'])) {
+            $this->entity->setEntityName('select-' . $attributes['name']);
         }
 
         if (count($attributes)) {

src/Libraries/Ui/Components/Form/Elements/Label.php

Spacing +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
     {
         parent::__construct('label');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName('label-' . $attributes[ 'id' ]);
-        } elseif (isset($attributes[ 'for' ])) {
-            $this->entity->setEntityName('label-' . $attributes[ 'name' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName('label-' . $attributes['id']);
+        } elseif (isset($attributes['for'])) {
+            $this->entity->setEntityName('label-' . $attributes['name']);
         }
 
         if (count($attributes)) {

src/Libraries/Ui/Components/Form/Elements/Traits/ElementsCreatorTrait.php

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
      */
     public function createInput(array $attributes = [])
     {
-        if (isset($attributes[ 'type' ])) {
-            switch ($attributes[ 'type' ]) {
+        if (isset($attributes['type'])) {
+            switch ($attributes['type']) {
                 default:
                     $input = new Form\Elements\Input($attributes);
                     break;

src/Libraries/Ui/Components/Button.php

Spacing +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
         parent::__construct('button');
         $this->attributes->addAttribute('type', 'button');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName('btn-' . $attributes[ 'id' ]);
-        } elseif (isset($attributes[ 'name' ])) {
-            $this->entity->setEntityName('btn-' . $attributes[ 'name' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName('btn-' . $attributes['id']);
+        } elseif (isset($attributes['name'])) {
+            $this->entity->setEntityName('btn-' . $attributes['name']);
         }
 
         if (count($attributes)) {

src/Libraries/Ui/Components/Carousel/Slides.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     public function setIndicators(Indicators &$indicators)
     {
-        $this->indicators =& $indicators;
+        $this->indicators = & $indicators;
 
         return $this;
     }

src/Libraries/Ui/Components/Form.php

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
     {
         parent::__construct('form');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName($attributes[ 'id' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName($attributes['id']);
         }
 
         if (count($attributes)) {

src/Libraries/Cart.php

Spacing +25 added lines, -25 removed lines

@@ -29,11 +29,11 @@ 
      */
     public function __construct()
     {
-        if (empty($_SESSION[ 'o2system' ][ 'cart' ])) {
-            $_SESSION[ 'o2system' ][ 'cart' ] = [];
+        if (empty($_SESSION['o2system']['cart'])) {
+            $_SESSION['o2system']['cart'] = [];
         }
 
-        $this->storage =& $_SESSION[ 'o2system' ][ 'cart' ];
+        $this->storage = & $_SESSION['o2system']['cart'];
     }
 
     // ------------------------------------------------------------------------
@@ -56,29 +56,29 @@ 
         ], $item);
 
         // set sku
-        $sku = empty($item[ 'sku' ]) ? $item[ 'id' ] : $item[ 'sku' ];
+        $sku = empty($item['sku']) ? $item['id'] : $item['sku'];
 
         // set sub-total
-        $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ];
-        $item[ 'subTotal' ][ 'discount' ] = 0;
+        $item['subTotal']['price'] = $item['price'] * $item['quantity'];
+        $item['subTotal']['discount'] = 0;
 
-        if (is_numeric($item[ 'discount' ])) {
-            $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] - $item[ 'discount' ];
-        } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '+') !== false) {
+        if (is_numeric($item['discount'])) {
+            $item['subTotal']['discount'] = $item['subTotal']['price'] - $item['discount'];
+        } elseif (is_string($item['discount']) && strpos($item['discount'], '+') !== false) {
             $discounts = explode('+', $item['discount']);
-            if(count($discounts)) {
-                $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval(reset($discounts)) / 100);
-                foreach(array_slice($discounts, 1) as $discount) {
-                    $item[ 'subTotal' ][ 'discount' ] += $item[ 'subTotal' ][ 'discount' ] * (intval($discount) / 100);
+            if (count($discounts)) {
+                $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval(reset($discounts)) / 100);
+                foreach (array_slice($discounts, 1) as $discount) {
+                    $item['subTotal']['discount'] += $item['subTotal']['discount'] * (intval($discount) / 100);
                 }
             }
-        } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '%') !== false) {
-            $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval($item[ 'discount' ]) / 100);
+        } elseif (is_string($item['discount']) && strpos($item['discount'], '%') !== false) {
+            $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval($item['discount']) / 100);
         }
 
-        $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ];
+        $item['subTotal']['weight'] = $item['weight'] * $item['quantity'];
 
-        $this->storage[ $sku ] = $item;
+        $this->storage[$sku] = $item;
     }
 
     // ------------------------------------------------------------------------
@@ -97,10 +97,10 @@ 
             $item = array_merge($this->offsetGet($sku), $item);
 
             // update sub-total
-            $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ];
-            $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ];
+            $item['subTotal']['price'] = $item['price'] * $item['quantity'];
+            $item['subTotal']['weight'] = $item['weight'] * $item['quantity'];
 
-            $this->storage[ $sku ] = $item;
+            $this->storage[$sku] = $item;
 
             return true;
         }
@@ -121,8 +121,8 @@ 
 
         if ($this->count()) {
             foreach ($this->storage as $id => $item) {
-                if (isset($item[ 'subTotal' ][ 'weight' ])) {
-                    $totalWeight += (int)$item[ 'weight' ];
+                if (isset($item['subTotal']['weight'])) {
+                    $totalWeight += (int)$item['weight'];
                 }
             }
         }
@@ -143,8 +143,8 @@ 
 
         if ($this->count()) {
             foreach ($this->storage as $id => $item) {
-                if (isset($item[ 'subTotal' ][ 'price' ])) {
-                    $totalPrice += (int)$item[ 'price' ];
+                if (isset($item['subTotal']['price'])) {
+                    $totalPrice += (int)$item['price'];
                 }
             }
         }
@@ -154,7 +154,7 @@ 
 
     public function destroy()
     {
-        unset($_SESSION[ 'o2system' ][ 'cart' ]);
+        unset($_SESSION['o2system']['cart']);
         parent::destroy();
 
     }

src/Libraries/Crud/Table.php

Spacing +74 added lines, -74 removed lines

@@ -225,7 +225,7 @@ 
     {
         $this->config = array_merge($this->config, $config);
 
-        if ($this->config[ 'responsive' ]) {
+        if ($this->config['responsive']) {
             $this->responsive();
         }
 
@@ -265,7 +265,7 @@ 
 
         foreach ($columns as $key => $column) {
             $column = array_merge($defaultColumn, $column);
-            $this->columns[ $key ] = $column;
+            $this->columns[$key] = $column;
         }
 
         $this->setAppendColumns();
@@ -335,8 +335,8 @@ 
         ];
 
         foreach ($prependColumns as $key => $column) {
-            if ($this->config[ $key ] === true) {
-                $this->columns[ $key ] = $column;
+            if ($this->config[$key] === true) {
+                $this->columns[$key] = $column;
             }
         }
     }
@@ -408,8 +408,8 @@ 
         ];
 
         foreach ($appendColumns as $key => $column) {
-            if ($this->config[ $key ] === true) {
-                $this->columns[ $key ] = $column;
+            if ($this->config[$key] === true) {
+                $this->columns[$key] = $column;
             }
         }
     }
@@ -437,7 +437,7 @@ 
 
     public function render()
     {
-        if ($this->config[ 'ordering' ]) {
+        if ($this->config['ordering']) {
             $this->attributes->addAttributeClass('table-ordering');
         }
 
@@ -448,15 +448,15 @@ 
 
             $th = $tr->createColumn('th');
 
-            $column[ 'attr' ][ 'data-column' ] = $key;
+            $column['attr']['data-column'] = $key;
 
-            foreach ($column[ 'attr' ] as $name => $value) {
+            foreach ($column['attr'] as $name => $value) {
                 if ( ! empty($value)) {
                     $th->attributes->addAttribute($name, $value);
                 }
             }
 
-            if ($column[ 'sorting' ] === true) {
+            if ($column['sorting'] === true) {
                 $icon = new Ui\Contents\Icon('fa fa-sort');
                 $icon->attributes->addAttributeClass(['text-muted', 'float-right', 'mt-1']);
 
@@ -465,11 +465,11 @@ 
                 $th->childNodes->push($icon);
             }
 
-            if ($column[ 'show' ] === false) {
+            if ($column['show'] === false) {
                 $th->attributes->addAttributeClass('hidden');
             }
 
-            $th->textContent->push(language()->getLine($column[ 'label' ]));
+            $th->textContent->push(language()->getLine($column['label']));
         }
 
         // Render tbody
@@ -477,8 +477,8 @@ 
             $totalEntries = $this->rows->count();
             $totalRows = $this->rows->countAll();
             $currentPage = input()->get('page') ? input()->get('page') : 1;
-            $startNumber = $currentPage == 1 ? 1 : $currentPage * $this->config[ 'entries' ][ 'minimum' ];
-            $totalPages = round($totalRows / $this->config[ 'entries' ][ 'minimum' ]);
+            $startNumber = $currentPage == 1 ? 1 : $currentPage * $this->config['entries']['minimum'];
+            $totalPages = round($totalRows / $this->config['entries']['minimum']);
             $totalPages = $totalPages == 0 && $totalRows > 0 ? 1 : $totalPages;
 
             $i = $startNumber;
@@ -489,18 +489,18 @@ 
 
                 foreach ($this->columns as $key => $column) {
 
-                    $column[ 'key' ] = $key;
+                    $column['key'] = $key;
                     $td = $tr->createColumn();
 
-                    $column[ 'attr' ][ 'data-column' ] = $key;
+                    $column['attr']['data-column'] = $key;
 
-                    foreach ($column[ 'attr' ] as $name => $value) {
+                    foreach ($column['attr'] as $name => $value) {
                         if ( ! empty($value)) {
                             $td->attributes->addAttribute($name, $value);
                         }
                     }
 
-                    if ($column[ 'show' ] === false) {
+                    if ($column['show'] === false) {
                         $td->attributes->addAttributeClass('hidden');
                     }
 
@@ -519,7 +519,7 @@ 
             $totalPages = 0;
         }
 
-        $showEntries = input()->get('entries') ? input()->get('entries') : $this->config[ 'entries' ][ 'minimum' ];
+        $showEntries = input()->get('entries') ? input()->get('entries') : $this->config['entries']['minimum'];
 
         // Build table card
         $card = new Ui\Components\Card();
@@ -532,33 +532,33 @@ 
 
         $buttons = new Ui\Components\Buttons\Group();
         foreach ($this->tools as $key => $tool) {
-            if ($tool[ 'show' ] === false) {
+            if ($tool['show'] === false) {
                 continue;
             }
 
-            if ($tool[ 'label' ] === true) {
+            if ($tool['label'] === true) {
                 $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
-                if ( ! empty($tool[ 'icon' ])) {
-                    $button->setIcon($tool[ 'icon' ]);
+                if ( ! empty($tool['icon'])) {
+                    $button->setIcon($tool['icon']);
                 }
             } else {
-                $button = $buttons->createButton(new Ui\Contents\Icon($tool[ 'icon' ]));
+                $button = $buttons->createButton(new Ui\Contents\Icon($tool['icon']));
                 $button->attributes->addAttribute('data-toggle', 'tooltip');
                 $button->attributes->addAttribute('title',
                     language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
             }
 
-            if ( ! empty($tool[ 'href' ])) {
-                $tool[ 'data-url' ] = $tool[ 'href' ];
+            if ( ! empty($tool['href'])) {
+                $tool['data-url'] = $tool['href'];
             }
 
-            if (isset($tool[ 'attr' ])) {
-                foreach ($tool[ 'attr' ] as $name => $value) {
+            if (isset($tool['attr'])) {
+                foreach ($tool['attr'] as $name => $value) {
                     $button->attributes->addAttribute($name, $value);
                 }
             }
 
-            $button->setContextualClass($tool[ 'contextual' ]);
+            $button->setContextualClass($tool['contextual']);
             $button->smallSize();
             $button->attributes->addAttribute('data-action', $key);
         }
@@ -573,33 +573,33 @@ 
 
         $buttons = new Ui\Components\Buttons\Group();
         foreach ($this->options as $key => $option) {
-            if ($option[ 'show' ] === false) {
+            if ($option['show'] === false) {
                 continue;
             }
 
-            if ($option[ 'label' ] === true) {
+            if ($option['label'] === true) {
                 $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
-                if ( ! empty($option[ 'icon' ])) {
-                    $button->setIcon($option[ 'icon' ]);
+                if ( ! empty($option['icon'])) {
+                    $button->setIcon($option['icon']);
                 }
             } else {
-                $button = $buttons->createButton(new Ui\Contents\Icon($option[ 'icon' ]));
+                $button = $buttons->createButton(new Ui\Contents\Icon($option['icon']));
                 $button->attributes->addAttribute('data-toggle', 'tooltip');
                 $button->attributes->addAttribute('title',
                     language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
             }
 
-            if ( ! empty($option[ 'href' ])) {
-                $option[ 'data-url' ] = $option[ 'href' ];
+            if ( ! empty($option['href'])) {
+                $option['data-url'] = $option['href'];
             }
 
-            if (isset($option[ 'attr' ])) {
-                foreach ($option[ 'attr' ] as $name => $value) {
+            if (isset($option['attr'])) {
+                foreach ($option['attr'] as $name => $value) {
                     $button->attributes->addAttribute($name, $value);
                 }
             }
 
-            $button->setContextualClass($option[ 'contextual' ]);
+            $button->setContextualClass($option['contextual']);
             $button->smallSize();
             $button->attributes->addAttribute('data-action', $key);
         }
@@ -634,9 +634,9 @@ 
         $inputGroup->childNodes->push($addOn);
 
         $options = [];
-        foreach (range((int)$this->config[ 'entries' ][ 'minimum' ], (int)$this->config[ 'entries' ][ 'maximum' ],
-            (int)$this->config[ 'entries' ][ 'step' ]) as $entries) {
-            $options[ $entries ] = $entries;
+        foreach (range((int)$this->config['entries']['minimum'], (int)$this->config['entries']['maximum'],
+            (int)$this->config['entries']['step']) as $entries) {
+            $options[$entries] = $entries;
         }
 
         $columnsDropdown = new Ui\Components\Dropdown(language()->getLine('TABLE_LABEL_COLUMNS'));
@@ -644,13 +644,13 @@ 
 
         foreach ($this->columns as $key => $column) {
 
-            if ($column[ 'hiding' ] === false) {
+            if ($column['hiding'] === false) {
                 continue;
             }
 
             $label = new Ui\Components\Form\Elements\Label();
             $label->attributes->addAttributeClass('form-check-label');
-            $label->textContent->push(language()->getLine($column[ 'label' ]));
+            $label->textContent->push(language()->getLine($column['label']));
 
             $checkbox = new Ui\Components\Form\Elements\Input([
                 'type'        => 'checkbox',
@@ -661,7 +661,7 @@ 
 
             $checkbox->attributes->removeAttributeClass('form-control');
 
-            if ($column[ 'show' ] === true) {
+            if ($column['show'] === true) {
                 $checkbox->attributes->addAttribute('checked', 'checked');
             }
 
@@ -707,33 +707,33 @@ 
 
     protected function renderBodyColumn($td, array $column, Result\Row $row)
     {
-        switch ($column[ 'format' ]) {
+        switch ($column['format']) {
             default:
-                if (is_callable($column[ 'format' ])) {
-                    if (is_array($column[ 'field' ])) {
-                        foreach ($column[ 'field' ] as $field) {
-                            $args[ $field ] = $row->offsetGet($field);
+                if (is_callable($column['format'])) {
+                    if (is_array($column['field'])) {
+                        foreach ($column['field'] as $field) {
+                            $args[$field] = $row->offsetGet($field);
                         }
-                        $textContent = call_user_func_array($column[ 'format' ], $args);
-                    } elseif ($row->offsetExists($column[ 'field' ])) {
-                        $textContent = call_user_func_array($column[ 'format' ],
-                            [$row->offsetGet($column[ 'field' ])]);
+                        $textContent = call_user_func_array($column['format'], $args);
+                    } elseif ($row->offsetExists($column['field'])) {
+                        $textContent = call_user_func_array($column['format'],
+                            [$row->offsetGet($column['field'])]);
                     }
 
                     $td->textContent->push($textContent);
 
-                } elseif (strpos($column[ 'format' ], '{{') !== false) {
-                    $textContent = str_replace(['{{', '}}'], '', $column[ 'format' ]);
-                    if (is_array($column[ 'field' ])) {
-                        foreach ($column[ 'field' ] as $field) {
+                } elseif (strpos($column['format'], '{{') !== false) {
+                    $textContent = str_replace(['{{', '}}'], '', $column['format']);
+                    if (is_array($column['field'])) {
+                        foreach ($column['field'] as $field) {
                             if ($row->offsetExists($field)) {
                                 $textContent = str_replace('$' . $field, $row->offsetGet($field), $textContent);
                             } else {
                                 $textContent = str_replace('$' . $field, '', $textContent);
                             }
                         }
-                    } elseif ($row->offsetExists($column[ 'field' ])) {
-                        $textContent = str_replace('$' . $column[ 'field' ], $row->offsetGet($column[ 'field' ]),
+                    } elseif ($row->offsetExists($column['field'])) {
+                        $textContent = str_replace('$' . $column['field'], $row->offsetGet($column['field']),
                             $textContent);
                     }
 
@@ -753,18 +753,18 @@ 
             case 'text':
             case 'price':
             case 'number':
-                if ($row->offsetExists($column[ 'field' ])) {
-                    $td->textContent->push($row->offsetGet($column[ 'field' ]));
+                if ($row->offsetExists($column['field'])) {
+                    $td->textContent->push($row->offsetGet($column['field']));
                 }
                 break;
             case 'date':
-                if ($row->offsetExists($column[ 'field' ])) {
+                if ($row->offsetExists($column['field'])) {
                     print_out('date');
                 }
                 break;
 
             case 'status':
-                if ($row->offsetExists($column[ 'field' ])) {
+                if ($row->offsetExists($column['field'])) {
                     $options = [
                         'PUBLISH'   => 'success',
                         'UNPUBLISH' => 'warning',
@@ -774,8 +774,8 @@ 
                     ];
 
                     $badge = new Ui\Components\Badge(
-                        language()->getLine('TABLE_OPTION_' . $row->offsetGet($column[ 'field' ])),
-                        $options[ $row->offsetGet($column[ 'field' ]) ]
+                        language()->getLine('TABLE_OPTION_' . $row->offsetGet($column['field'])),
+                        $options[$row->offsetGet($column['field'])]
                     );
 
                     $td->childNodes->push($badge);
@@ -789,29 +789,29 @@ 
 
                 foreach ($this->actions as $key => $action) {
 
-                    if ($action[ 'show' ] === false) {
+                    if ($action['show'] === false) {
                         continue;
                     }
 
-                    if ($action[ 'label' ] === true) {
+                    if ($action['label'] === true) {
                         $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
-                        if ( ! empty($action[ 'icon' ])) {
-                            $button->setIcon($action[ 'icon' ]);
+                        if ( ! empty($action['icon'])) {
+                            $button->setIcon($action['icon']);
                         }
                     } else {
-                        $button = $buttons->createButton(new Ui\Contents\Icon($action[ 'icon' ]));
+                        $button = $buttons->createButton(new Ui\Contents\Icon($action['icon']));
                         $button->attributes->addAttribute('data-toggle', 'tooltip');
                         $button->attributes->addAttribute('title',
                             language()->getLine('TABLE_BUTTON_' . strtoupper($key)));
                     }
 
-                    if (isset($action[ 'attr' ])) {
-                        foreach ($action[ 'attr' ] as $name => $value) {
+                    if (isset($action['attr'])) {
+                        foreach ($action['attr'] as $name => $value) {
                             $button->attributes->addAttribute($name, $value);
                         }
                     }
 
-                    $button->setContextualClass($action[ 'contextual' ]);
+                    $button->setContextualClass($action['contextual']);
                     $button->smallSize();
                     $button->attributes->addAttribute('data-action', $key);
                 }

src/Libraries/Crud/Form.php

Spacing +22 added lines, -22 removed lines

@@ -191,13 +191,13 @@ 
 
     public function setFieldsets(array $fieldsets, $group = 'main')
     {
-        $this->fieldsets[ $group ] = $fieldsets;
+        $this->fieldsets[$group] = $fieldsets;
     }
 
     public function setFieldset(array $fieldset, $legend = '', $group = 'main')
     {
         if (array_key_exists($group, $this->fieldsets)) {
-            $this->fieldsets[ $group ][ $legend ] = $fieldset;
+            $this->fieldsets[$group][$legend] = $fieldset;
         }
     }
 
@@ -215,7 +215,7 @@ 
      */
     public function setFields(array $fields = [])
     {
-        $this->fieldsets[ 'blank' ][ 'fields' ] = $fields;
+        $this->fieldsets['blank']['fields'] = $fields;
 
         return $this;
     }
@@ -247,40 +247,40 @@ 
 
     public function render()
     {
-        $panel[ 'header' ] = new Panel(Panel::DEFAULT_PANEL);
-        $panel[ 'header' ]->setTitle($this->title);
-        $panel[ 'header' ]->addAttribute('data-role', 'form-panel-header');
+        $panel['header'] = new Panel(Panel::DEFAULT_PANEL);
+        $panel['header']->setTitle($this->title);
+        $panel['header']->addAttribute('data-role', 'form-panel-header');
 
         foreach ($this->fieldsets as $group => $fieldsets) {
-            $panel[ $group ] = new Group(Group::PANEL_GROUP);
+            $panel[$group] = new Group(Group::PANEL_GROUP);
 
             foreach ($fieldsets as $role => $fieldset) {
-                $attr = isset($fieldset[ 'attr' ]) ? $fieldset[ 'attr' ] : [];
-                $attr[ 'data-role' ] = $role;
+                $attr = isset($fieldset['attr']) ? $fieldset['attr'] : [];
+                $attr['data-role'] = $role;
 
-                if (isset($fieldset[ 'collapse' ]) AND $fieldset[ 'collapse' ] === true) {
-                    $attr[ 'data-state' ] = 'collapse';
+                if (isset($fieldset['collapse']) AND $fieldset['collapse'] === true) {
+                    $attr['data-state'] = 'collapse';
                 }
 
-                if (isset($fieldset[ 'type' ])) {
-                    $panel[ $group ]->addItem(
-                        (new Fieldset($fieldset[ 'legend' ], Fieldset::PANEL_FIELDSET))
-                            ->addItems($fieldset[ 'fields' ])
+                if (isset($fieldset['type'])) {
+                    $panel[$group]->addItem(
+                        (new Fieldset($fieldset['legend'], Fieldset::PANEL_FIELDSET))
+                            ->addItems($fieldset['fields'])
                             ->setAttributes($attr)
-                            ->setGroupType($fieldset[ 'type' ]));
+                            ->setGroupType($fieldset['type']));
                 } else {
-                    $panel[ $group ]->addItem(
-                        (new Fieldset($fieldset[ 'legend' ], Fieldset::PANEL_FIELDSET))
-                            ->addItems($fieldset[ 'fields' ])
+                    $panel[$group]->addItem(
+                        (new Fieldset($fieldset['legend'], Fieldset::PANEL_FIELDSET))
+                            ->addItems($fieldset['fields'])
                             ->setAttributes($attr));
                 }
 
             }
         }
 
-        if (isset($panel[ 'sidebar' ])) {
-            $panel[ 'main' ]->addClass('col-sm-8');
-            $panel[ 'sidebar' ]->addClass('col-sm-4');
+        if (isset($panel['sidebar'])) {
+            $panel['main']->addClass('col-sm-8');
+            $panel['sidebar']->addClass('col-sm-4');
         }
 
         return (new Tag('form', implode(PHP_EOL, $panel), $this->attributes))->render();