Skip to content

Laravel 10.48.2 Shift #1308

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 3 commits into from
Mar 15, 2024
Merged

Laravel 10.48.2 Shift #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a01c30
Bump Laravel version constraint
laravel-shift Mar 12, 2024
2271a0b
composer update
laravel-shift Mar 12, 2024
9df8f22
updated composer dependencies
alexjustesen Mar 15, 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
82 changes: 68 additions & 14 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.46.0.
* Generated for Laravel 10.48.2.
*
* This file should not be included in your code, only analyzed by your IDE!
*
Expand Down Expand Up @@ -6371,12 +6371,12 @@
*
* @param string $target
* @param string $link
* @return void
* @return bool|null
* @static
*/ public static function link($target, $link)
{
/** @var \Illuminate\Filesystem\Filesystem $instance */
$instance->link($target, $link);
return $instance->link($target, $link);
}
/**
* Create a relative symlink to the target file or directory.
Expand Down Expand Up @@ -23023,7 +23023,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a join clause to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @param string $type
Expand All @@ -23039,7 +23039,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a "join where" clause to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string $second
* @param string $type
Expand All @@ -23055,7 +23055,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
*
* @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string $query
* @param string $as
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @param string $type
Expand Down Expand Up @@ -23097,7 +23097,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a left join to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @return \Illuminate\Database\Query\Builder
Expand All @@ -23111,7 +23111,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a "join where" clause to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @return \Illuminate\Database\Query\Builder
Expand All @@ -23126,7 +23126,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
*
* @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string $query
* @param string $as
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @return \Illuminate\Database\Query\Builder
Expand Down Expand Up @@ -23154,7 +23154,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a "right join where" clause to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string $second
* @return \Illuminate\Database\Query\Builder
Expand All @@ -23169,7 +23169,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
*
* @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string $query
* @param string $as
* @param \Closure|string $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @return \Illuminate\Database\Query\Builder
Expand All @@ -23183,7 +23183,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
* Add a "cross join" clause to the query.
*
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
* @param \Closure|string|null $first
* @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string|null $first
* @param string|null $operator
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
* @return \Illuminate\Database\Query\Builder
Expand Down Expand Up @@ -23234,7 +23234,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
/**
* Add a "where" clause comparing two columns to the query.
*
* @param string|array $first
* @param \Illuminate\Contracts\Database\Query\Expression|string|array $first
* @param string|null $operator
* @param string|null $second
* @param string|null $boolean
Expand All @@ -23248,7 +23248,7 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
/**
* Add an "or where" clause comparing two columns to the query.
*
* @param string|array $first
* @param \Illuminate\Contracts\Database\Query\Expression|string|array $first
* @param string|null $operator
* @param string|null $second
* @return \Illuminate\Database\Query\Builder
Expand Down Expand Up @@ -23953,6 +23953,60 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereFullText($columns, $value, $options);
}
/**
* Add a "where" clause to the query for multiple columns with "and" conditions between them.
*
* @param string[] $columns
* @param mixed $operator
* @param mixed $value
* @param string $boolean
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function whereAll($columns, $operator = null, $value = null, $boolean = 'and')
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->whereAll($columns, $operator, $value, $boolean);
}
/**
* Add an "or where" clause to the query for multiple columns with "and" conditions between them.
*
* @param string[] $columns
* @param string $operator
* @param mixed $value
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function orWhereAll($columns, $operator = null, $value = null)
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereAll($columns, $operator, $value);
}
/**
* Add an "where" clause to the query for multiple columns with "or" conditions between them.
*
* @param string[] $columns
* @param string $operator
* @param mixed $value
* @param string $boolean
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function whereAny($columns, $operator = null, $value = null, $boolean = 'and')
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->whereAny($columns, $operator, $value, $boolean);
}
/**
* Add an "or where" clause to the query for multiple columns with "or" conditions between them.
*
* @param string[] $columns
* @param string $operator
* @param mixed $value
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function orWhereAny($columns, $operator = null, $value = null)
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereAny($columns, $operator, $value);
}
/**
* Add a "group by" clause to the query.
Expand Down
18 changes: 9 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"php": "^8.1",
"awcodes/filament-versions": "^2.0.1",
"chrisullyott/php-filesize": "^4.2.1",
"doctrine/dbal": "^3.8.2",
"doctrine/dbal": "^3.8.3",
"dragonmantank/cron-expression": "^3.3.3",
"filament/filament": "^3.2.40",
"filament/spatie-laravel-settings-plugin": "^3.2.40",
"filament/filament": "^3.2.50",
"filament/spatie-laravel-settings-plugin": "^3.2.50",
"guzzlehttp/guzzle": "^7.8.1",
"influxdata/influxdb-client-php": "^3.4",
"laravel-notification-channels/telegram": "^4.0",
"laravel/framework": "^10.46",
"laravel/framework": "^10.48.2",
"laravel/prompts": "^0.1.16",
"laravel/sanctum": "^3.3.3",
"laravel/tinker": "^2.9.0",
"livewire/livewire": "^3.4.6",
"lorisleiva/laravel-actions": "^2.7.3",
"livewire/livewire": "^3.4.9",
"lorisleiva/laravel-actions": "^2.8.0",
"maennchen/zipstream-php": "^2.4",
"spatie/laravel-settings": "^2.8.3",
"spatie/laravel-webhook-server": "^3.8.1",
Expand All @@ -33,11 +33,11 @@
"barryvdh/laravel-ide-helper": "^2.15.1",
"fakerphp/faker": "^1.23.1",
"laravel/pint": "^1.14.0",
"laravel/sail": "^1.28.1",
"laravel/sail": "^1.29.0",
"laravel/telescope": "^4.17.6",
"mockery/mockery": "^1.6.7",
"mockery/mockery": "^1.6.9",
"nunomaduro/collision": "^7.10.0",
"phpunit/phpunit": "^10.5.11",
"phpunit/phpunit": "^10.5.13",
"spatie/laravel-ignition": "^2.4.2",
"tightenco/duster": "^2.7.3"
},
Expand Down
Loading