From 3bf04aca0089c2f6709e0086d438f189ab905748 Mon Sep 17 00:00:00 2001
From: Nicolas Perrenoud <mail@nicu.ch>
Date: Sun, 19 Nov 2023 22:25:22 +0100
Subject: [PATCH] Remove laravelcollective/html and obsolete blade components

---
 app/Providers/FormServiceProvider.php         |  38 ------
 composer.json                                 |   1 -
 composer.lock                                 |  75 +----------
 config/app.php                                |   1 -
 .../views/accounting/webling/index.blade.php  |  32 -----
 .../accounting/webling/prepare.blade.php      | 121 ------------------
 .../form/bs-delete-button.blade.php           |  13 --
 .../form/bs-submit-button.blade.php           |  11 --
 .../views/components/form/bsInput.blade.php   |  36 ------
 .../components/form/bsRadioList.blade.php     |  20 ---
 .../views/components/form/bsSelect.blade.php  |   3 -
 .../views/components/form/bsText.blade.php    |  16 ---
 .../views/components/icon-status.blade.php    |   9 --
 13 files changed, 1 insertion(+), 375 deletions(-)
 delete mode 100644 app/Providers/FormServiceProvider.php
 delete mode 100644 resources/views/accounting/webling/index.blade.php
 delete mode 100644 resources/views/accounting/webling/prepare.blade.php
 delete mode 100644 resources/views/components/form/bs-delete-button.blade.php
 delete mode 100644 resources/views/components/form/bs-submit-button.blade.php
 delete mode 100644 resources/views/components/form/bsInput.blade.php
 delete mode 100644 resources/views/components/form/bsRadioList.blade.php
 delete mode 100644 resources/views/components/form/bsSelect.blade.php
 delete mode 100644 resources/views/components/form/bsText.blade.php
 delete mode 100644 resources/views/components/icon-status.blade.php

diff --git a/app/Providers/FormServiceProvider.php b/app/Providers/FormServiceProvider.php
deleted file mode 100644
index 2c4122373..000000000
--- a/app/Providers/FormServiceProvider.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Collective\Html\FormFacade as Form;
-use Illuminate\Support\ServiceProvider;
-
-class FormServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        // Return immediately if run in a console.
-        // This fixes an issue during setup where the app key needs to be generated
-        // but it fails due to below form macros requiring an app key aready being present.
-        if (app()->runningInConsole()) {
-            return;
-        }
-
-        Form::component('bsText', 'components.form.bsText', ['name', 'value' => null, 'attributes' => [], 'label' => null, 'help' => null]);
-        Form::component('bsRadioList', 'components.form.bsRadioList', ['name', 'entries', 'value' => null, 'label' => null, 'help' => null]);
-        Form::component('bsSelect', 'components.form.bsSelect', ['name', 'entries', 'value' => null, 'attributes' => [], 'label' => null, 'help' => null]);
-    }
-
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
-}
diff --git a/composer.json b/composer.json
index d3dc103ce..4c3c005fe 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,6 @@
         "laravel/sanctum": "^3.0",
         "laravel/socialite": "^5.0",
         "laravel/ui": "^4.0",
-        "laravelcollective/html": "^6.0",
         "lasserafn/php-initial-avatar-generator": "^4.2",
         "maatwebsite/excel": "^3.1",
         "maennchen/zipstream-php": "^3.0",
diff --git a/composer.lock b/composer.lock
index 8e8ab208e..b049d1292 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6f6b411e1d2fdc37dc289c2c4d941c4c",
+    "content-hash": "fdd6f5cdbe7b2c476ad4a1a852039193",
     "packages": [
         {
             "name": "akaunting/laravel-language",
@@ -3122,79 +3122,6 @@
             },
             "time": "2023-05-09T19:47:28+00:00"
         },
