Merge pull request #18672 from marcusmoore/remove-laravel-collective-dep

Fixed #17199: Remove Laravel Collective HTML dependency

app/Providers/MacroServiceProvider.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\ServiceProvider;
-
-class MacroServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //  require base_path() . '/resources/macros/community_types.php';
-        foreach (glob(base_path('resources/macros/*.php')) as $filename) {
-            require_once $filename;
-        }
-    }
-
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
-}

composer.json

@@ -14,10 +14,6 @@
     {
       "type": "vcs",
       "url": "https://github.com/grokability/laravel-scim-server"
-    },
-    {
-      "type": "vcs",
-      "url": "https://github.com/grokability/html"
     }
   ],
   "require": {
@@ -51,7 +47,6 @@
     "laravel/socialite": "^5.6",
     "laravel/tinker": "^2.6",
     "laravel/ui": "^4.0",
-    "laravelcollective/html": "6.x-dev",
     "league/csv": "^9.7",
     "league/flysystem-aws-s3-v3": "^3.0",
     "livewire/livewire": "^4.0",

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": "58603818d33285d78c0c8655385e7c0e",
+    "content-hash": "3eb217f961e55b3e6d0a1fdd6b812fda",
     "packages": [
         {
             "name": "alek13/slack",
@@ -3310,79 +3310,6 @@
             },
             "time": "2025-01-28T15:15:29+00:00"
         },
-        {
-            "name": "laravelcollective/html",
-            "version": "6.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/grokability/html.git",
-                "reference": "944b7029c207914ecec437c0141b7a0e32d9e1a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/grokability/html/zipball/944b7029c207914ecec437c0141b7a0e32d9e1a1",
-                "reference": "944b7029c207914ecec437c0141b7a0e32d9e1a1",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "php": ">=7.2.5"
-            },
-            "require-dev": {
-                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "mockery/mockery": "~1.0",
-                "phpunit/phpunit": "~8.5|^9.5.10"
-            },
-            "default-branch": true,
-            "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": {
-                "psr-4": {
-                    "Collective\\Html\\": "src/"
-                },
-                "files": [
-                    "src/helpers.php"
-                ]
-            },
-            "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": "2025-01-20T14:37:14+00:00"
-        },
         {
             "name": "lcobucci/jwt",
             "version": "5.5.0",
@@ -16630,8 +16557,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "arietimmerman/laravel-scim-server": 20,
-        "laravelcollective/html": 20
+        "arietimmerman/laravel-scim-server": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

config/app.php

@@ -306,7 +306,6 @@ return [
          */
 
         Intervention\Image\ImageServiceProvider::class,
-        Collective\Html\HtmlServiceProvider::class,
         Spatie\Backup\BackupServiceProvider::class,
         PragmaRX\Google2FALaravel\ServiceProvider::class,
         Laravel\Passport\PassportServiceProvider::class,
@@ -332,7 +331,6 @@ return [
         */
         App\Providers\BladeServiceProvider::class,
         App\Providers\LivewireServiceProvider::class,
-        App\Providers\MacroServiceProvider::class,
         App\Providers\SamlServiceProvider::class,
         App\Providers\BreadcrumbsServiceProvider::class,
 
@@ -385,8 +383,6 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
-        'Form'      => Collective\Html\FormFacade::class,
-        'Html'      => Collective\Html\HtmlFacade::class,
         'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
         'Image'     => Intervention\Image\ImageServiceProvider::class,
         'Carbon' => Carbon\Carbon::class,

resources/macros/macros.php

@@ -1,4 +0,0 @@
-<?php
-/**
-* Macro helpers
-*/