mirror of
https://github.com/linuxserver/Heimdall.git
synced 2025-12-01 20:49:53 +09:00
Dependency updates and update version number
This commit is contained in:
8
vendor/laravel/framework/composer.json
vendored
8
vendor/laravel/framework/composer.json
vendored
@@ -19,11 +19,11 @@
|
||||
"ext-mbstring": "*",
|
||||
"ext-openssl": "*",
|
||||
"doctrine/inflector": "~1.1",
|
||||
"erusev/parsedown": "~1.6",
|
||||
"league/flysystem": "~1.0",
|
||||
"erusev/parsedown": "~1.7",
|
||||
"league/flysystem": "^1.0.8",
|
||||
"monolog/monolog": "~1.12",
|
||||
"mtdowling/cron-expression": "~1.0",
|
||||
"nesbot/carbon": "~1.20",
|
||||
"nesbot/carbon": "^1.24.1",
|
||||
"psr/container": "~1.0",
|
||||
"psr/simple-cache": "^1.0",
|
||||
"ramsey/uuid": "~3.0",
|
||||
@@ -68,7 +68,7 @@
|
||||
"illuminate/translation": "self.version",
|
||||
"illuminate/validation": "self.version",
|
||||
"illuminate/view": "self.version",
|
||||
"tightenco/collect": "self.version"
|
||||
"tightenco/collect": "<5.5.33"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "~3.0",
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<li><a href="{{ route('register') }}">Register</a></li>
|
||||
@else
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true" v-pre>
|
||||
{{ Auth::user()->name }} <span class="caret"></span>
|
||||
</a>
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ abstract class GeneratorCommand extends Command
|
||||
// First we will check to see if the class already exists. If it does, we don't want
|
||||
// to create the class and overwrite the user's code. So, we will bail out so the
|
||||
// code is untouched. Otherwise, we will continue generating this class' files.
|
||||
if ($this->alreadyExists($this->getNameInput())) {
|
||||
if ((! $this->hasOption('force') || ! $this->option('force')) && $this->alreadyExists($this->getNameInput())) {
|
||||
$this->error($this->type.' already exists!');
|
||||
|
||||
return false;
|
||||
|
||||
@@ -60,8 +60,12 @@ class CallbackEvent extends Event
|
||||
return;
|
||||
}
|
||||
|
||||
register_shutdown_function(function () {
|
||||
$this->removeMutex();
|
||||
$pid = getmypid();
|
||||
|
||||
register_shutdown_function(function () use ($pid) {
|
||||
if ($pid === getmypid()) {
|
||||
$this->removeMutex();
|
||||
}
|
||||
});
|
||||
|
||||
parent::callBeforeCallbacks($container);
|
||||
|
||||
@@ -2,12 +2,14 @@
|
||||
|
||||
namespace Illuminate\Contracts\Broadcasting;
|
||||
|
||||
use Illuminate\Broadcasting\Channel;
|
||||
|
||||
interface ShouldBroadcast
|
||||
{
|
||||
/**
|
||||
* Get the channels the event should broadcast on.
|
||||
*
|
||||
* @return array
|
||||
* @return Channel|Channel[]
|
||||
*/
|
||||
public function broadcastOn();
|
||||
}
|
||||
|
||||
@@ -241,6 +241,10 @@ class Builder
|
||||
*/
|
||||
public function orWhere($column, $operator = null, $value = null)
|
||||
{
|
||||
list($value, $operator) = $this->query->prepareValueAndOperator(
|
||||
$value, $operator, func_num_args() == 2
|
||||
);
|
||||
|
||||
return $this->where($column, $operator, $value, 'or');
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ class Pivot extends Model
|
||||
*/
|
||||
public static function fromRawAttributes(Model $parent, $attributes, $table, $exists = false)
|
||||
{
|
||||
$instance = static::fromAttributes($parent, $attributes, $table, $exists);
|
||||
$instance = static::fromAttributes($parent, [], $table, $exists);
|
||||
|
||||
$instance->setRawAttributes($attributes, true);
|
||||
|
||||
|
||||
@@ -583,7 +583,7 @@ class Builder
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
protected function prepareValueAndOperator($value, $operator, $useDefault = false)
|
||||
public function prepareValueAndOperator($value, $operator, $useDefault = false)
|
||||
{
|
||||
if ($useDefault) {
|
||||
return [$operator, '='];
|
||||
@@ -631,6 +631,10 @@ class Builder
|
||||
*/
|
||||
public function orWhere($column, $operator = null, $value = null)
|
||||
{
|
||||
list($value, $operator) = $this->prepareValueAndOperator(
|
||||
$value, $operator, func_num_args() == 2
|
||||
);
|
||||
|
||||
return $this->where($column, $operator, $value, 'or');
|
||||
}
|
||||
|
||||
@@ -985,6 +989,10 @@ class Builder
|
||||
*/
|
||||
public function orWhereDate($column, $operator, $value)
|
||||
{
|
||||
list($value, $operator) = $this->prepareValueAndOperator(
|
||||
$value, $operator, func_num_args() == 2
|
||||
);
|
||||
|
||||
return $this->whereDate($column, $operator, $value, 'or');
|
||||
}
|
||||
|
||||
@@ -1012,6 +1020,10 @@ class Builder
|
||||
*/
|
||||
public function orWhereTime($column, $operator, $value)
|
||||
{
|
||||
list($value, $operator) = $this->prepareValueAndOperator(
|
||||
$value, $operator, func_num_args() == 2
|
||||
);
|
||||
|
||||
return $this->whereTime($column, $operator, $value, 'or');
|
||||
}
|
||||
|
||||
|
||||
@@ -34,6 +34,20 @@ class PostgresGrammar extends Grammar
|
||||
return $this->wrap($where['column']).'::date '.$where['operator'].' '.$value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a "where time" clause.
|
||||
*
|
||||
* @param \Illuminate\Database\Query\Builder $query
|
||||
* @param array $where
|
||||
* @return string
|
||||
*/
|
||||
protected function whereTime(Builder $query, $where)
|
||||
{
|
||||
$value = $this->parameter($where['value']);
|
||||
|
||||
return $this->wrap($where['column']).'::time '.$where['operator'].' '.$value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a date based where clause.
|
||||
*
|
||||
|
||||
@@ -114,6 +114,18 @@ class SQLiteGrammar extends Grammar
|
||||
return $this->dateBasedWhere('%Y', $query, $where);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a "where time" clause.
|
||||
*
|
||||
* @param \Illuminate\Database\Query\Builder $query
|
||||
* @param array $where
|
||||
* @return string
|
||||
*/
|
||||
protected function whereTime(Builder $query, $where)
|
||||
{
|
||||
return $this->dateBasedWhere('%H:%M:%S', $query, $where);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a date based where clause.
|
||||
*
|
||||
|
||||
@@ -206,9 +206,8 @@ class Encrypter implements EncrypterContract
|
||||
*/
|
||||
protected function validPayload($payload)
|
||||
{
|
||||
return is_array($payload) && isset(
|
||||
$payload['iv'], $payload['value'], $payload['mac']
|
||||
);
|
||||
return is_array($payload) && isset($payload['iv'], $payload['value'], $payload['mac']) &&
|
||||
strlen(base64_decode($payload['iv'], true)) === openssl_cipher_iv_length($this->cipher);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -252,7 +252,7 @@ class FilesystemManager implements FactoryContract
|
||||
*
|
||||
* @param \League\Flysystem\AdapterInterface $adapter
|
||||
* @param array $config
|
||||
* @return \League\Flysystem\FlysystemInterface
|
||||
* @return \League\Flysystem\FilesystemInterface
|
||||
*/
|
||||
protected function createFlysystem(AdapterInterface $adapter, array $config)
|
||||
{
|
||||
|
||||
@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '5.5.34';
|
||||
const VERSION = '5.5.40';
|
||||
|
||||
/**
|
||||
* The base path for the Laravel installation.
|
||||
|
||||
@@ -778,9 +778,9 @@ if (! function_exists('route')) {
|
||||
/**
|
||||
* Generate the URL to a named route.
|
||||
*
|
||||
* @param string $name
|
||||
* @param array $parameters
|
||||
* @param bool $absolute
|
||||
* @param array|string $name
|
||||
* @param array $parameters
|
||||
* @param bool $absolute
|
||||
* @return string
|
||||
*/
|
||||
function route($name, $parameters = [], $absolute = true)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
],
|
||||
"require": {
|
||||
"php": ">=7.0",
|
||||
"erusev/parsedown": "~1.6",
|
||||
"erusev/parsedown": "~1.7",
|
||||
"illuminate/container": "5.5.*",
|
||||
"illuminate/contracts": "5.5.*",
|
||||
"illuminate/support": "5.5.*",
|
||||
|
||||
@@ -45,15 +45,4 @@ class Carbon extends BaseCarbon implements JsonSerializable
|
||||
{
|
||||
static::$serializer = $callback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new Carbon instance based on the given state array.
|
||||
*
|
||||
* @param array $array
|
||||
* @return static
|
||||
*/
|
||||
public static function __set_state($array)
|
||||
{
|
||||
return static::instance(parent::__set_state($array));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,9 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
|
||||
}
|
||||
|
||||
foreach ($notifiables as $notifiable) {
|
||||
$notification->id = Uuid::uuid4()->toString();
|
||||
if (! $notification->id) {
|
||||
$notification->id = Uuid::uuid4()->toString();
|
||||
}
|
||||
|
||||
$this->notifications[get_class($notifiable)][$notifiable->getKey()][get_class($notification)][] = [
|
||||
'notification' => $notification,
|
||||
|
||||
@@ -239,8 +239,8 @@ class QueueFake extends QueueManager implements Queue
|
||||
*/
|
||||
public function bulk($jobs, $data = '', $queue = null)
|
||||
{
|
||||
foreach ($this->jobs as $job) {
|
||||
$this->push($job);
|
||||
foreach ($jobs as $job) {
|
||||
$this->push($job, $data, $queue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
"ext-mbstring": "*",
|
||||
"doctrine/inflector": "~1.1",
|
||||
"illuminate/contracts": "5.5.*",
|
||||
"nesbot/carbon": "^1.20"
|
||||
"nesbot/carbon": "^1.24.1"
|
||||
},
|
||||
"replace": {
|
||||
"tightenco/collect": "self.version"
|
||||
"tightenco/collect": "<5.5.33"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
@@ -37,7 +37,7 @@
|
||||
}
|
||||
},
|
||||
"suggest": {
|
||||
"illuminate/filesystem": "Required to use the composer class (5.2.*).",
|
||||
"illuminate/filesystem": "Required to use the composer class (5.5.*).",
|
||||
"symfony/process": "Required to use the composer class (~3.3).",
|
||||
"symfony/var-dumper": "Required to use the dd function (~3.3)."
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user