-        {
-            "name": "laravelcollective/html",
-            "version": "v6.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": ">=7.2.5"
-            },
-            "require-dev": {
-                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "mockery/mockery": "~1.0",
-                "phpunit/phpunit": "~8.5|^9.5.10"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.x-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Collective\\Html\\HtmlServiceProvider"
-                    ],
-                    "aliases": {
-                        "Form": "Collective\\Html\\FormFacade",
-                        "Html": "Collective\\Html\\HtmlFacade"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Collective\\Html\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Adam Engebretson",
-                    "email": "adam@laravelcollective.com"
-                },
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylorotwell@gmail.com"
-                }
-            ],
-            "description": "HTML and Form Builders for the Laravel Framework",
-            "homepage": "https://laravelcollective.com",
-            "support": {
-                "issues": "https://github.com/LaravelCollective/html/issues",
-                "source": "https://github.com/LaravelCollective/html"
-            },
-            "abandoned": "spatie/laravel-html",
-            "time": "2023-04-25T02:46:11+00:00"
-        },
         {
             "name": "lasserafn/php-initial-avatar-generator",
             "version": "4.3",
diff --git a/config/app.php b/config/app.php
index 6b4a4b097..4422e9c31 100644
--- a/config/app.php
+++ b/config/app.php
@@ -195,7 +195,6 @@
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
         App\Providers\ComposerServiceProvider::class,
-        App\Providers\FormServiceProvider::class,
         App\Providers\NavigationServiceProvider::class,
         App\Providers\Accounting\WeblingServiceProvider::class,
 
diff --git a/resources/views/accounting/webling/index.blade.php b/resources/views/accounting/webling/index.blade.php
deleted file mode 100644
index 4fdaa4008..000000000
--- a/resources/views/accounting/webling/index.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-@extends('layouts.app')
-
-@section('title', __('Book to Webling'))
-
-@section('content')
-    @unless($periods->isEmpty())
-        <p>{{ __('Please choose a month with unbooked transactions in an open booking period:') }}</p>
-        @foreach($periods as $period_id => $period)
-            <h2>{{ $period->title }}</h2>
-            @unless($period->months->isEmpty())
-                <div class="list-group shadow-sm mb-4 mt-3">
-                    @foreach($period->months as $month)
-                        <a href="{{ route('accounting.webling.prepare', [ $wallet, 'period' => $period_id, 'from' => $month->date->toDateString(), 'to' => (clone $month->date->endOfMonth())->toDateString() ]) }}" class="list-group-item list-group-item-action">
-                            <div class="row">
-                                <div class="col">{{ $month->date->formatLocalized('%B %Y') }}</div>
-                                <div class="col-auto"><small>{{ $month->transactions }} {{ __('Transactions') }}</small></div>
-                            </div>
-                        </a>
-                    @endforeach
-                </div>
-            @else
-                <x-alert type="info">
-                    {{ __('No months with unbooked transactions found.') }}
-                </x-alert>
-            @endunless
-        @endforeach
-    @else
-        <x-alert type="info">
-            {{ __('No matching open booking periods found.') }}
-        </x-alert>
-    @endunless
-@endsection
diff --git a/resources/views/accounting/webling/prepare.blade.php b/resources/views/accounting/webling/prepare.blade.php
deleted file mode 100644
index 7dbc6a084..000000000
--- a/resources/views/accounting/webling/prepare.blade.php
+++ /dev/null
@@ -1,121 +0,0 @@
-@extends('layouts.app')
-
-@section('title', __('Book to Webling'))
-
-@section('content')
-    <p>{{ __('The following transactions from <strong>:from</strong> to <strong>:to</strong> can be booked in the period <strong>:period</strong>:', [ 'from' => $from->toDateString(), 'to' => $to->toDateString(), 'period' => $period->title ]) }}</p>
-    @unless($transactions->isEmpty())
-        {!! Form::open(['route' => ['accounting.webling.store', $wallet ]]) !!}
-            {{ Form::hidden('period', $period->id) }}
-            {{ Form::hidden('from', $from->toDateString()) }}
-            {{ Form::hidden('to', $to->toDateString()) }}
-            <div class="table-responsive">
-                <table class="table table-hover bg-white" id="bookings_table">
-                    <thead>
-                        <tr>
-                            <th class="fit">{{ __('Date') }}</th>
-                            <th class="fit text-right">{{ __('Credit') }}</th>
-                            <th class="fit text-right">{{ __('Debit') }}</th>
-                            <th>{{ __('Posting text') }}</th>
-                            <th>{{ __('Debit side') }}</th>
-                            <th>{{ __(' Credit side') }}</th>
-                            <th class="fit">{{ __('Receipt No.') }}</th>
-                            <th class="fit">{{ __('Controlled') }}</th>
-                            <th class="fit">{{ __('Action') }}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach ($transactions as $transaction)
-                            @php
-                                $posting_text = $transaction->category->name . ' - ' . (isset($transaction->project) ? $transaction->project->name .' - ' : '') . $transaction->description;
-                            @endphp
-                            <tr data-id="{{ $transaction->id }}">
-                                <td class="fit">
-                                    <a href="{{ route('accounting.transactions.show', $transaction->id) }}" target="_blank" title="{{ __('Open in new window/tab') }}">{{ $transaction->date }}</a>
-                                </td>
-                                <td class="text-success text-right fit">
-                                    @if($transaction->type == 'income') {{ number_format($transaction->amount, 2) }}@endif
-                                </td>
-                                <td class="text-danger text-right fit">
-                                    @if($transaction->type == 'spending') {{ number_format($transaction->amount, 2) }}@endif
-                                </td>
-                                <td>
-                                    {{ Form::bsText('posting_text['.$transaction->id.']', $posting_text, [ 'placeholder' => __('Posting text') ], '') }}
-
-                                </td>
-                                <td style="max-width: 8em">
-                                    @if($transaction->type == 'income')
-                                        {{ Form::bsSelect('debit_side['.$transaction->id.']', $assetsSelect, null, [ 'placeholder' => __('Money to') ], '') }}
-                                    @elseif($transaction->type == 'spending')
-                                        {{ Form::bsSelect('debit_side['.$transaction->id.']', $expenseSelect, null, [ 'placeholder' => __('Paid for') ], '') }}
-                                    @endif
-                                </td>
-                                <td style="max-width: 8em">
-                                    @if($transaction->type == 'income')
-                                        {{ Form::bsSelect('credit_side['.$transaction->id.']', $incomeSelect, null, [ 'placeholder' => __('Received for') ], '') }}
-                                    @elseif($transaction->type == 'spending')
-                                        {{ Form::bsSelect('credit_side['.$transaction->id.']', $assetsSelect, null, [ 'placeholder' => __('Paid from') ], '') }}
-                                    @endif
-                                </td>
-                                <td class="fit">{{ $transaction->receipt_no }}</td>
-                                <td class="fit text-center">
-                                    <x-icon-status :check="$transaction->controlled_at" colors/>
-                                </td>
-                                <td class="fit">
-                                    {{ Form::bsRadioList('action['.$transaction->id.']', $actions, $defaultAction, '') }}
-                                </td>
-                            </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-            <p>
-                <x-form.bs-submit-button :label="__('Submit')"/>
-            </p>
-        {!! Form::close() !!}
-    @else
-        <x-alert type="info">
-            {{ __('No transactions found.') }}
-        </x-alert>
-    @endunless
-@endsection
-
-@push('footer')
-    <script>
-        function updateStatus(row) {
-            var id = row.data('id');
-
-            var message = row.find('input[name="posting_text['+id+']"]').val();
-            var debit_side = row.find('select[name="debit_side['+id+']"]').val();
-            var credit_side = row.find('select[name="credit_side['+id+']"]').val();
-            var action = row.find('input[name="action['+id+']"]:checked').val();
-
-            row.removeClass('table-success');
-            row.removeClass('table-warning');
-            row.removeClass('table-info');
-
-            if (action == 'book') {
-                if (message != '' && debit_side != '' && credit_side != '') {
-                    row.addClass('table-success');
-                } else {
-                    row.addClass('table-warning');
-                }
-            } else {
-                if (message != '' && debit_side != '' && credit_side != '') {
-                    row.addClass('table-secondary');
-                }
-            }
-        }
-        document.addEventListener('DOMContentLoaded', function() {
-            $('#bookings_table input, #bookings_table select').on('change propertychange keyup', function () {
-                var row = $(this).parents('tr');
-                updateStatus(row);
-            });
-
-            $('#bookings_table tbody tr').each(function () {
-                var row = $(this);
-                updateStatus(row);
-            });
-        });
-    </script>
-@endpush
diff --git a/resources/views/components/form/bs-delete-button.blade.php b/resources/views/components/form/bs-delete-button.blade.php
deleted file mode 100644
index 44fdad5bd..000000000
--- a/resources/views/components/form/bs-delete-button.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@props([
-    'label' => 'Delete',
-    'icon' => 'trash',
-    'confirmation' => 'Do you really want to delete this item?'
-])
-<button
-    type="submit"
-    data-confirmation="{{ $confirmation }}"
-    {{ $attributes->merge(['class' => 'btn btn-danger delete-confirmation' ] )}}
->
-    @isset($icon) <x-icon :icon="$icon"/> @endisset
-    @isset($label) {{ $label }} @endisset
-</button>
diff --git a/resources/views/components/form/bs-submit-button.blade.php b/resources/views/components/form/bs-submit-button.blade.php
deleted file mode 100644
index e72040656..000000000
--- a/resources/views/components/form/bs-submit-button.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@props([
-    'label',
-    'icon' => 'check'
-])
-<button
-    type="submit"
-    {{ $attributes->merge(['class' => 'btn btn-primary' ] )}}
->
-    @isset($icon) <x-icon :icon="$icon"/> @endisset
-    {{ $label }}
-</button>
diff --git a/resources/views/components/form/bsInput.blade.php b/resources/views/components/form/bsInput.blade.php
deleted file mode 100644
index 631eb5c20..000000000
--- a/resources/views/components/form/bsInput.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="form-group column-break-avoid">
-    @if ($label === null || ! empty($label))
-        {{ Form::label($name, $label) }}
-        @if(isset($attributes) && in_array('required', $attributes, true))<span class="text-danger" title="{{ __('Required') }}">*</span>@endif
-    @endif
-    @if (isset($attributes['prepend']) || isset($attributes['append']))
-        <div class="input-group">
-        @if (isset($attributes['prepend']))
-            <div class="input-group-prepend">
-                <span class="input-group-text">{{ $attributes['prepend'] }}</span>
-            </div>
-        @endif
-    @endif
-    {{ $slot }}
-    @if (isset($attributes['prepend']) || isset($attributes['append']))
-        @if (isset($attributes['append']))
-            <div class="input-group-append">
-                {!! $attributes['append'] !!}
-            </div>
-        @endif
-    </div>
-    @endif
-    @if ($errors->has($name))
-        <span class="invalid-feedback">{{ $errors->first($name) }}</span>
-    @endif
-    @if (isset($help))
-        <small id="{{ $name }}HelpBlock" class="form-text text-muted">
-            {{ $help }}
-        </small>
-    @endif
-    @if (isset($attributes['error']) && ! empty($attributes['error']))
-        <small class="form-text text-danger">
-            {{ $attributes['error'] }}
-        </small>
-    @endif
-</div>
diff --git a/resources/views/components/form/bsRadioList.blade.php b/resources/views/components/form/bsRadioList.blade.php
deleted file mode 100644
index 749a09c4f..000000000
--- a/resources/views/components/form/bsRadioList.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@if ($label !== null || ! empty($label))
-    <p class="mb-1">
-        {{ $label }}
-        @if(isset($attributes) && in_array('required', $attributes, true))<span class="text-danger" title="{{ __('Required') }}">*</span>@endif
-    </p>
-@endif
-@foreach($entries as $k => $v)
-    <div class="custom-control custom-radio">
-        {{ Form::radio($name, $k, $k == $value, [ 'class' => 'custom-control-input', 'id' => form_id_string($name, $k) ]) }}
-        <label class="custom-control-label" for="{{ form_id_string($name, $k) }}">{{ $v }}</label>
-    </div>
-@endforeach
-@if ($errors->has($name))
-    <div><small class="text-danger">{{ $errors->first($name) }}</small></div>
-@endif
-@if (isset($help))
-    <small id="{{ $name }}HelpBlock" class="form-text text-muted">
-        {{ $help }}
-    </small>
-@endif
diff --git a/resources/views/components/form/bsSelect.blade.php b/resources/views/components/form/bsSelect.blade.php
deleted file mode 100644
index a80bcef45..000000000
--- a/resources/views/components/form/bsSelect.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-@component('components.form.bsInput', [ 'name' => form_id_string($name), 'label' => $label, 'help' => $help, 'attributes' => $attributes ])
-    {{ Form::select($name, $entries, $value, array_merge([ 'id' => form_id_string($name), 'class' => 'custom-select'.($errors->has($name) ? ' is-invalid' : '') ], $attributes)) }}
-@endcomponent
diff --git a/resources/views/components/form/bsText.blade.php b/resources/views/components/form/bsText.blade.php
deleted file mode 100644
index 07456b349..000000000
--- a/resources/views/components/form/bsText.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@component('components.form.bsInput', [ 'name' => form_id_string($name), 'label' => $label, 'help' => $help, 'attributes' => $attributes ])
-    @php
-        if (isset($attributes['list']) && is_array($attributes['list'])) {
-            $list_items = $attributes['list'];
-            $attributes['list'] = form_id_string($name) . '-list';
-        }
-    @endphp
-    {{ Form::text($name, $value, array_merge([ 'id' => form_id_string($name), 'class' => 'form-control'.($errors->has($name) ? ' is-invalid' : '') ], $attributes)) }}
-    @isset($list_items)
-        <datalist id="{{ form_id_string($name) }}-list">
-            @foreach($list_items as $item)
-                <option value="{{ $item }}">
-            @endforeach
-        </datalist>
-    @endisset
-@endcomponent
diff --git a/resources/views/components/icon-status.blade.php b/resources/views/components/icon-status.blade.php
deleted file mode 100644
index 567a9d04f..000000000
--- a/resources/views/components/icon-status.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@props([
-    'check',
-    'colors' => false,
-])
-@if($check)
-    <x-icon icon="check" {{ $attributes->merge(['class' => $colors ? 'text-success' : null]) }}/>
-@else
-    <x-icon icon="xmark" {{ $attributes->merge(['class' => $colors ? 'text-danger' : null]) }}/>
-@endif