Skip to content

Laravel 10.48.5 Shift #1361

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

Merged
alexjustesen merged 4 commits into from
Apr 10, 2024
Merged

Laravel 10.48.5 Shift #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79cdef2
Bump Laravel version constraint
laravel-shift Apr 9, 2024
bb2267f
composer update
laravel-shift Apr 9, 2024
0797ab3
Merge branch 'main' into shift-ci-v10.48.5
alexjustesen Apr 10, 2024
44d37c4
updated composer dependencies
alexjustesen Apr 10, 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
43 changes: 36 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 10.48.2.
* Generated for Laravel 10.48.5.
*
* This file should not be included in your code, only analyzed by your IDE!
*
Expand Down Expand Up @@ -8862,6 +8862,17 @@
{
/** @var \Illuminate\Support\Testing\Fakes\NotificationFake $instance */
return $instance->hasSent($notifiable, $notification);
}
/**
* Specify if notification should be serialized and restored when being "pushed" to the queue.
*
* @param bool $serializeAndRestore
* @return \Illuminate\Support\Testing\Fakes\NotificationFake
* @static
*/ public static function serializeAndRestore($serializeAndRestore = true)
{
/** @var \Illuminate\Support\Testing\Fakes\NotificationFake $instance */
return $instance->serializeAndRestore($serializeAndRestore);
}
/**
* Get the notifications that have been sent.
Expand Down Expand Up @@ -20024,22 +20035,26 @@
*
* @see \Filament\Tables\Testing\TestsActions::assertTableActionExists()
* @param array|string $name
* @param \Closure|null $checkActionUsing
* @param mixed $record
* @return static
* @static
*/ public static function assertTableActionExists($name)
*/ public static function assertTableActionExists($name, $checkActionUsing = null, $record = null)
{
return \Livewire\Features\SupportTesting\Testable::assertTableActionExists($name);
return \Livewire\Features\SupportTesting\Testable::assertTableActionExists($name, $checkActionUsing, $record);
}
/**
*
*
* @see \Filament\Tables\Testing\TestsActions::assertTableActionDoesNotExist()
* @param array|string $name
* @param \Closure|null $checkActionUsing
* @param mixed $record
* @return static
* @static
*/ public static function assertTableActionDoesNotExist($name)
*/ public static function assertTableActionDoesNotExist($name, $checkActionUsing = null, $record = null)
{
return \Livewire\Features\SupportTesting\Testable::assertTableActionDoesNotExist($name);
return \Livewire\Features\SupportTesting\Testable::assertTableActionDoesNotExist($name, $checkActionUsing, $record);
}
/**
*
Expand Down Expand Up @@ -20630,6 +20645,19 @@
*/ public static function assertTableColumnExists($name, $checkColumnUsing = null, $record = null)
{
return \Livewire\Features\SupportTesting\Testable::assertTableColumnExists($name, $checkColumnUsing, $record);
}
/**
*
*
* @see \Filament\Tables\Testing\TestsColumns::assertTableColumnDoesNotExist()
* @param string $name
* @param \Closure|null $checkColumnUsing
* @param mixed $record
* @return static
* @static
*/ public static function assertTableColumnDoesNotExist($name, $checkColumnUsing = null, $record = null)
{
return \Livewire\Features\SupportTesting\Testable::assertTableColumnDoesNotExist($name, $checkColumnUsing, $record);
}
/**
*
Expand Down Expand Up @@ -22682,10 +22710,11 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* @param mixed $direction
* @param mixed $aggregation
* @param mixed $joinType
* @param mixed $aliases
* @static
*/ public static function orderByPowerJoins($sort, $direction = 'asc', $aggregation = null, $joinType = 'join')
*/ public static function orderByPowerJoins($sort, $direction = 'asc', $aggregation = null, $joinType = 'join', $aliases = null)
{
return \Illuminate\Database\Eloquent\Builder::orderByPowerJoins($sort, $direction, $aggregation, $joinType);
return \Illuminate\Database\Eloquent\Builder::orderByPowerJoins($sort, $direction, $aggregation, $joinType, $aliases);
}
/**
*
Expand Down
24 changes: 12 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,33 @@
"chrisullyott/php-filesize": "^4.2.1",
"doctrine/dbal": "^3.8.3",
"dragonmantank/cron-expression": "^3.3.3",
"filament/filament": "^3.2.50",
"filament/spatie-laravel-settings-plugin": "^3.2.50",
"filament/filament": "^3.2.63",
"filament/spatie-laravel-settings-plugin": "^3.2.63",
"guzzlehttp/guzzle": "^7.8.1",
"influxdata/influxdb-client-php": "^3.4",
"laravel-notification-channels/telegram": "^4.0",
"laravel/framework": "^10.48.2",
"laravel/prompts": "^0.1.16",
"laravel/framework": "^10.48.5",
"laravel/prompts": "^0.1.18",
"laravel/sanctum": "^3.3.3",
"laravel/tinker": "^2.9.0",
"livewire/livewire": "^3.4.9",
"livewire/livewire": "^3.4.10",
"lorisleiva/laravel-actions": "^2.8.0",
"maennchen/zipstream-php": "^2.4",
"spatie/laravel-settings": "^2.8.3",
"spatie/laravel-webhook-server": "^3.8.1",
"timokoerber/laravel-one-time-operations": "^1.4"
"timokoerber/laravel-one-time-operations": "^1.4.2"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.15.1",
"fakerphp/faker": "^1.23.1",
"laravel/pint": "^1.14.0",
"laravel/sail": "^1.29.0",
"laravel/pint": "^1.15.1",
"laravel/sail": "^1.29.1",
"laravel/telescope": "^4.17.6",
"mockery/mockery": "^1.6.9",
"mockery/mockery": "^1.6.11",
"nunomaduro/collision": "^7.10.0",
"phpunit/phpunit": "^10.5.13",
"spatie/laravel-ignition": "^2.4.2",
"tightenco/duster": "^2.7.3"
"phpunit/phpunit": "^10.5.17",
"spatie/laravel-ignition": "^2.5.1",
"tightenco/duster": "^2.7.4"
},
"autoload": {
"files": [
Expand Down
Loading