Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Laravel 11.10.0 Shift #1456

Merged
merged 5 commits into from
Jun 5, 2024
Merged

Laravel 11.10.0 Shift #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
821a148
Bump Laravel version constraint
laravel-shift Jun 4, 2024
0fa5dde
Bump core Laravel dependencies
laravel-shift Jun 4, 2024
c5b7da8
composer update
laravel-shift Jun 4, 2024
ff3d4a8
Merge branch 'main' into shift-ci-v11.10.0
alexjustesen Jun 5, 2024
b932dc7
updated composer dependencies
alexjustesen Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions _ide_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/**
* A helper file for Laravel, to provide autocomplete information to your IDE
* Generated for Laravel 11.9.1.
* Generated for Laravel 11.10.0.
*
* This file should not be included in your code, only analyzed by your IDE!
*
Expand Down Expand Up @@ -656,6 +656,26 @@
{
/** @var \Illuminate\Foundation\Application $instance */
return $instance->handleCommand($input);
}
/**
* Determine if the framework's base configuration should be merged.
*
* @return bool
* @static
*/ public static function shouldMergeFrameworkConfiguration()
{
/** @var \Illuminate\Foundation\Application $instance */
return $instance->shouldMergeFrameworkConfiguration();
}
/**
* Indicate that the framework's base configuration should not be merged.
*
* @return \Illuminate\Foundation\Application
* @static
*/ public static function dontMergeFrameworkConfiguration()
{
/** @var \Illuminate\Foundation\Application $instance */
return $instance->dontMergeFrameworkConfiguration();
}
/**
* Determine if middleware has been disabled for the application.
Expand Down Expand Up @@ -25555,7 +25575,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Insert or update a record matching the attributes, and fill it with values.
*
* @param array $attributes
* @param array $values
* @param array|callable $values
* @return bool
* @static
*/ public static function updateOrInsert($attributes, $values = [])
Expand Down Expand Up @@ -25886,11 +25906,6 @@ class Flare extends \Spatie\LaravelIgnition\Facades\Flare {}
}


namespace Facades\Livewire\Features\SupportFileUploads {
/**
* @mixin \Livewire\Features\SupportFileUploads\GenerateSignedUploadUrl */
class GenerateSignedUploadUrl extends \Livewire\Features\SupportFileUploads\GenerateSignedUploadUrl {}
}



8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"awcodes/filament-versions": "^2.0.1",
"chrisullyott/php-filesize": "^4.2.1",
"dragonmantank/cron-expression": "^3.3.3",
"filament/filament": "^3.2.83",
"filament/spatie-laravel-settings-plugin": "^3.2.83",
"filament/filament": "^3.2.86",
"filament/spatie-laravel-settings-plugin": "^3.2.86",
"guzzlehttp/guzzle": "^7.8.1",
"influxdata/influxdb-client-php": "^3.5",
"laravel-notification-channels/telegram": "^5.0",
"laravel/framework": "^11.9.1",
"laravel/framework": "^11.10",
"laravel/prompts": "^0.1.23",
"laravel/sanctum": "^4.0.2",
"laravel/tinker": "^2.9.0",
Expand All @@ -36,7 +36,7 @@
"laravel/telescope": "^5.0.5",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.1.1",
"phpunit/phpunit": "^10.5.20",
"phpunit/phpunit": "^11.1.3",
"spatie/laravel-ignition": "^2.7.0",
"tightenco/duster": "^2.7.5"
},
Expand Down
Loading