updated dependencies + working api connection

This commit is contained in:
Chris
2018-02-08 14:21:29 +00:00
parent dfc3c2194c
commit 30aea8e361
216 changed files with 21763 additions and 915 deletions

View File

@@ -99,9 +99,13 @@ class Pivot extends Model
return parent::setKeysForSaveQuery($query);
}
$query->where($this->foreignKey, $this->getAttribute($this->foreignKey));
$query->where($this->foreignKey, $this->getOriginal(
$this->foreignKey, $this->getAttribute($this->foreignKey)
));
return $query->where($this->relatedKey, $this->getAttribute($this->relatedKey));
return $query->where($this->relatedKey, $this->getOriginal(
$this->relatedKey, $this->getAttribute($this->relatedKey)
));
}
/**
@@ -126,8 +130,8 @@ class Pivot extends Model
protected function getDeleteQuery()
{
return $this->newQuery()->where([
$this->foreignKey => $this->getAttribute($this->foreignKey),
$this->relatedKey => $this->getAttribute($this->relatedKey),
$this->foreignKey => $this->getOriginal($this->foreignKey, $this->getAttribute($this->foreignKey)),
$this->relatedKey => $this->getOriginal($this->relatedKey, $this->getAttribute($this->relatedKey)),
]);
}

View File

@@ -6,13 +6,6 @@ use InvalidArgumentException;
class JsonExpression extends Expression
{
/**
* The value of the expression.
*
* @var mixed
*/
protected $value;
/**
* Create a new raw query expression.
*
@@ -21,7 +14,9 @@ class JsonExpression extends Expression
*/
public function __construct($value)
{
$this->value = $this->getJsonBindingParameter($value);
parent::__construct(
$this->getJsonBindingParameter($value)
);
}
/**
@@ -47,24 +42,4 @@ class JsonExpression extends Expression
throw new InvalidArgumentException('JSON value is of illegal type: '.$type);
}
/**
* Get the value of the expression.
*
* @return mixed
*/
public function getValue()
{
return $this->value;
}
/**
* Get the value of the expression.
*
* @return string
*/
public function __toString()
{
return (string) $this->getValue();
}
}

View File

@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
*
* @var string
*/
const VERSION = '5.5.33';
const VERSION = '5.5.34';
/**
* The base path for the Laravel installation.

View File

@@ -224,7 +224,7 @@ class AppNameCommand extends Command
protected function setDatabaseFactoryNamespaces()
{
$files = Finder::create()
->in($this->laravel->databasePath().'/factories')
->in(database_path('factories'))
->contains($this->currentRoot)
->name('*.php');
@@ -268,7 +268,7 @@ class AppNameCommand extends Command
*/
protected function getComposerPath()
{
return $this->laravel->basePath().'/composer.json';
return base_path('composer.json');
}
/**

View File

@@ -32,7 +32,7 @@ class DownCommand extends Command
public function handle()
{
file_put_contents(
$this->laravel->storagePath().'/framework/down',
storage_path('framework/down'),
json_encode($this->getDownFilePayload(), JSON_PRETTY_PRINT)
);

View File

@@ -32,7 +32,7 @@ class ServeCommand extends Command
*/
public function handle()
{
chdir($this->laravel->publicPath());
chdir(public_path());
$this->line("<info>Laravel development server started:</info> <http://{$this->host()}:{$this->port()}>");
@@ -50,7 +50,7 @@ class ServeCommand extends Command
ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false)),
$this->host(),
$this->port(),
ProcessUtils::escapeArgument($this->laravel->basePath())
ProcessUtils::escapeArgument(base_path())
);
}

View File

@@ -52,7 +52,7 @@ class TestMakeCommand extends GeneratorCommand
{
$name = Str::replaceFirst($this->rootNamespace(), '', $name);
return $this->laravel->basePath().'/tests'.str_replace('\\', '/', $name).'.php';
return base_path('tests').str_replace('\\', '/', $name).'.php';
}
/**

View File

@@ -27,7 +27,7 @@ class UpCommand extends Command
*/
public function handle()
{
@unlink($this->laravel->storagePath().'/framework/down');
@unlink(storage_path('framework/down'));
$this->info('Application is now live.');
}

View File

@@ -21,6 +21,7 @@ namespace Illuminate\Support\Facades;
* @method static \Illuminate\Support\Facades\Route domain(string $value)
* @method static \Illuminate\Support\Facades\Route name(string $value)
* @method static \Illuminate\Support\Facades\Route namespace(string $value)
* @method static \Illuminate\Support\Facades\Route where(array|string $name, string $expression = null)
* @method static \Illuminate\Routing\Router group(\Closure|string|array $value)
* @method static \Illuminate\Support\Facades\Route redirect(string $uri, string $destination, int $status = 301)
* @method static \Illuminate\Support\Facades\Route view(string $uri, string $view, array $data = [])

View File

@@ -23,7 +23,7 @@ class ProcessUtils
// @see https://bugs.php.net/bug.php?id=49446
if ('\\' === DIRECTORY_SEPARATOR) {
if ('' === $argument) {
return escapeshellarg($argument);
return '""';
}
$escapedArgument = '';