Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mikebronner/laravel-caffeine
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: michellaurent/laravel-caffeine
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 25, 2024

  1. Use of the web middleware for drip route

    @michellaurent
    michellaurent authored Jul 25, 2024

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mjcarroll Michael Carroll
    GPG key ID: F20ABF421A696F36
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce9e7a8 View commit details

  2. Improves routes loading for routes caching

    @michellaurent
    michellaurent authored Jul 25, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mjcarroll Michael Carroll
    GPG key ID: F20ABF421A696F36
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c6a0ea8 View commit details
Showing with 5 additions and 9 deletions.
  1. +1 −1 routes/web.php
  2. +4 −8 src/Providers/Service.php
2 changes: 1 addition & 1 deletion routes/web.php
View file
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@

$dripRoute = config('genealabs-laravel-caffeine.route', 'genealabs/laravel-caffeine/drip');

Route::get($dripRoute, Drip::class.'@drip');
Route::get($dripRoute, Drip::class.'@drip')->middleware('web');
12 changes: 4 additions & 8 deletions src/Providers/Service.php
View file
Original file line number Diff line number Diff line change
@@ -10,15 +10,11 @@ class Service extends ServiceProvider
{
public function boot()
{
app('router')->group(app("router")->hasMiddlewareGroup('web')
? ['middleware' => 'web']
: [], function () {
require __DIR__ . '/../../routes/web.php';
$this->loadRoutesFrom(__DIR__.'/../../routes/web.php');

if (config("app.env") === 'internaltesting') {
require __DIR__ . '/../../tests/routes/web.php';
}
});
if (config("app.env") === 'internaltesting') {
$this->loadRoutesFrom(__DIR__.'/../../tests/routes/web.php');
}

$configPath = __DIR__ . '/../../config/genealabs-laravel-caffeine.php';
$this->mergeConfigFrom($configPath, 'genealabs-laravel-caffeine');