Skip to content

Commit 07931ac

Browse files
Laravel 11.10.0 Shift (alexjustesen#1456)
Co-authored-by: Shift <[email protected]>
1 parent 6438f04 commit 07931ac

File tree

6 files changed

+454
-429
lines changed

6 files changed

+454
-429
lines changed

_ide_helper.php

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/**
77
* A helper file for Laravel, to provide autocomplete information to your IDE
8-
* Generated for Laravel 11.9.1.
8+
* Generated for Laravel 11.10.0.
99
*
1010
* This file should not be included in your code, only analyzed by your IDE!
1111
*
@@ -656,6 +656,26 @@
656656
{
657657
/** @var \Illuminate\Foundation\Application $instance */
658658
return $instance->handleCommand($input);
659+
}
660+
/**
661+
* Determine if the framework's base configuration should be merged.
662+
*
663+
* @return bool
664+
* @static
665+
*/ public static function shouldMergeFrameworkConfiguration()
666+
{
667+
/** @var \Illuminate\Foundation\Application $instance */
668+
return $instance->shouldMergeFrameworkConfiguration();
669+
}
670+
/**
671+
* Indicate that the framework's base configuration should not be merged.
672+
*
673+
* @return \Illuminate\Foundation\Application
674+
* @static
675+
*/ public static function dontMergeFrameworkConfiguration()
676+
{
677+
/** @var \Illuminate\Foundation\Application $instance */
678+
return $instance->dontMergeFrameworkConfiguration();
659679
}
660680
/**
661681
* Determine if middleware has been disabled for the application.
@@ -25555,7 +25575,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
2555525575
* Insert or update a record matching the attributes, and fill it with values.
2555625576
*
2555725577
* @param array $attributes
25558-
* @param array $values
25578+
* @param array|callable $values
2555925579
* @return bool
2556025580
* @static
2556125581
*/ public static function updateOrInsert($attributes, $values = [])
@@ -25886,11 +25906,6 @@ class Flare extends \Spatie\LaravelIgnition\Facades\Flare {}
2588625906
}
2588725907

2588825908

25889-
namespace Facades\Livewire\Features\SupportFileUploads {
25890-
/**
25891-
* @mixin \Livewire\Features\SupportFileUploads\GenerateSignedUploadUrl */
25892-
class GenerateSignedUploadUrl extends \Livewire\Features\SupportFileUploads\GenerateSignedUploadUrl {}
25893-
}
2589425909

2589525910

2589625911

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"awcodes/filament-versions": "^2.0.1",
1313
"chrisullyott/php-filesize": "^4.2.1",
1414
"dragonmantank/cron-expression": "^3.3.3",
15-
"filament/filament": "^3.2.83",
16-
"filament/spatie-laravel-settings-plugin": "^3.2.83",
15+
"filament/filament": "^3.2.86",
16+
"filament/spatie-laravel-settings-plugin": "^3.2.86",
1717
"guzzlehttp/guzzle": "^7.8.1",
1818
"influxdata/influxdb-client-php": "^3.5",
1919
"laravel-notification-channels/telegram": "^5.0",
20-
"laravel/framework": "^11.9.1",
20+
"laravel/framework": "^11.10",
2121
"laravel/prompts": "^0.1.23",
2222
"laravel/sanctum": "^4.0.2",
2323
"laravel/tinker": "^2.9.0",
@@ -36,7 +36,7 @@
3636
"laravel/telescope": "^5.0.5",
3737
"mockery/mockery": "^1.6.12",
3838
"nunomaduro/collision": "^8.1.1",
39-
"phpunit/phpunit": "^10.5.20",
39+
"phpunit/phpunit": "^11.1.3",
4040
"spatie/laravel-ignition": "^2.7.0",
4141
"tightenco/duster": "^2.7.5"
4242
},

0 commit comments

Comments
 (0)