remove conflict
This commit is contained in:
commit
24c4482116
|
@ -71,9 +71,9 @@ class Dispatcher implements QueueingDispatcher
|
|||
{
|
||||
if ($this->queueResolver && $this->commandShouldBeQueued($command)) {
|
||||
return $this->dispatchToQueue($command);
|
||||
} else {
|
||||
return $this->dispatchNow($command);
|
||||
}
|
||||
|
||||
return $this->dispatchNow($command);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -155,9 +155,9 @@ class Dispatcher implements QueueingDispatcher
|
|||
|
||||
if (method_exists($command, 'queue')) {
|
||||
return $command->queue($queue, $command);
|
||||
} else {
|
||||
return $this->pushCommandToQueue($queue, $command);
|
||||
}
|
||||
|
||||
return $this->pushCommandToQueue($queue, $command);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -17,9 +17,9 @@ class CommandBuilder
|
|||
{
|
||||
if ($event->runInBackground) {
|
||||
return $this->buildBackgroundCommand($event);
|
||||
} else {
|
||||
return $this->buildForegroundCommand($event);
|
||||
}
|
||||
|
||||
return $this->buildForegroundCommand($event);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -106,9 +106,9 @@ class PostgresConnector extends Connector implements ConnectorInterface
|
|||
{
|
||||
if (is_array($schema)) {
|
||||
return '"'.implode('", "', $schema).'"';
|
||||
} else {
|
||||
return '"'.$schema.'"';
|
||||
}
|
||||
|
||||
return '"'.$schema.'"';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -47,9 +47,9 @@ class SqlServerConnector extends Connector implements ConnectorInterface
|
|||
return $this->getDblibDsn($config);
|
||||
} elseif ($this->prefersOdbc($config)) {
|
||||
return $this->getOdbcDsn($config);
|
||||
} else {
|
||||
return $this->getSqlSrvDsn($config);
|
||||
}
|
||||
|
||||
return $this->getSqlSrvDsn($config);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -97,11 +97,9 @@ class MigrationCreator
|
|||
// We also have stubs for creating new tables and modifying existing tables
|
||||
// to save the developer some typing when they are creating a new tables
|
||||
// or modifying existing tables. We'll grab the appropriate stub here.
|
||||
else {
|
||||
$stub = $create ? 'create.stub' : 'update.stub';
|
||||
$stub = $create ? 'create.stub' : 'update.stub';
|
||||
|
||||
return $this->files->get($this->stubPath()."/{$stub}");
|
||||
}
|
||||
return $this->files->get($this->stubPath()."/{$stub}");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -204,9 +204,9 @@ class Migrator
|
|||
$this->note('<info>Nothing to rollback.</info>');
|
||||
|
||||
return [];
|
||||
} else {
|
||||
return $this->rollbackMigrations($migrations, $paths, $options);
|
||||
}
|
||||
|
||||
return $this->rollbackMigrations($migrations, $paths, $options);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -281,9 +281,9 @@ class Migrator
|
|||
$this->note('<info>Nothing to rollback.</info>');
|
||||
|
||||
return [];
|
||||
} else {
|
||||
return $this->resetMigrations($migrations, $paths, $pretend);
|
||||
}
|
||||
|
||||
return $this->resetMigrations($migrations, $paths, $pretend);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1775,9 +1775,9 @@ class Builder
|
|||
return 0;
|
||||
} elseif (is_object($results[0])) {
|
||||
return (int) $results[0]->aggregate;
|
||||
} else {
|
||||
return (int) array_change_key_case((array) $results[0])['aggregate'];
|
||||
}
|
||||
|
||||
return (int) array_change_key_case((array) $results[0])['aggregate'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -145,9 +145,9 @@ class MySqlGrammar extends Grammar
|
|||
return collect($values)->map(function ($value, $key) {
|
||||
if ($this->isJsonSelector($key)) {
|
||||
return $this->compileJsonUpdateColumn($key, new JsonExpression($value));
|
||||
} else {
|
||||
return $this->wrap($key).' = '.$this->parameter($value);
|
||||
}
|
||||
|
||||
return $this->wrap($key).' = '.$this->parameter($value);
|
||||
})->implode(', ');
|
||||
}
|
||||
|
||||
|
|
|
@ -345,9 +345,9 @@ class Dispatcher implements DispatcherContract
|
|||
return function ($event, $payload) use ($listener, $wildcard) {
|
||||
if ($wildcard) {
|
||||
return $listener($event, $payload);
|
||||
} else {
|
||||
return $listener(...array_values($payload));
|
||||
}
|
||||
|
||||
return $listener(...array_values($payload));
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -363,11 +363,11 @@ class Dispatcher implements DispatcherContract
|
|||
return function ($event, $payload) use ($listener, $wildcard) {
|
||||
if ($wildcard) {
|
||||
return call_user_func($this->createClassCallable($listener), $event, $payload);
|
||||
} else {
|
||||
return call_user_func_array(
|
||||
$this->createClassCallable($listener), $payload
|
||||
);
|
||||
}
|
||||
|
||||
return call_user_func_array(
|
||||
$this->createClassCallable($listener), $payload
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -383,9 +383,9 @@ class Dispatcher implements DispatcherContract
|
|||
|
||||
if ($this->handlerShouldBeQueued($class)) {
|
||||
return $this->createQueuedHandlerCallable($class, $method);
|
||||
} else {
|
||||
return [$this->container->make($class), $method];
|
||||
}
|
||||
|
||||
return [$this->container->make($class), $method];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -447,9 +447,9 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
|
|||
// are really supposed to use. We will remove the public from this path here.
|
||||
if (Str::contains($path, '/storage/public/')) {
|
||||
return Str::replaceFirst('/public/', '/', $path);
|
||||
} else {
|
||||
return $path;
|
||||
}
|
||||
|
||||
return $path;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -67,11 +67,11 @@ class ListenerMakeCommand extends GeneratorCommand
|
|||
return $this->option('event')
|
||||
? __DIR__.'/stubs/listener-queued.stub'
|
||||
: __DIR__.'/stubs/listener-queued-duck.stub';
|
||||
} else {
|
||||
return $this->option('event')
|
||||
? __DIR__.'/stubs/listener.stub'
|
||||
: __DIR__.'/stubs/listener-duck.stub';
|
||||
}
|
||||
|
||||
return $this->option('event')
|
||||
? __DIR__.'/stubs/listener.stub'
|
||||
: __DIR__.'/stubs/listener-duck.stub';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -37,9 +37,9 @@ class TestMakeCommand extends GeneratorCommand
|
|||
{
|
||||
if ($this->option('unit')) {
|
||||
return __DIR__.'/stubs/unit-test.stub';
|
||||
} else {
|
||||
return __DIR__.'/stubs/test.stub';
|
||||
}
|
||||
|
||||
return __DIR__.'/stubs/test.stub';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -149,9 +149,9 @@ if (! function_exists('auth')) {
|
|||
{
|
||||
if (is_null($guard)) {
|
||||
return app(AuthFactory::class);
|
||||
} else {
|
||||
return app(AuthFactory::class)->guard($guard);
|
||||
}
|
||||
|
||||
return app(AuthFactory::class)->guard($guard);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -483,9 +483,9 @@ if (! function_exists('factory')) {
|
|||
return $factory->of($arguments[0], $arguments[1])->times($arguments[2] ?? null);
|
||||
} elseif (isset($arguments[1])) {
|
||||
return $factory->of($arguments[0])->times($arguments[1]);
|
||||
} else {
|
||||
return $factory->of($arguments[0]);
|
||||
}
|
||||
|
||||
return $factory->of($arguments[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -551,9 +551,9 @@ class Mailable implements MailableContract, Renderable
|
|||
return collect($this->{$property})->contains(function ($actual) use ($expected) {
|
||||
if (! isset($expected['name'])) {
|
||||
return $actual['address'] == $expected['address'];
|
||||
} else {
|
||||
return $actual == $expected;
|
||||
}
|
||||
|
||||
return $actual == $expected;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -140,9 +140,9 @@ class RouteUrlGenerator
|
|||
return 'http://';
|
||||
} elseif ($route->httpsOnly()) {
|
||||
return 'https://';
|
||||
} else {
|
||||
return $this->url->formatScheme(null);
|
||||
}
|
||||
|
||||
return $this->url->formatScheme(null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -212,9 +212,9 @@ class RouteUrlGenerator
|
|||
return Arr::pull($parameters, $m[1]);
|
||||
} elseif (isset($this->defaultParameters[$m[1]])) {
|
||||
return $this->defaultParameters[$m[1]];
|
||||
} else {
|
||||
return $m[0];
|
||||
}
|
||||
|
||||
return $m[0];
|
||||
}, $path);
|
||||
}
|
||||
|
||||
|
|
|
@ -142,9 +142,9 @@ class UrlGenerator implements UrlGeneratorContract
|
|||
return $url;
|
||||
} elseif ($fallback) {
|
||||
return $this->to($fallback);
|
||||
} else {
|
||||
return $this->to('/');
|
||||
}
|
||||
|
||||
return $this->to('/');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -164,9 +164,9 @@ class SessionManager extends Manager
|
|||
{
|
||||
if ($this->app['config']['session.encrypt']) {
|
||||
return $this->buildEncryptedSession($handler);
|
||||
} else {
|
||||
return new Store($this->app['config']['session.cookie'], $handler);
|
||||
}
|
||||
|
||||
return new Store($this->app['config']['session.cookie'], $handler);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1608,9 +1608,9 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
|
|||
return json_decode($value->toJson(), true);
|
||||
} elseif ($value instanceof Arrayable) {
|
||||
return $value->toArray();
|
||||
} else {
|
||||
return $value;
|
||||
}
|
||||
|
||||
return $value;
|
||||
}, $this->items);
|
||||
}
|
||||
|
||||
|
|
|
@ -87,9 +87,9 @@ class ValidationRuleParser
|
|||
return explode('|', $rule);
|
||||
} elseif (is_object($rule)) {
|
||||
return [$this->prepareRule($rule)];
|
||||
} else {
|
||||
return array_map([$this, 'prepareRule'], $rule);
|
||||
}
|
||||
|
||||
return array_map([$this, 'prepareRule'], $rule);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue