Refactor the expandedform methods. First commit to see how Scrutinizer likes this. This commit will break most views.

2025-11-20 00:20:03 +00:00 · 2019-08-10 15:09:44 +02:00
parent 0097c66522
commit 6e2978231b
15 changed files with 970 additions and 1290 deletions
--- a/app/Support/Form/FormSupport.php
+++ b/app/Support/Form/FormSupport.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * FormSupport.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Support\Form;
+
+use Carbon\Carbon;
+use Illuminate\Support\MessageBag;
+use Log;
+use RuntimeException;
+use Throwable;
+
+/**
+ * Trait FormSupport
+ */
+trait FormSupport
+{
+    /**
+     * @param string $name
+     * @param array  $list
+     * @param mixed  $selected
+     * @param array  $options
+     *
+     * @return string
+     */
+    public function select(string $name, array $list = null, $selected = null, array $options = null): string
+    {
+        $list     = $list ?? [];
+        $label    = $this->label($name, $options);
+        $options  = $this->expandOptionArray($name, $label, $options);
+        $classes  = $this->getHolderClasses($name);
+        $selected = $this->fillFieldValue($name, $selected);
+        unset($options['autocomplete'], $options['placeholder']);
+        try {
+            $html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+        } catch (Throwable $e) {
+            Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
+            $html = 'Could not render select.';
+        }
+
+        return $html;
+    }
+
+    /**
+     * @param       $name
+     * @param       $label
+     * @param array $options
+     *
+     * @return array
+     */
+    protected function expandOptionArray(string $name, $label, array $options = null): array
+    {
+        $options                 = $options ?? [];
+        $name                    = str_replace('[]', '', $name);
+        $options['class']        = 'form-control';
+        $options['id']           = 'ffInput_' . $name;
+        $options['autocomplete'] = 'off';
+        $options['placeholder']  = ucfirst($label);
+
+        return $options;
+    }
+
+    /**
+     * @param string $name
+     * @param        $value
+     *
+     * @return mixed
+     */
+    protected function fillFieldValue(string $name, $value = null)
+    {
+        if (app('session')->has('preFilled')) {
+            $preFilled = session('preFilled');
+            $value     = isset($preFilled[$name]) && null === $value ? $preFilled[$name] : $value;
+        }
+
+        try {
+            if (null !== request()->old($name)) {
+                $value = request()->old($name);
+            }
+        } catch (RuntimeException $e) {
+            // don't care about session errors.
+            Log::debug(sprintf('Run time: %s', $e->getMessage()));
+        }
+
+        if ($value instanceof Carbon) {
+            $value = $value->format('Y-m-d');
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param $name
+     *
+     * @return string
+     */
+    protected function getHolderClasses(string $name): string
+    {
+        // Get errors from session:
+        /** @var MessageBag $errors */
+        $errors  = session('errors');
+        $classes = 'form-group';
+
+        if (null !== $errors && $errors->has($name)) {
+            $classes = 'form-group has-error has-feedback';
+        }
+
+        return $classes;
+    }
+
+    /**
+     * @param $name
+     * @param $options
+     *
+     * @return mixed
+     */
+    protected function label(string $name, array $options = null): string
+    {
+        $options = $options ?? [];
+        if (isset($options['label'])) {
+            return $options['label'];
+        }
+        $name = str_replace('[]', '', $name);
+
+        return (string)trans('form.' . $name);
+    }
+}