From 97f4f7b96ef76863c211490920c3b5788c3ea51c Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 4 Nov 2025 14:23:18 +0000 Subject: [PATCH 1/3] Swap dependency --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e2473c641..b6491b778 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,6 @@ "laravel/telescope": "^5.5", "laravel/tinker": "^2.10.1", "laravel/ui": "^4.6", - "laravelcollective/html": "^6.4", "league/climate": "^3.10", "leventcz/laravel-top": "^1.2", "livewire/livewire": "^3.6", @@ -107,7 +106,8 @@ "symfony/postmark-mailer": "^7.0", "symfony/process": "^7.0", "vlucas/phpdotenv": "^5.6", - "voku/simple_html_dom": "^4.8" + "voku/simple_html_dom": "^4.8", + "spatie/laravel-html": "^3.11" }, "require-dev": { "barryvdh/laravel-ide-helper": "^3.5", From b9efa5945e3259a2e5d6fc5d1472aac66c65f029 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 4 Nov 2025 14:23:18 +0000 Subject: [PATCH 2/3] Convert `Form` facade --- resources/views/contact/index.blade.php | 4 ++-- resources/views/mymovies/add.blade.php | 4 ++-- resources/views/myshows/add.blade.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/contact/index.blade.php b/resources/views/contact/index.blade.php index 049880a52..10ef0131f 100644 --- a/resources/views/contact/index.blade.php +++ b/resources/views/contact/index.blade.php @@ -44,7 +44,7 @@

Don't hesitate to send us a message. Our team will be happy to help you.

- {!! Form::open(['url' => route('contact-us'), 'method' => 'POST']) !!} + {{ html()->form('POST', route('contact-us'))->open() }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/mymovies/add.blade.php b/resources/views/mymovies/add.blade.php index 81d7fe430..5f3385f5b 100644 --- a/resources/views/mymovies/add.blade.php +++ b/resources/views/mymovies/add.blade.php @@ -49,7 +49,7 @@
- {!! Form::open(['id' => 'mymovies', 'class' => 'space-y-6', 'url' => "mymovies?id=do{$type}"]) !!} + {{ html()->form('POST', url("mymovies?id=do{$type}"))->id('mymovies')->class('space-y-6')->open() }} @if(!empty($from)) @@ -82,7 +82,7 @@ Back to My Movies - {!! Form::close() !!} + {{ html()->form()->close() }} diff --git a/resources/views/myshows/add.blade.php b/resources/views/myshows/add.blade.php index 5d5f7a6e6..1fcf1c137 100644 --- a/resources/views/myshows/add.blade.php +++ b/resources/views/myshows/add.blade.php @@ -49,7 +49,7 @@ - {!! Form::open(['id' => 'myshows', 'class' => 'space-y-6', 'url' => "myshows?action=do{$type}"]) !!} + {{ html()->form('POST', url("myshows?action=do{$type}"))->id('myshows')->class('space-y-6')->open() }} @if(!empty($from)) @@ -82,7 +82,7 @@ Back to My Shows - {!! Form::close() !!} + {{ html()->form()->close() }} From 373ef4791c5faf46217631b9b6c94dd7872ef132 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 4 Nov 2025 20:28:21 +0100 Subject: [PATCH 3/3] Update forms usage --- composer.lock | 193 ++++++++++++------------ resources/views/contact/index.blade.php | 2 +- resources/views/mymovies/add.blade.php | 2 +- resources/views/myshows/add.blade.php | 2 +- 4 files changed, 103 insertions(+), 96 deletions(-) diff --git a/composer.lock b/composer.lock index 674307535..22786d677 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": "98e2c05b8152c21cf55c8986509cf527", + "content-hash": "cbfc1c1787fc6e1b140f4311f80b0563", "packages": [ { "name": "aharen/omdbapi", @@ -3052,16 +3052,16 @@ }, { "name": "laravel/framework", - "version": "v12.36.1", + "version": "v12.37.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "cad110d7685fbab990a6bb8184d0cfd847d7c4d8" + "reference": "3c3c4ad30f5b528b164a7c09aa4ad03118c4c125" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/cad110d7685fbab990a6bb8184d0cfd847d7c4d8", - "reference": "cad110d7685fbab990a6bb8184d0cfd847d7c4d8", + "url": "https://api.github.com/repos/laravel/framework/zipball/3c3c4ad30f5b528b164a7c09aa4ad03118c4c125", + "reference": "3c3c4ad30f5b528b164a7c09aa4ad03118c4c125", "shasum": "" }, "require": { @@ -3267,20 +3267,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-10-29T14:20:57+00:00" + "time": "2025-11-04T15:39:33+00:00" }, { "name": "laravel/horizon", - "version": "v5.38.0", + "version": "v5.39.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "3a3145345221df6a0eaacc478c22040d1252a065" + "reference": "bf8f5242f48cff5870e7b30620d872077effe9da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/3a3145345221df6a0eaacc478c22040d1252a065", - "reference": "3a3145345221df6a0eaacc478c22040d1252a065", + "url": "https://api.github.com/repos/laravel/horizon/zipball/bf8f5242f48cff5870e7b30620d872077effe9da", + "reference": "bf8f5242f48cff5870e7b30620d872077effe9da", "shasum": "" }, "require": { @@ -3345,9 +3345,9 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.38.0" + "source": "https://github.com/laravel/horizon/tree/v5.39.0" }, - "time": "2025-10-26T17:03:39+00:00" + "time": "2025-11-04T14:35:53+00:00" }, { "name": "laravel/prompts", @@ -3561,16 +3561,16 @@ }, { "name": "laravel/scout", - "version": "v10.20.0", + "version": "v10.21.0", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "a04d7a8eb27b66c8b7edb7e0c6a078e9e78c4f5b" + "reference": "412c72f7b0b666afb9b09d0e150a7d5078c7ebd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/a04d7a8eb27b66c8b7edb7e0c6a078e9e78c4f5b", - "reference": "a04d7a8eb27b66c8b7edb7e0c6a078e9e78c4f5b", + "url": "https://api.github.com/repos/laravel/scout/zipball/412c72f7b0b666afb9b09d0e150a7d5078c7ebd4", + "reference": "412c72f7b0b666afb9b09d0e150a7d5078c7ebd4", "shasum": "" }, "require": { @@ -3638,7 +3638,7 @@ "issues": "https://github.com/laravel/scout/issues", "source": "https://github.com/laravel/scout" }, - "time": "2025-10-14T14:09:26+00:00" + "time": "2025-11-04T15:48:12+00:00" }, { "name": "laravel/serializable-closure", @@ -3899,77 +3899,6 @@ }, "time": "2025-01-28T15:15:29+00:00" }, - { - "name": "laravelcollective/html", - "version": "v6.6.0", - "source": { - "type": "git", - "url": "https://github.com/DariusIII/html.git", - "reference": "71df241442ac0d94c900c0171e8d4a4c707b1954" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DariusIII/html/zipball/71df241442ac0d94c900c0171e8d4a4c707b1954", - "reference": "71df241442ac0d94c900c0171e8d4a4c707b1954", - "shasum": "" - }, - "require": { - "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "php": ">=7.2.5" - }, - "require-dev": { - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~8.5|^9.5.10|^10.0|^11.0|^12.0" - }, - "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" - }, - "time": "2025-03-21T20:56:50+00:00" - }, { "name": "league/climate", "version": "3.10.0", @@ -4850,16 +4779,16 @@ }, { "name": "livewire/volt", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/livewire/volt.git", - "reference": "2d9783a340d612d32f4ffd38070780ca7d7e9205" + "reference": "4b289eef2f15398987a923d9f813cad6a6a19ea4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/volt/zipball/2d9783a340d612d32f4ffd38070780ca7d7e9205", - "reference": "2d9783a340d612d32f4ffd38070780ca7d7e9205", + "url": "https://api.github.com/repos/livewire/volt/zipball/4b289eef2f15398987a923d9f813cad6a6a19ea4", + "reference": "4b289eef2f15398987a923d9f813cad6a6a19ea4", "shasum": "" }, "require": { @@ -4918,7 +4847,7 @@ "issues": "https://github.com/livewire/volt/issues", "source": "https://github.com/livewire/volt" }, - "time": "2025-10-29T15:52:35+00:00" + "time": "2025-10-30T02:46:00+00:00" }, { "name": "maennchen/zipstream-php", @@ -9518,6 +9447,84 @@ ], "time": "2025-02-14T10:43:50+00:00" }, + { + "name": "spatie/laravel-html", + "version": "3.12.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-html.git", + "reference": "72af3cad24d153c230ff6e1da9fa3b7b702834c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-html/zipball/72af3cad24d153c230ff6e1da9fa3b7b702834c9", + "reference": "72af3cad24d153c230ff6e1da9fa3b7b702834c9", + "shasum": "" + }, + "require": { + "illuminate/http": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0", + "php": "^8.2" + }, + "require-dev": { + "mockery/mockery": "^1.3", + "orchestra/testbench": "^8.0|^9.0|^10.0", + "pestphp/pest": "^2.34|^3.7" + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Html": "Spatie\\Html\\Facades\\Html" + }, + "providers": [ + "Spatie\\Html\\HtmlServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Spatie\\Html\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sebastian De Deyne", + "email": "sebastian@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + }, + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "A fluent html builder", + "homepage": "https://github.com/spatie/laravel-html", + "keywords": [ + "html", + "spatie" + ], + "support": { + "source": "https://github.com/spatie/laravel-html/tree/3.12.1" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + } + ], + "time": "2025-10-02T07:26:38+00:00" + }, { "name": "spatie/laravel-ignition", "version": "2.9.1", diff --git a/resources/views/contact/index.blade.php b/resources/views/contact/index.blade.php index 10ef0131f..f55e44d1a 100644 --- a/resources/views/contact/index.blade.php +++ b/resources/views/contact/index.blade.php @@ -44,7 +44,7 @@

Don't hesitate to send us a message. Our team will be happy to help you.

- {{ html()->form('POST', route('contact-us'))->open() }} + {{ html()->form()->method('POST')->action(route('contact-us'))->open() }}
- {{ html()->form('POST', url("mymovies?id=do{$type}"))->id('mymovies')->class('space-y-6')->open() }} + {{ html()->form()->method('POST')->action(url("mymovies?id=do{$type}"))->id('mymovies')->class('space-y-6')->open() }} @if(!empty($from)) diff --git a/resources/views/myshows/add.blade.php b/resources/views/myshows/add.blade.php index 1fcf1c137..b89cb42c7 100644 --- a/resources/views/myshows/add.blade.php +++ b/resources/views/myshows/add.blade.php @@ -49,7 +49,7 @@ - {{ html()->form('POST', url("myshows?action=do{$type}"))->id('myshows')->class('space-y-6')->open() }} + {{ html()->form()->method('POST')->action(url("myshows?action=do{$type}"))->id('myshows')->class('space-y-6')->open() }} @if(!empty($from))