Refactor codes

Author: ukeloop

src/Kris/LaravelFormBuilder/Fields/ChoiceType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace  Kris\LaravelFormBuilder\Fields;
+namespace Kris\LaravelFormBuilder\Fields;
 
 use Illuminate\Support\Arr;
 
@@ -24,7 +24,6 @@ protected function getTemplate()
         return 'choice';
     }
 
-
     /**
      * @inheritdoc
      */
@@ -98,7 +97,7 @@ protected function createChildren()
         if (($data_override = $this->getOption('data_override')) && $data_override instanceof \Closure) {
             $this->options['choices'] = $data_override($this->options['choices'], $this);
         }
-        
+
         $this->children = [];
         $this->determineChoiceField();
 
@@ -126,7 +125,7 @@ protected function buildCheckableChildren($fieldType)
     {
         $multiple = $this->getOption('multiple') ? '[]' : '';
 
-        $attr = $this->options['attr']?? [];
+        $attr = $this->options['attr'] ?? [];
         $attr = Arr::except($attr, ['class', 'multiple', 'id', 'name']);
         foreach ((array)$this->options['choices'] as $key => $choice) {
             $id = str_replace('.', '_', $this->getNameKey()) . '_' . $key;

src/Kris/LaravelFormBuilder/Fields/ParentType.php

@@ -56,7 +56,7 @@ public function setValue($val)
      */
     public function render(array $options = [], $showLabel = true, $showField = true, $showError = true)
     {
-        if(!empty($options)) {
+        if (!empty($options)) {
             $this->prepareOptions($options);
 
             $this->createChildren();

src/Kris/LaravelFormBuilder/Form.php

@@ -171,7 +171,7 @@ public function rebuildForm()
         if ($this->isPlain()) {
             foreach ($this->fields as $name => $field) {
                 // Remove any temp variables added in previous instance
-                $options =  Arr::except($field->getOptions(), 'tmp');
+                $options = Arr::except($field->getOptions(), 'tmp');
                 $this->add($name, $field->getType(), $options);
             }
         } else {
@@ -187,7 +187,7 @@ public function rebuildForm()
      */
     protected function isPlain()
     {
-        if($this->formBuilder === null) {
+        if ($this->formBuilder === null) {
             throw new \RuntimeException('FormBuilder is not set');
         }
 
@@ -251,7 +251,6 @@ protected function addField(FormField $field, $modify = false)
             $this->preventDuplicate($field->getRealName());
         }
 
-
         if ($field->getType() == 'file') {
             $this->formOptions['files'] = true;
         }
@@ -882,7 +881,7 @@ public function getData($name = null, $default = null)
      * will be switched to protected in 1.7.
      * @param $data
      * @return $this
-     **/
+     */
     public function addData(array $data)
     {
         foreach ($data as $key => $value) {
@@ -992,7 +991,7 @@ public function setTranslationTemplate($template)
      * Render the form.
      *
      * @param array $options
-     * @param string $fields
+     * @param string[] $fields
      * @param bool $showStart
      * @param bool $showFields
      * @param bool $showEnd
@@ -1056,16 +1055,9 @@ protected function getTemplate()
      */
     protected function getUnrenderedFields()
     {
-        $unrenderedFields = [];
-
-        foreach ($this->fields as $field) {
-            if (!$field->isRendered()) {
-                $unrenderedFields[] = $field;
-                continue;
-            }
-        }
-
-        return $unrenderedFields;
+        return array_filter($this->fields, function ($field) {
+            return !$field->isRendered();
+        });
     }
 
     /**
@@ -1090,9 +1082,7 @@ protected function preventDuplicate($name)
      */
     protected function getFieldType($type)
     {
-        $fieldType = $this->formHelper->getFieldType($type);
-
-        return $fieldType;
+        return $this->formHelper->getFieldType($type);
     }
 
     /**
@@ -1484,6 +1474,7 @@ public function getFilters()
     public function lockFiltering()
     {
         $this->lockFiltering = true;
+
         return $this;
     }
 
@@ -1495,6 +1486,7 @@ public function lockFiltering()
     public function unlockFiltering()
     {
         $this->lockFiltering = false;
+
         return $this;
     }
 
@@ -1506,7 +1498,7 @@ public function unlockFiltering()
      */
     public function isFilteringLocked()
     {
-        return !$this->lockFiltering ? false : true;
+        return (bool)$this->lockFiltering;
     }
 
     /**

tests/Fields/ChoiceTypeTest.php

@@ -117,7 +117,7 @@ public function it_disables_select()
         ];
         $field = new ChoiceType('some_choice', 'choice', $this->plainForm, $options);
         $children = $field->getChildren();
-        
+
         // there shall be no 'disabled' attribute set beforehand
         $this->assertArrayNotHasKey('disabled', $field->getOption('attr'));
         foreach ($children as $child) {
@@ -165,7 +165,7 @@ public function it_disables_checkbox_list()
             $this->assertEquals('disabled', $child->getOption('attr')['disabled']);
         }
     }
-    
+
     /** @test */
     public function it_disables_radios_list()
     {
@@ -195,7 +195,7 @@ public function it_disables_radios_list()
             $this->assertEquals('disabled', $child->getOption('attr')['disabled']);
         }
     }
-    
+
     /** @test */
     public function it_enables_select()
     {
@@ -256,7 +256,7 @@ public function it_enables_checkbox_list()
             $this->assertArrayNotHasKey('disabled', $child->getOption('attr'));
         }
     }
-    
+
     /** @test */
     public function it_enables_radios_list()
     {