From b0ad1d272cac59610a79aa98f77544c7a29dbf64 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 13 Jun 2020 17:26:59 +0100 Subject: [PATCH] Some small fixes needed for the tests --- _ide_helper.php | 1382 +++++++++-------- .../Controllers/Admin/PlacesController.php | 2 +- app/Http/Controllers/MicropubController.php | 2 +- app/Models/Place.php | 8 +- app/Services/PlaceService.php | 2 +- tests/Feature/Admin/ArticlesTest.php | 2 +- tests/Feature/Admin/ContactsTest.php | 2 +- tests/Feature/MicropubControllerTest.php | 23 +- tests/Unit/PlacesTest.php | 2 +- 9 files changed, 780 insertions(+), 645 deletions(-) diff --git a/_ide_helper.php b/_ide_helper.php index bfcde590..06a70d7e 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -2,8 +2,8 @@ // @formatter:off /** - * A helper file for Laravel 5, to provide autocomplete information to your IDE - * Generated for Laravel 6.16.0 on 2020-02-22 10:31:39. + * A helper file for Laravel, to provide autocomplete information to your IDE + * Generated for Laravel 7.15.0 on 2020-06-13 16:16:59. * * This file should not be included in your code, only analyzed by your IDE! * @@ -333,10 +333,10 @@ namespace Illuminate\Support\Facades { * @return string|bool * @static */ - public static function environment($environments = null) + public static function environment(...$environments) { /** @var \Illuminate\Foundation\Application $instance */ - return $instance->environment($environments); + return $instance->environment(...$environments); } /** @@ -506,8 +506,6 @@ namespace Illuminate\Support\Facades { /** * Resolve the given type from the container. - * - * (Overriding Container::make) * * @param string $abstract * @param array $parameters @@ -522,8 +520,6 @@ namespace Illuminate\Support\Facades { /** * Determine if the given abstract type has been bound. - * - * (Overriding Container::bound) * * @param string $abstract * @return bool @@ -704,6 +700,19 @@ namespace Illuminate\Support\Facades { return $instance->getCachedEventsPath(); } + /** + * Add new prefix to list of absolute path prefixes. + * + * @param string $prefix + * @return \Illuminate\Foundation\Application + * @static + */ + public static function addAbsoluteCachePathPrefix($prefix) + { + /** @var \Illuminate\Foundation\Application $instance */ + return $instance->addAbsoluteCachePathPrefix($prefix); + } + /** * Determine if the application is currently down for maintenance. * @@ -1232,9 +1241,10 @@ namespace Illuminate\Support\Facades { * Call the given Closure / class@method and inject its dependencies. * * @param callable|string $callback - * @param array $parameters + * @param \Illuminate\Container\array $parameters * @param string|null $defaultMethod * @return mixed + * @throws \InvalidArgumentException * @static */ public static function call($callback, $parameters = [], $defaultMethod = null) @@ -1264,6 +1274,7 @@ namespace Illuminate\Support\Facades { * @param string $abstract * @param array $parameters * @return mixed + * @throws \Illuminate\Contracts\Container\BindingResolutionException * @static */ public static function makeWith($abstract, $parameters = []) @@ -1292,7 +1303,7 @@ namespace Illuminate\Support\Facades { /** * Instantiate a concrete instance of the given type. * - * @param string $concrete + * @param \Closure|string $concrete * @return mixed * @throws \Illuminate\Contracts\Container\BindingResolutionException * @static @@ -1848,7 +1859,7 @@ namespace Illuminate\Support\Facades { /** * Get the ID for the currently authenticated user. * - * @return int|null + * @return int|string|null * @static */ public static function id() @@ -2413,10 +2424,51 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function check($name, $parameters = null) + public static function check($name, ...$parameters) { /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ - return $instance->check($name, $parameters); + return $instance->check($name, ...$parameters); + } + + /** + * Register a class-based component alias directive. + * + * @param string $class + * @param string|null $alias + * @param string $prefix + * @return void + * @static + */ + public static function component($class, $alias = null, $prefix = '') + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + $instance->component($class, $alias, $prefix); + } + + /** + * Register an array of class-based components. + * + * @param array $components + * @param string $prefix + * @return void + * @static + */ + public static function components($components, $prefix = '') + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + $instance->components($components, $prefix); + } + + /** + * Get the registered class component aliases. + * + * @return array + * @static + */ + public static function getClassComponentAliases() + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + return $instance->getClassComponentAliases(); } /** @@ -2427,10 +2479,10 @@ namespace Illuminate\Support\Facades { * @return void * @static */ - public static function component($path, $alias = null) + public static function aliasComponent($path, $alias = null) { /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ - $instance->component($path, $alias); + $instance->aliasComponent($path, $alias); } /** @@ -2447,6 +2499,20 @@ namespace Illuminate\Support\Facades { $instance->include($path, $alias); } + /** + * Register an include alias directive. + * + * @param string $path + * @param string|null $alias + * @return void + * @static + */ + public static function aliasInclude($path, $alias = null) + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + $instance->aliasInclude($path, $alias); + } + /** * Register a handler for custom directives. * @@ -2474,6 +2540,19 @@ namespace Illuminate\Support\Facades { return $instance->getCustomDirectives(); } + /** + * Register a new precompiler. + * + * @param callable $precompiler + * @return void + * @static + */ + public static function precompiler($precompiler) + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + $instance->precompiler($precompiler); + } + /** * Set the echo format to be used by the compiler. * @@ -2511,6 +2590,18 @@ namespace Illuminate\Support\Facades { $instance->withoutDoubleEncoding(); } + /** + * Indicate that component tags should not be compiled. + * + * @return void + * @static + */ + public static function withoutComponentTags() + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + $instance->withoutComponentTags(); + } + /** * Get the path to the compiled version of a view. * @@ -2538,6 +2629,70 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ return $instance->isExpired($path); } + + /** + * Get a new component hash for a component name. + * + * @param string $component + * @return string + * @static + */ + public static function newComponentHash($component) + { + return \Illuminate\View\Compilers\BladeCompiler::newComponentHash($component); + } + + /** + * Compile a class component opening. + * + * @param string $component + * @param string $alias + * @param string $data + * @param string $hash + * @return string + * @static + */ + public static function compileClassComponentOpening($component, $alias, $data, $hash) + { + return \Illuminate\View\Compilers\BladeCompiler::compileClassComponentOpening($component, $alias, $data, $hash); + } + + /** + * Compile the end-component statements into valid PHP. + * + * @return string + * @static + */ + public static function compileEndComponentClass() + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + return $instance->compileEndComponentClass(); + } + + /** + * Sanitize the given component attribute value. + * + * @param mixed $value + * @return mixed + * @static + */ + public static function sanitizeComponentAttribute($value) + { + return \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute($value); + } + + /** + * Compile Blade echos into valid PHP. + * + * @param string $value + * @return string + * @static + */ + public static function compileEchos($value) + { + /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ + return $instance->compileEchos($value); + } } @@ -2606,7 +2761,6 @@ namespace Illuminate\Support\Facades { * * @param mixed $command * @return mixed - * @throws \RuntimeException * @static */ public static function dispatchToQueue($command) @@ -2658,7 +2812,7 @@ namespace Illuminate\Support\Facades { /** * Assert if a job was dispatched based on a truth-test callback. * - * @param string $command + * @param string|\Closure $command * @param callable|int|null $callback * @return void * @static @@ -2686,7 +2840,7 @@ namespace Illuminate\Support\Facades { /** * Determine if a job was dispatched based on a truth-test callback. * - * @param string $command + * @param string|\Closure $command * @param callable|null $callback * @return void * @static @@ -2700,7 +2854,7 @@ namespace Illuminate\Support\Facades { /** * Assert if a job was dispatched after the response was sent based on a truth-test callback. * - * @param string $command + * @param string|\Closure $command * @param callable|int|null $callback * @return void * @static @@ -2728,7 +2882,7 @@ namespace Illuminate\Support\Facades { /** * Determine if a job was dispatched based on a truth-test callback. * - * @param string $command + * @param string|\Closure $command * @param callable|null $callback * @return void * @static @@ -2798,6 +2952,8 @@ namespace Illuminate\Support\Facades { /** * * + * @method static \Illuminate\Contracts\Cache\Lock lock(string $name, int $seconds = 0, mixed $owner = null) + * @method static \Illuminate\Contracts\Cache\Lock restoreLock(string $name, string $owner) * @see \Illuminate\Cache\CacheManager * @see \Illuminate\Cache\Repository */ @@ -3687,7 +3843,7 @@ namespace Illuminate\Support\Facades { * @param string $key * @param mixed $default * @param string|null $path - * @return \Symfony\Component\HttpFoundation\Cookie + * @return \Symfony\Component\HttpFoundation\Cookie|null * @static */ public static function queued($key, $default = null, $path = null) @@ -3703,10 +3859,10 @@ namespace Illuminate\Support\Facades { * @return void * @static */ - public static function queue($parameters = null) + public static function queue(...$parameters) { /** @var \Illuminate\Cookie\CookieJar $instance */ - $instance->queue($parameters); + $instance->queue(...$parameters); } /** @@ -3956,6 +4112,20 @@ namespace Illuminate\Support\Facades { return $instance->reconnect($name); } + /** + * Set the default database connection for the callback execution. + * + * @param string $name + * @param callable $callback + * @return mixed + * @static + */ + public static function usingConnection($name, $callback) + { + /** @var \Illuminate\Database\DatabaseManager $instance */ + return $instance->usingConnection($name, $callback); + } + /** * Get the default connection name. * @@ -4051,10 +4221,25 @@ namespace Illuminate\Support\Facades { */ public static function getSchemaBuilder() { - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getSchemaBuilder(); } + /** + * Bind values to their parameters in the given statement. + * + * @param \PDOStatement $statement + * @param array $bindings + * @return void + * @static + */ + public static function bindValues($statement, $bindings) + { + //Method inherited from \Illuminate\Database\PostgresConnection + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ + $instance->bindValues($statement, $bindings); + } + /** * Set the query grammar to the default implementation. * @@ -4064,7 +4249,7 @@ namespace Illuminate\Support\Facades { public static function useDefaultQueryGrammar() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->useDefaultQueryGrammar(); } @@ -4077,7 +4262,7 @@ namespace Illuminate\Support\Facades { public static function useDefaultSchemaGrammar() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->useDefaultSchemaGrammar(); } @@ -4090,7 +4275,7 @@ namespace Illuminate\Support\Facades { public static function useDefaultPostProcessor() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->useDefaultPostProcessor(); } @@ -4105,7 +4290,7 @@ namespace Illuminate\Support\Facades { public static function table($table, $as = null) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->table($table, $as); } @@ -4118,7 +4303,7 @@ namespace Illuminate\Support\Facades { public static function query() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->query(); } @@ -4134,7 +4319,7 @@ namespace Illuminate\Support\Facades { public static function selectOne($query, $bindings = [], $useReadPdo = true) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->selectOne($query, $bindings, $useReadPdo); } @@ -4149,7 +4334,7 @@ namespace Illuminate\Support\Facades { public static function selectFromWriteConnection($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->selectFromWriteConnection($query, $bindings); } @@ -4165,7 +4350,7 @@ namespace Illuminate\Support\Facades { public static function select($query, $bindings = [], $useReadPdo = true) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->select($query, $bindings, $useReadPdo); } @@ -4181,7 +4366,7 @@ namespace Illuminate\Support\Facades { public static function cursor($query, $bindings = [], $useReadPdo = true) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->cursor($query, $bindings, $useReadPdo); } @@ -4196,7 +4381,7 @@ namespace Illuminate\Support\Facades { public static function insert($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->insert($query, $bindings); } @@ -4211,7 +4396,7 @@ namespace Illuminate\Support\Facades { public static function update($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->update($query, $bindings); } @@ -4226,7 +4411,7 @@ namespace Illuminate\Support\Facades { public static function delete($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->delete($query, $bindings); } @@ -4241,7 +4426,7 @@ namespace Illuminate\Support\Facades { public static function statement($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->statement($query, $bindings); } @@ -4256,7 +4441,7 @@ namespace Illuminate\Support\Facades { public static function affectingStatement($query, $bindings = []) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->affectingStatement($query, $bindings); } @@ -4270,7 +4455,7 @@ namespace Illuminate\Support\Facades { public static function unprepared($query) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->unprepared($query); } @@ -4284,25 +4469,10 @@ namespace Illuminate\Support\Facades { public static function pretend($callback) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->pretend($callback); } - /** - * Bind values to their parameters in the given statement. - * - * @param \PDOStatement $statement - * @param array $bindings - * @return void - * @static - */ - public static function bindValues($statement, $bindings) - { - //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ - $instance->bindValues($statement, $bindings); - } - /** * Prepare the query bindings for execution. * @@ -4313,7 +4483,7 @@ namespace Illuminate\Support\Facades { public static function prepareBindings($bindings) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->prepareBindings($bindings); } @@ -4329,7 +4499,7 @@ namespace Illuminate\Support\Facades { public static function logQuery($query, $bindings, $time = null) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->logQuery($query, $bindings, $time); } @@ -4343,7 +4513,7 @@ namespace Illuminate\Support\Facades { public static function listen($callback) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->listen($callback); } @@ -4357,7 +4527,7 @@ namespace Illuminate\Support\Facades { public static function raw($value) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->raw($value); } @@ -4371,7 +4541,7 @@ namespace Illuminate\Support\Facades { public static function recordsHaveBeenModified($value = true) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->recordsHaveBeenModified($value); } @@ -4384,7 +4554,7 @@ namespace Illuminate\Support\Facades { public static function isDoctrineAvailable() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->isDoctrineAvailable(); } @@ -4399,7 +4569,7 @@ namespace Illuminate\Support\Facades { public static function getDoctrineColumn($table, $column) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getDoctrineColumn($table, $column); } @@ -4412,7 +4582,7 @@ namespace Illuminate\Support\Facades { public static function getDoctrineSchemaManager() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getDoctrineSchemaManager(); } @@ -4425,7 +4595,7 @@ namespace Illuminate\Support\Facades { public static function getDoctrineConnection() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getDoctrineConnection(); } @@ -4438,7 +4608,7 @@ namespace Illuminate\Support\Facades { public static function getPdo() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getPdo(); } @@ -4451,7 +4621,7 @@ namespace Illuminate\Support\Facades { public static function getRawPdo() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getRawPdo(); } @@ -4464,7 +4634,7 @@ namespace Illuminate\Support\Facades { public static function getReadPdo() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getReadPdo(); } @@ -4477,7 +4647,7 @@ namespace Illuminate\Support\Facades { public static function getRawReadPdo() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getRawReadPdo(); } @@ -4485,13 +4655,13 @@ namespace Illuminate\Support\Facades { * Set the PDO connection. * * @param \PDO|\Closure|null $pdo - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setPdo($pdo) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setPdo($pdo); } @@ -4499,13 +4669,13 @@ namespace Illuminate\Support\Facades { * Set the PDO connection used for reading. * * @param \PDO|\Closure|null $pdo - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setReadPdo($pdo) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setReadPdo($pdo); } @@ -4518,7 +4688,7 @@ namespace Illuminate\Support\Facades { public static function getName() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getName(); } @@ -4532,7 +4702,7 @@ namespace Illuminate\Support\Facades { public static function getConfig($option = null) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getConfig($option); } @@ -4545,7 +4715,7 @@ namespace Illuminate\Support\Facades { public static function getDriverName() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getDriverName(); } @@ -4558,7 +4728,7 @@ namespace Illuminate\Support\Facades { public static function getQueryGrammar() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getQueryGrammar(); } @@ -4566,13 +4736,13 @@ namespace Illuminate\Support\Facades { * Set the query grammar used by the connection. * * @param \Illuminate\Database\Query\Grammars\Grammar $grammar - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setQueryGrammar($grammar) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setQueryGrammar($grammar); } @@ -4585,7 +4755,7 @@ namespace Illuminate\Support\Facades { public static function getSchemaGrammar() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getSchemaGrammar(); } @@ -4593,13 +4763,13 @@ namespace Illuminate\Support\Facades { * Set the schema grammar used by the connection. * * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setSchemaGrammar($grammar) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setSchemaGrammar($grammar); } @@ -4612,7 +4782,7 @@ namespace Illuminate\Support\Facades { public static function getPostProcessor() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getPostProcessor(); } @@ -4620,13 +4790,13 @@ namespace Illuminate\Support\Facades { * Set the query post processor used by the connection. * * @param \Illuminate\Database\Query\Processors\Processor $processor - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setPostProcessor($processor) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setPostProcessor($processor); } @@ -4639,7 +4809,7 @@ namespace Illuminate\Support\Facades { public static function getEventDispatcher() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getEventDispatcher(); } @@ -4647,13 +4817,13 @@ namespace Illuminate\Support\Facades { * Set the event dispatcher instance on the connection. * * @param \Illuminate\Contracts\Events\Dispatcher $events - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setEventDispatcher($events) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setEventDispatcher($events); } @@ -4666,7 +4836,7 @@ namespace Illuminate\Support\Facades { public static function unsetEventDispatcher() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->unsetEventDispatcher(); } @@ -4679,7 +4849,7 @@ namespace Illuminate\Support\Facades { public static function pretending() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->pretending(); } @@ -4692,7 +4862,7 @@ namespace Illuminate\Support\Facades { public static function getQueryLog() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getQueryLog(); } @@ -4705,7 +4875,7 @@ namespace Illuminate\Support\Facades { public static function flushQueryLog() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->flushQueryLog(); } @@ -4718,7 +4888,7 @@ namespace Illuminate\Support\Facades { public static function enableQueryLog() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->enableQueryLog(); } @@ -4731,7 +4901,7 @@ namespace Illuminate\Support\Facades { public static function disableQueryLog() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->disableQueryLog(); } @@ -4744,7 +4914,7 @@ namespace Illuminate\Support\Facades { public static function logging() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->logging(); } @@ -4757,7 +4927,7 @@ namespace Illuminate\Support\Facades { public static function getDatabaseName() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getDatabaseName(); } @@ -4765,13 +4935,13 @@ namespace Illuminate\Support\Facades { * Set the name of the connected database. * * @param string $database - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setDatabaseName($database) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setDatabaseName($database); } @@ -4784,7 +4954,7 @@ namespace Illuminate\Support\Facades { public static function getTablePrefix() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->getTablePrefix(); } @@ -4792,13 +4962,13 @@ namespace Illuminate\Support\Facades { * Set the table prefix in use by the connection. * * @param string $prefix - * @return \Phaza\LaravelPostgis\PostgisConnection + * @return \MStaack\LaravelPostgis\PostgisConnection * @static */ public static function setTablePrefix($prefix) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->setTablePrefix($prefix); } @@ -4812,7 +4982,7 @@ namespace Illuminate\Support\Facades { public static function withTablePrefix($grammar) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->withTablePrefix($grammar); } @@ -4827,7 +4997,7 @@ namespace Illuminate\Support\Facades { public static function resolverFor($driver, $callback) { //Method inherited from \Illuminate\Database\Connection - \Phaza\LaravelPostgis\PostgisConnection::resolverFor($driver, $callback); + \MStaack\LaravelPostgis\PostgisConnection::resolverFor($driver, $callback); } /** @@ -4840,7 +5010,7 @@ namespace Illuminate\Support\Facades { public static function getResolver($driver) { //Method inherited from \Illuminate\Database\Connection - return \Phaza\LaravelPostgis\PostgisConnection::getResolver($driver); + return \MStaack\LaravelPostgis\PostgisConnection::getResolver($driver); } /** @@ -4849,13 +5019,13 @@ namespace Illuminate\Support\Facades { * @param \Closure $callback * @param int $attempts * @return mixed - * @throws \Exception|\Throwable + * @throws \Throwable * @static */ public static function transaction($callback, $attempts = 1) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->transaction($callback, $attempts); } @@ -4863,13 +5033,13 @@ namespace Illuminate\Support\Facades { * Start a new database transaction. * * @return void - * @throws \Exception + * @throws \Throwable * @static */ public static function beginTransaction() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->beginTransaction(); } @@ -4877,12 +5047,13 @@ namespace Illuminate\Support\Facades { * Commit the active database transaction. * * @return void + * @throws \Throwable * @static */ public static function commit() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->commit(); } @@ -4891,13 +5062,13 @@ namespace Illuminate\Support\Facades { * * @param int|null $toLevel * @return void - * @throws \Exception + * @throws \Throwable * @static */ public static function rollBack($toLevel = null) { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ $instance->rollBack($toLevel); } @@ -4910,7 +5081,7 @@ namespace Illuminate\Support\Facades { public static function transactionLevel() { //Method inherited from \Illuminate\Database\Connection - /** @var \Phaza\LaravelPostgis\PostgisConnection $instance */ + /** @var \MStaack\LaravelPostgis\PostgisConnection $instance */ return $instance->transactionLevel(); } @@ -5153,7 +5324,7 @@ namespace Illuminate\Support\Facades { /** * Assert if an event was dispatched based on a truth-test callback. * - * @param string $event + * @param string|\Closure $event * @param callable|int|null $callback * @return void * @static @@ -5181,7 +5352,7 @@ namespace Illuminate\Support\Facades { /** * Determine if an event was dispatched based on a truth-test callback. * - * @param string $event + * @param string|\Closure $event * @param callable|null $callback * @return void * @static @@ -5500,6 +5671,19 @@ namespace Illuminate\Support\Facades { return $instance->extension($path); } + /** + * Guess the file extension from the mime-type of a given file. + * + * @param string $path + * @return string|null + * @static + */ + public static function guessExtension($path) + { + /** @var \Illuminate\Filesystem\Filesystem $instance */ + return $instance->guessExtension($path); + } + /** * Get the file type of a given file. * @@ -6200,7 +6384,7 @@ namespace Illuminate\Support\Facades { /** * Get a driver instance. * - * @param string $driver + * @param string|null $driver * @return mixed * @throws \InvalidArgumentException * @static @@ -6808,339 +6992,87 @@ namespace Illuminate\Support\Facades { class Mail { /** - * Set the global from address and name. + * Get a mailer instance by name. * - * @param string $address * @param string|null $name - * @return void - * @static - */ - public static function alwaysFrom($address, $name = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->alwaysFrom($address, $name); - } - - /** - * Set the global reply-to address and name. - * - * @param string $address - * @param string|null $name - * @return void - * @static - */ - public static function alwaysReplyTo($address, $name = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->alwaysReplyTo($address, $name); - } - - /** - * Set the global to address and name. - * - * @param string $address - * @param string|null $name - * @return void - * @static - */ - public static function alwaysTo($address, $name = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->alwaysTo($address, $name); - } - - /** - * Begin the process of mailing a mailable class instance. - * - * @param mixed $users - * @return \Illuminate\Mail\PendingMail - * @static - */ - public static function to($users) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->to($users); - } - - /** - * Begin the process of mailing a mailable class instance. - * - * @param mixed $users - * @return \Illuminate\Mail\PendingMail - * @static - */ - public static function cc($users) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->cc($users); - } - - /** - * Begin the process of mailing a mailable class instance. - * - * @param mixed $users - * @return \Illuminate\Mail\PendingMail - * @static - */ - public static function bcc($users) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->bcc($users); - } - - /** - * Send a new message with only an HTML part. - * - * @param string $html - * @param mixed $callback - * @return void - * @static - */ - public static function html($html, $callback) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->html($html, $callback); - } - - /** - * Send a new message with only a raw text part. - * - * @param string $text - * @param mixed $callback - * @return void - * @static - */ - public static function raw($text, $callback) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->raw($text, $callback); - } - - /** - * Send a new message with only a plain part. - * - * @param string $view - * @param array $data - * @param mixed $callback - * @return void - * @static - */ - public static function plain($view, $data, $callback) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->plain($view, $data, $callback); - } - - /** - * Render the given message as a view. - * - * @param string|array $view - * @param array $data - * @return string - * @static - */ - public static function render($view, $data = []) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->render($view, $data); - } - - /** - * Send a new message using a view. - * - * @param \Illuminate\Contracts\Mail\Mailable|string|array $view - * @param array $data - * @param \Closure|string|null $callback - * @return void - * @static - */ - public static function send($view, $data = [], $callback = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->send($view, $data, $callback); - } - - /** - * Queue a new e-mail message for sending. - * - * @param \Illuminate\Contracts\Mail\Mailable $view - * @param string|null $queue - * @return mixed - * @throws \InvalidArgumentException - * @static - */ - public static function queue($view, $queue = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->queue($view, $queue); - } - - /** - * Queue a new e-mail message for sending on the given queue. - * - * @param string $queue - * @param \Illuminate\Contracts\Mail\Mailable $view - * @return mixed - * @static - */ - public static function onQueue($queue, $view) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->onQueue($queue, $view); - } - - /** - * Queue a new e-mail message for sending on the given queue. - * - * This method didn't match rest of framework's "onQueue" phrasing. Added "onQueue". - * - * @param string $queue - * @param \Illuminate\Contracts\Mail\Mailable $view - * @return mixed - * @static - */ - public static function queueOn($queue, $view) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->queueOn($queue, $view); - } - - /** - * Queue a new e-mail message for sending after (n) seconds. - * - * @param \DateTimeInterface|\DateInterval|int $delay - * @param \Illuminate\Contracts\Mail\Mailable $view - * @param string|null $queue - * @return mixed - * @throws \InvalidArgumentException - * @static - */ - public static function later($delay, $view, $queue = null) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->later($delay, $view, $queue); - } - - /** - * Queue a new e-mail message for sending after (n) seconds on the given queue. - * - * @param string $queue - * @param \DateTimeInterface|\DateInterval|int $delay - * @param \Illuminate\Contracts\Mail\Mailable $view - * @return mixed - * @static - */ - public static function laterOn($queue, $delay, $view) - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->laterOn($queue, $delay, $view); - } - - /** - * Get the array of failed recipients. - * - * @return array - * @static - */ - public static function failures() - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->failures(); - } - - /** - * Get the Swift Mailer instance. - * - * @return \Swift_Mailer - * @static - */ - public static function getSwiftMailer() - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->getSwiftMailer(); - } - - /** - * Get the view factory instance. - * - * @return \Illuminate\Contracts\View\Factory - * @static - */ - public static function getViewFactory() - { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->getViewFactory(); - } - - /** - * Set the Swift Mailer instance. - * - * @param \Swift_Mailer $swift - * @return void - * @static - */ - public static function setSwiftMailer($swift) - { - /** @var \Illuminate\Mail\Mailer $instance */ - $instance->setSwiftMailer($swift); - } - - /** - * Set the queue manager instance. - * - * @param \Illuminate\Contracts\Queue\Factory $queue * @return \Illuminate\Mail\Mailer * @static */ - public static function setQueue($queue) + public static function mailer($name = null) { - /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->setQueue($queue); + /** @var \Illuminate\Mail\MailManager $instance */ + return $instance->mailer($name); } /** - * Register a custom macro. + * Get a mailer driver instance. + * + * @param string|null $driver + * @return \Illuminate\Mail\Mailer + * @static + */ + public static function driver($driver = null) + { + /** @var \Illuminate\Mail\MailManager $instance */ + return $instance->driver($driver); + } + + /** + * Create a new transport instance. + * + * @param array $config + * @return \Swift_Transport + * @static + */ + public static function createTransport($config) + { + /** @var \Illuminate\Mail\MailManager $instance */ + return $instance->createTransport($config); + } + + /** + * Get the default mail driver name. + * + * @return string + * @static + */ + public static function getDefaultDriver() + { + /** @var \Illuminate\Mail\MailManager $instance */ + return $instance->getDefaultDriver(); + } + + /** + * Set the default mail driver name. * * @param string $name - * @param object|callable $macro * @return void * @static */ - public static function macro($name, $macro) + public static function setDefaultDriver($name) { - \Illuminate\Mail\Mailer::macro($name, $macro); + /** @var \Illuminate\Mail\MailManager $instance */ + $instance->setDefaultDriver($name); } /** - * Mix another object into the class. + * Register a custom transport creator Closure. * - * @param object $mixin - * @param bool $replace - * @return void - * @throws \ReflectionException + * @param string $driver + * @param \Closure $callback + * @return \Illuminate\Mail\MailManager * @static */ - public static function mixin($mixin, $replace = true) + public static function extend($driver, $callback) { - \Illuminate\Mail\Mailer::mixin($mixin, $replace); - } - - /** - * Checks if macro is registered. - * - * @param string $name - * @return bool - * @static - */ - public static function hasMacro($name) - { - return \Illuminate\Mail\Mailer::hasMacro($name); + /** @var \Illuminate\Mail\MailManager $instance */ + return $instance->extend($driver, $callback); } /** * Assert if a mailable was sent based on a truth-test callback. * - * @param string $mailable + * @param string|\Closure $mailable * @param callable|int|null $callback * @return void * @static @@ -7180,7 +7112,7 @@ namespace Illuminate\Support\Facades { /** * Assert if a mailable was queued based on a truth-test callback. * - * @param string $mailable + * @param string|\Closure $mailable * @param callable|int|null $callback * @return void * @static @@ -7270,6 +7202,102 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ return $instance->hasQueued($mailable); } + + /** + * Begin the process of mailing a mailable class instance. + * + * @param mixed $users + * @return \Illuminate\Mail\PendingMail + * @static + */ + public static function to($users) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + return $instance->to($users); + } + + /** + * Begin the process of mailing a mailable class instance. + * + * @param mixed $users + * @return \Illuminate\Mail\PendingMail + * @static + */ + public static function bcc($users) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + return $instance->bcc($users); + } + + /** + * Send a new message with only a raw text part. + * + * @param string $text + * @param \Closure|string $callback + * @return void + * @static + */ + public static function raw($text, $callback) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + $instance->raw($text, $callback); + } + + /** + * Send a new message using a view. + * + * @param string|array $view + * @param array $data + * @param \Closure|string|null $callback + * @return void + * @static + */ + public static function send($view, $data = [], $callback = null) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + $instance->send($view, $data, $callback); + } + + /** + * Queue a new e-mail message for sending. + * + * @param string|array $view + * @param string|null $queue + * @return mixed + * @static + */ + public static function queue($view, $queue = null) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + return $instance->queue($view, $queue); + } + + /** + * Queue a new e-mail message for sending after (n) seconds. + * + * @param \DateTimeInterface|\DateInterval|int $delay + * @param \Illuminate\Contracts\Mail\Mailable|string|array $view + * @param string|null $queue + * @return mixed + * @static + */ + public static function later($delay, $view, $queue = null) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + return $instance->later($delay, $view, $queue); + } + + /** + * Get the array of failed recipients. + * + * @return array + * @static + */ + public static function failures() + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + return $instance->failures(); + } } @@ -7375,7 +7403,7 @@ namespace Illuminate\Support\Facades { /** * Get a driver instance. * - * @param string $driver + * @param string|null $driver * @return mixed * @throws \InvalidArgumentException * @static @@ -7419,7 +7447,7 @@ namespace Illuminate\Support\Facades { * Assert if a notification was sent based on a truth-test callback. * * @param mixed $notifiable - * @param string $notification + * @param string|\Closure $notification * @param callable|null $callback * @return void * @throws \Exception @@ -7450,7 +7478,7 @@ namespace Illuminate\Support\Facades { * Determine if a notification was sent based on a truth-test callback. * * @param mixed $notifiable - * @param string $notification + * @param string|\Closure $notification * @param callable|null $callback * @return void * @throws \Exception @@ -7561,8 +7589,8 @@ namespace Illuminate\Support\Facades { /** * * - * @method static string sendResetLink(array $credentials) * @method static mixed reset(array $credentials, \Closure $callback) + * @method static string sendResetLink(array $credentials) * @see \Illuminate\Auth\Passwords\PasswordBroker */ class Password { @@ -7788,7 +7816,7 @@ namespace Illuminate\Support\Facades { /** * Assert if a job was pushed based on a truth-test callback. * - * @param string $job + * @param string|\Closure $job * @param callable|int|null $callback * @return void * @static @@ -7803,7 +7831,7 @@ namespace Illuminate\Support\Facades { * Assert if a job was pushed based on a truth-test callback. * * @param string $queue - * @param string $job + * @param string|\Closure $job * @param callable|null $callback * @return void * @static @@ -7846,7 +7874,7 @@ namespace Illuminate\Support\Facades { /** * Determine if a job was pushed based on a truth-test callback. * - * @param string $job + * @param string|\Closure $job * @param callable|null $callback * @return void * @static @@ -8264,6 +8292,40 @@ namespace Illuminate\Support\Facades { return $instance->route($route, $parameters, $status, $headers); } + /** + * Create a new redirect response to a signed named route. + * + * @param string $route + * @param mixed $parameters + * @param \DateTimeInterface|\DateInterval|int|null $expiration + * @param int $status + * @param array $headers + * @return \Illuminate\Http\RedirectResponse + * @static + */ + public static function signedRoute($route, $parameters = [], $expiration = null, $status = 302, $headers = []) + { + /** @var \Illuminate\Routing\Redirector $instance */ + return $instance->signedRoute($route, $parameters, $expiration, $status, $headers); + } + + /** + * Create a new redirect response to a signed named route. + * + * @param string $route + * @param \DateTimeInterface|\DateInterval|int|null $expiration + * @param mixed $parameters + * @param int $status + * @param array $headers + * @return \Illuminate\Http\RedirectResponse + * @static + */ + public static function temporarySignedRoute($route, $expiration, $parameters = [], $status = 302, $headers = []) + { + /** @var \Illuminate\Routing\Redirector $instance */ + return $instance->temporarySignedRoute($route, $expiration, $parameters, $status, $headers); + } + /** * Create a new redirect response to a controller action. * @@ -8349,8 +8411,6 @@ namespace Illuminate\Support\Facades { /** * * - * @see \Illuminate\Redis\RedisManager - * @see \Illuminate\Contracts\Redis\Factory */ class Redis { @@ -8595,10 +8655,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function is($patterns = null) + public static function is(...$patterns) { /** @var \Illuminate\Http\Request $instance */ - return $instance->is($patterns); + return $instance->is(...$patterns); } /** @@ -8608,10 +8668,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function routeIs($patterns = null) + public static function routeIs(...$patterns) { /** @var \Illuminate\Http\Request $instance */ - return $instance->routeIs($patterns); + return $instance->routeIs(...$patterns); } /** @@ -8621,10 +8681,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function fullUrlIs($patterns = null) + public static function fullUrlIs(...$patterns) { /** @var \Illuminate\Http\Request $instance */ - return $instance->fullUrlIs($patterns); + return $instance->fullUrlIs(...$patterns); } /** @@ -8702,7 +8762,7 @@ namespace Illuminate\Support\Facades { /** * Get the client user agent. * - * @return string + * @return string|null * @static */ public static function userAgent() @@ -9078,7 +9138,6 @@ namespace Illuminate\Support\Facades { * to keep BC with an existing system. It should not be used for any * other purpose. * - * @param callable|null $callable A PHP callable * @static */ public static function setFactory($callable) @@ -9174,7 +9233,6 @@ namespace Illuminate\Support\Facades { * It builds a normalized query string, where keys/value pairs are alphabetized, * have consistent escaping and unneeded delimiters are removed. * - * @param string $qs Query string * @return string A normalized query string for the Request * @static */ @@ -9546,7 +9604,6 @@ namespace Illuminate\Support\Facades { * - "/a/b/c/other" -> "other" * - "/a/x/y" -> "../../x/y" * - * @param string $path The target path * @return string The relative target path * @static */ @@ -9613,7 +9670,6 @@ namespace Illuminate\Support\Facades { /** * Sets the request method. * - * @param string $method * @static */ public static function setMethod($method) @@ -9662,7 +9718,6 @@ namespace Illuminate\Support\Facades { /** * Gets the mime type associated with the format. * - * @param string $format The format * @return string|null The associated mime type (null if not found) * @static */ @@ -9676,7 +9731,6 @@ namespace Illuminate\Support\Facades { /** * Gets the mime types associated with the format. * - * @param string $format The format * @return array The associated mime types * @static */ @@ -9689,7 +9743,6 @@ namespace Illuminate\Support\Facades { /** * Gets the format associated with the mime type. * - * @param string $mimeType The associated mime type * @return string|null The format (null if not found) * @static */ @@ -9703,7 +9756,6 @@ namespace Illuminate\Support\Facades { /** * Associates a format with mime types. * - * @param string $format The format * @param string|array $mimeTypes The associated mime types (the preferred one must be the first as it will be used as the content type) * @static */ @@ -9724,7 +9776,6 @@ namespace Illuminate\Support\Facades { * * $default * * @see getPreferredFormat - * @param string|null $default The default format * @return string|null The request format * @static */ @@ -9738,7 +9789,6 @@ namespace Illuminate\Support\Facades { /** * Sets the request format. * - * @param string $format The request format * @static */ public static function setRequestFormat($format) @@ -9764,7 +9814,6 @@ namespace Illuminate\Support\Facades { /** * Sets the default locale. * - * @param string $locale * @static */ public static function setDefaultLocale($locale) @@ -9790,7 +9839,6 @@ namespace Illuminate\Support\Facades { /** * Sets the locale. * - * @param string $locale * @static */ public static function setLocale($locale) @@ -9930,9 +9978,11 @@ namespace Illuminate\Support\Facades { /** * Gets the preferred format for the response by inspecting, in the following order: - * * the request format set using setRequestFormat - * * the values of the Accept HTTP header - * * the content type of the body of the request. + * * the request format set using setRequestFormat; + * * the values of the Accept HTTP header. + * + * Note that if you use this method, you should send the "Vary: Accept" header + * in the response to prevent any issues with intermediary HTTP caches. * * @static */ @@ -10026,6 +10076,19 @@ namespace Illuminate\Support\Facades { return $instance->isXmlHttpRequest(); } + /** + * Checks whether the client browser prefers safe content or not according to RFC8674. + * + * @see https://tools.ietf.org/html/rfc8674 + * @static + */ + public static function preferSafeContent() + { + //Method inherited from \Symfony\Component\HttpFoundation\Request + /** @var \Illuminate\Http\Request $instance */ + return $instance->preferSafeContent(); + } + /** * Indicates whether this request originated from a trusted proxy. * @@ -10580,9 +10643,9 @@ namespace Illuminate\Support\Facades { * * @static */ - public static function validate($rules, $params = null) + public static function validate($rules, ...$params) { - return \Illuminate\Http\Request::validate($rules, $params); + return \Illuminate\Http\Request::validate($rules, ...$params); } /** @@ -10590,9 +10653,9 @@ namespace Illuminate\Support\Facades { * * @static */ - public static function validateWithBag($errorBag, $rules, $params = null) + public static function validateWithBag($errorBag, $rules, ...$params) { - return \Illuminate\Http\Request::validateWithBag($errorBag, $rules, $params); + return \Illuminate\Http\Request::validateWithBag($errorBag, $rules, ...$params); } /** @@ -10783,7 +10846,7 @@ namespace Illuminate\Support\Facades { * Create a new redirect response to a named route. * * @param string $route - * @param array $parameters + * @param mixed $parameters * @param int $status * @param array $headers * @return \Illuminate\Http\RedirectResponse @@ -10799,7 +10862,7 @@ namespace Illuminate\Support\Facades { * Create a new redirect response to a controller action. * * @param string $action - * @param array $parameters + * @param mixed $parameters * @param int $status * @param array $headers * @return \Illuminate\Http\RedirectResponse @@ -10887,13 +10950,13 @@ namespace Illuminate\Support\Facades { /** * * - * @method static \Illuminate\Routing\RouteRegistrar prefix(string $prefix) - * @method static \Illuminate\Routing\RouteRegistrar where(array $where) - * @method static \Illuminate\Routing\RouteRegistrar middleware(array|string|null $middleware) * @method static \Illuminate\Routing\RouteRegistrar as(string $value) * @method static \Illuminate\Routing\RouteRegistrar domain(string $value) + * @method static \Illuminate\Routing\RouteRegistrar middleware(array|string|null $middleware) * @method static \Illuminate\Routing\RouteRegistrar name(string $value) * @method static \Illuminate\Routing\RouteRegistrar namespace(string $value) + * @method static \Illuminate\Routing\RouteRegistrar prefix(string $prefix) + * @method static \Illuminate\Routing\RouteRegistrar where(array $where) * @see \Illuminate\Routing\Router */ class Route { @@ -10902,7 +10965,7 @@ namespace Illuminate\Support\Facades { * Register a new GET route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10916,7 +10979,7 @@ namespace Illuminate\Support\Facades { * Register a new POST route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10930,7 +10993,7 @@ namespace Illuminate\Support\Facades { * Register a new PUT route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10944,7 +11007,7 @@ namespace Illuminate\Support\Facades { * Register a new PATCH route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10958,7 +11021,7 @@ namespace Illuminate\Support\Facades { * Register a new DELETE route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10972,7 +11035,7 @@ namespace Illuminate\Support\Facades { * Register a new OPTIONS route with the router. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10986,7 +11049,7 @@ namespace Illuminate\Support\Facades { * Register a new route responding to all verbs. * * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10999,7 +11062,7 @@ namespace Illuminate\Support\Facades { /** * Register a new Fallback route with the router. * - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -11058,7 +11121,7 @@ namespace Illuminate\Support\Facades { * * @param array|string $methods * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -11144,13 +11207,14 @@ namespace Illuminate\Support\Facades { * Merge the given array with the last group stack. * * @param array $new + * @param bool $prependExistingPrefix * @return array * @static */ - public static function mergeWithLastGroup($new) + public static function mergeWithLastGroup($new, $prependExistingPrefix = true) { /** @var \Illuminate\Routing\Router $instance */ - return $instance->mergeWithLastGroup($new); + return $instance->mergeWithLastGroup($new, $prependExistingPrefix); } /** @@ -11170,7 +11234,7 @@ namespace Illuminate\Support\Facades { * * @param array|string $methods * @param string $uri - * @param \Closure|array|string|callable|null $action + * @param array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -11180,6 +11244,21 @@ namespace Illuminate\Support\Facades { return $instance->addRoute($methods, $uri, $action); } + /** + * Create a new Route object. + * + * @param array|string $methods + * @param string $uri + * @param mixed $action + * @return \Illuminate\Routing\Route + * @static + */ + public static function newRoute($methods, $uri, $action) + { + /** @var \Illuminate\Routing\Router $instance */ + return $instance->newRoute($methods, $uri, $action); + } + /** * Return the response returned by the given route. * @@ -11584,10 +11663,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function is($patterns = null) + public static function is(...$patterns) { /** @var \Illuminate\Routing\Router $instance */ - return $instance->is($patterns); + return $instance->is(...$patterns); } /** @@ -11597,10 +11676,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function currentRouteNamed($patterns = null) + public static function currentRouteNamed(...$patterns) { /** @var \Illuminate\Routing\Router $instance */ - return $instance->currentRouteNamed($patterns); + return $instance->currentRouteNamed(...$patterns); } /** @@ -11622,10 +11701,10 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function uses($patterns = null) + public static function uses(...$patterns) { /** @var \Illuminate\Routing\Router $instance */ - return $instance->uses($patterns); + return $instance->uses(...$patterns); } /** @@ -11641,55 +11720,6 @@ namespace Illuminate\Support\Facades { return $instance->currentRouteUses($action); } - /** - * Register the typical authentication routes for an application. - * - * @param array $options - * @return void - * @static - */ - public static function auth($options = []) - { - /** @var \Illuminate\Routing\Router $instance */ - $instance->auth($options); - } - - /** - * Register the typical reset password routes for an application. - * - * @return void - * @static - */ - public static function resetPassword() - { - /** @var \Illuminate\Routing\Router $instance */ - $instance->resetPassword(); - } - - /** - * Register the typical confirm password routes for an application. - * - * @return void - * @static - */ - public static function confirmPassword() - { - /** @var \Illuminate\Routing\Router $instance */ - $instance->confirmPassword(); - } - - /** - * Register the typical email verification routes for an application. - * - * @return void - * @static - */ - public static function emailVerification() - { - /** @var \Illuminate\Routing\Router $instance */ - $instance->emailVerification(); - } - /** * Set the unmapped global resource parameters to singular. * @@ -11732,7 +11762,7 @@ namespace Illuminate\Support\Facades { /** * Get the underlying route collection. * - * @return \Illuminate\Routing\RouteCollection + * @return \Illuminate\Routing\RouteCollectionInterface * @static */ public static function getRoutes() @@ -11754,6 +11784,19 @@ namespace Illuminate\Support\Facades { $instance->setRoutes($routes); } + /** + * Set the compiled route collection instance. + * + * @param array $routes + * @return void + * @static + */ + public static function setCompiledRoutes($routes) + { + /** @var \Illuminate\Routing\Router $instance */ + $instance->setCompiledRoutes($routes); + } + /** * Register a custom macro. * @@ -11817,6 +11860,20 @@ namespace Illuminate\Support\Facades { */ class Schema { + /** + * Create a new command set with a Closure. + * + * @param string $table + * @param \Closure $callback + * @return \MStaack\LaravelPostgis\Schema\Blueprint + * @static + */ + public static function createBlueprint($table, $callback = null) + { + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ + return $instance->createBlueprint($table, $callback); + } + /** * Enable foreign key constraints. * @@ -11825,7 +11882,7 @@ namespace Illuminate\Support\Facades { */ public static function enablePostgis() { - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->enablePostgis(); } @@ -11837,7 +11894,7 @@ namespace Illuminate\Support\Facades { */ public static function disablePostgis() { - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->disablePostgis(); } @@ -11851,7 +11908,7 @@ namespace Illuminate\Support\Facades { public static function hasTable($table) { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->hasTable($table); } @@ -11864,7 +11921,7 @@ namespace Illuminate\Support\Facades { public static function dropAllTables() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->dropAllTables(); } @@ -11877,7 +11934,7 @@ namespace Illuminate\Support\Facades { public static function dropAllViews() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->dropAllViews(); } @@ -11890,7 +11947,7 @@ namespace Illuminate\Support\Facades { public static function dropAllTypes() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->dropAllTypes(); } @@ -11903,7 +11960,7 @@ namespace Illuminate\Support\Facades { public static function getAllTables() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getAllTables(); } @@ -11916,7 +11973,7 @@ namespace Illuminate\Support\Facades { public static function getAllViews() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getAllViews(); } @@ -11929,7 +11986,7 @@ namespace Illuminate\Support\Facades { public static function getAllTypes() { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getAllTypes(); } @@ -11943,7 +12000,7 @@ namespace Illuminate\Support\Facades { public static function getColumnListing($table) { //Method inherited from \Illuminate\Database\Schema\PostgresBuilder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getColumnListing($table); } @@ -11957,7 +12014,7 @@ namespace Illuminate\Support\Facades { public static function defaultStringLength($length) { //Method inherited from \Illuminate\Database\Schema\Builder - \Phaza\LaravelPostgis\Schema\Builder::defaultStringLength($length); + \MStaack\LaravelPostgis\Schema\Builder::defaultStringLength($length); } /** @@ -11971,7 +12028,7 @@ namespace Illuminate\Support\Facades { public static function hasColumn($table, $column) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->hasColumn($table, $column); } @@ -11986,7 +12043,7 @@ namespace Illuminate\Support\Facades { public static function hasColumns($table, $columns) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->hasColumns($table, $columns); } @@ -12001,7 +12058,7 @@ namespace Illuminate\Support\Facades { public static function getColumnType($table, $column) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getColumnType($table, $column); } @@ -12016,7 +12073,7 @@ namespace Illuminate\Support\Facades { public static function table($table, $callback) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->table($table, $callback); } @@ -12031,7 +12088,7 @@ namespace Illuminate\Support\Facades { public static function create($table, $callback) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->create($table, $callback); } @@ -12045,7 +12102,7 @@ namespace Illuminate\Support\Facades { public static function drop($table) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->drop($table); } @@ -12059,7 +12116,7 @@ namespace Illuminate\Support\Facades { public static function dropIfExists($table) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->dropIfExists($table); } @@ -12074,7 +12131,7 @@ namespace Illuminate\Support\Facades { public static function rename($from, $to) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->rename($from, $to); } @@ -12087,7 +12144,7 @@ namespace Illuminate\Support\Facades { public static function enableForeignKeyConstraints() { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->enableForeignKeyConstraints(); } @@ -12100,7 +12157,7 @@ namespace Illuminate\Support\Facades { public static function disableForeignKeyConstraints() { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->disableForeignKeyConstraints(); } @@ -12118,7 +12175,7 @@ namespace Illuminate\Support\Facades { public static function registerCustomDoctrineType($class, $name, $type) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->registerCustomDoctrineType($class, $name, $type); } @@ -12131,7 +12188,7 @@ namespace Illuminate\Support\Facades { public static function getConnection() { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->getConnection(); } @@ -12139,13 +12196,13 @@ namespace Illuminate\Support\Facades { * Set the database connection instance. * * @param \Illuminate\Database\Connection $connection - * @return \Phaza\LaravelPostgis\Schema\Builder + * @return \MStaack\LaravelPostgis\Schema\Builder * @static */ public static function setConnection($connection) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ return $instance->setConnection($connection); } @@ -12159,7 +12216,7 @@ namespace Illuminate\Support\Facades { public static function blueprintResolver($resolver) { //Method inherited from \Illuminate\Database\Schema\Builder - /** @var \Phaza\LaravelPostgis\Schema\Builder $instance */ + /** @var \MStaack\LaravelPostgis\Schema\Builder $instance */ $instance->blueprintResolver($resolver); } @@ -12173,6 +12230,30 @@ namespace Illuminate\Support\Facades { */ class Session { + /** + * Determine if requests for the same session should wait for each to finish before executing. + * + * @return bool + * @static + */ + public static function shouldBlock() + { + /** @var \Illuminate\Session\SessionManager $instance */ + return $instance->shouldBlock(); + } + + /** + * Get the name of the cache store / driver that should be used to acquire session locks. + * + * @return string|null + * @static + */ + public static function blockDriver() + { + /** @var \Illuminate\Session\SessionManager $instance */ + return $instance->blockDriver(); + } + /** * Get the session configuration. * @@ -12213,7 +12294,7 @@ namespace Illuminate\Support\Facades { /** * Get a driver instance. * - * @param string $driver + * @param string|null $driver * @return mixed * @throws \InvalidArgumentException * @static @@ -13150,7 +13231,8 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function prepend($path, $data, $separator = '') + public static function prepend($path, $data, $separator = ' +') { /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ return $instance->prepend($path, $data, $separator); @@ -13165,7 +13247,8 @@ namespace Illuminate\Support\Facades { * @return bool * @static */ - public static function append($path, $data, $separator = '') + public static function append($path, $data, $separator = ' +') { /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ return $instance->append($path, $data, $separator); @@ -13856,7 +13939,7 @@ namespace Illuminate\Support\Facades { /** * Set the route collection. * - * @param \Illuminate\Routing\RouteCollection $routes + * @param \Illuminate\Routing\RouteCollectionInterface $routes * @return \Illuminate\Routing\UrlGenerator * @static */ @@ -14532,15 +14615,15 @@ namespace Illuminate\Support\Facades { /** * Start a component rendering process. * - * @param string $name + * @param \Illuminate\View\View|\Closure|string $view * @param array $data * @return void * @static */ - public static function startComponent($name, $data = []) + public static function startComponent($view, $data = []) { /** @var \Illuminate\View\Factory $instance */ - $instance->startComponent($name, $data); + $instance->startComponent($view, $data); } /** @@ -16103,7 +16186,7 @@ namespace { * @param \Closure|array|string $column * @param mixed $operator * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder|static + * @return \Illuminate\Database\Eloquent\Builder * @static */ public static function orWhere($column, $operator = null, $value = null) @@ -16230,7 +16313,7 @@ namespace { * @return \Illuminate\Database\Eloquent\Model|static * @static */ - public static function firstOrNew($attributes, $values = []) + public static function firstOrNew($attributes = [], $values = []) { /** @var \Illuminate\Database\Eloquent\Builder $instance */ return $instance->firstOrNew($attributes, $values); @@ -16493,6 +16576,19 @@ namespace { return $instance->newModelInstance($attributes); } + /** + * Apply query-time casts to the model instance. + * + * @param array $casts + * @return \Illuminate\Database\Eloquent\Builder + * @static + */ + public static function withCasts($casts) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->withCasts($casts); + } + /** * Get the underlying query builder instance. * @@ -16722,7 +16818,7 @@ namespace { * Pass the query to a given callback. * * @param callable $callback - * @return \Illuminate\Database\Query\Builder + * @return \Illuminate\Database\Eloquent\Builder * @static */ public static function tap($callback) @@ -16827,7 +16923,7 @@ namespace { * Add a relationship count / exists condition to the query with where clauses and an "or". * * @param string $relation - * @param \Closure $callback + * @param \Closure|null $callback * @param string $operator * @param int $count * @return \Illuminate\Database\Eloquent\Builder|static @@ -16857,7 +16953,7 @@ namespace { * Add a relationship count / exists condition to the query with where clauses and an "or". * * @param string $relation - * @param \Closure $callback + * @param \Closure|null $callback * @return \Illuminate\Database\Eloquent\Builder|static * @static */ @@ -16953,7 +17049,7 @@ namespace { * * @param string $relation * @param string|array $types - * @param \Closure $callback + * @param \Closure|null $callback * @param string $operator * @param int $count * @return \Illuminate\Database\Eloquent\Builder|static @@ -16985,7 +17081,7 @@ namespace { * * @param string $relation * @param string|array $types - * @param \Closure $callback + * @param \Closure|null $callback * @return \Illuminate\Database\Eloquent\Builder|static * @static */ @@ -17037,9 +17133,9 @@ namespace { /** * Add a subselect expression to the query. * - * @param \Closure|\Illuminate\Database\Query\Builder|string $query + * @param \Closure|$this|string $query * @param string $as - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @throws \InvalidArgumentException * @static */ @@ -17054,7 +17150,7 @@ namespace { * * @param string $expression * @param array $bindings - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function selectRaw($expression, $bindings = []) @@ -17068,7 +17164,7 @@ namespace { * * @param \Closure|\Illuminate\Database\Query\Builder|string $query * @param string $as - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @throws \InvalidArgumentException * @static */ @@ -17083,7 +17179,7 @@ namespace { * * @param string $expression * @param mixed $bindings - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function fromRaw($expression, $bindings = []) @@ -17157,7 +17253,7 @@ namespace { * @param string $operator * @param string $second * @param string $type - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function joinWhere($table, $first, $operator, $second, $type = 'inner') @@ -17176,7 +17272,7 @@ namespace { * @param string|null $second * @param string $type * @param bool $where - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @throws \InvalidArgumentException * @static */ @@ -17193,7 +17289,7 @@ namespace { * @param \Closure|string $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function leftJoin($table, $first, $operator = null, $second = null) @@ -17209,7 +17305,7 @@ namespace { * @param \Closure|string $first * @param string $operator * @param string $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function leftJoinWhere($table, $first, $operator, $second) @@ -17226,7 +17322,7 @@ namespace { * @param \Closure|string $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function leftJoinSub($query, $as, $first, $operator = null, $second = null) @@ -17242,7 +17338,7 @@ namespace { * @param \Closure|string $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function rightJoin($table, $first, $operator = null, $second = null) @@ -17258,7 +17354,7 @@ namespace { * @param \Closure|string $first * @param string $operator * @param string $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function rightJoinWhere($table, $first, $operator, $second) @@ -17275,7 +17371,7 @@ namespace { * @param \Closure|string $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function rightJoinSub($query, $as, $first, $operator = null, $second = null) @@ -17291,7 +17387,7 @@ namespace { * @param \Closure|string|null $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function crossJoin($table, $first = null, $operator = null, $second = null) @@ -17337,7 +17433,7 @@ namespace { * @param string|null $operator * @param string|null $second * @param string|null $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereColumn($first, $operator = null, $second = null, $boolean = 'and') @@ -17352,7 +17448,7 @@ namespace { * @param string|array $first * @param string|null $operator * @param string|null $second - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereColumn($first, $operator = null, $second = null) @@ -17381,7 +17477,7 @@ namespace { * * @param string $sql * @param mixed $bindings - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereRaw($sql, $bindings = []) @@ -17411,7 +17507,7 @@ namespace { * * @param string $column * @param mixed $values - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereIn($column, $values) @@ -17426,7 +17522,7 @@ namespace { * @param string $column * @param mixed $values * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereNotIn($column, $values, $boolean = 'and') @@ -17440,7 +17536,7 @@ namespace { * * @param string $column * @param mixed $values - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereNotIn($column, $values) @@ -17465,6 +17561,20 @@ namespace { return $instance->whereIntegerInRaw($column, $values, $boolean, $not); } + /** + * Add an "or where in raw" clause for integer values to the query. + * + * @param string $column + * @param \Illuminate\Contracts\Support\Arrayable|array $values + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function orWhereIntegerInRaw($column, $values) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->orWhereIntegerInRaw($column, $values); + } + /** * Add a "where not in raw" clause for integer values to the query. * @@ -17480,6 +17590,20 @@ namespace { return $instance->whereIntegerNotInRaw($column, $values, $boolean); } + /** + * Add an "or where not in raw" clause for integer values to the query. + * + * @param string $column + * @param \Illuminate\Contracts\Support\Arrayable|array $values + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function orWhereIntegerNotInRaw($column, $values) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->orWhereIntegerNotInRaw($column, $values); + } + /** * Add a "where null" clause to the query. * @@ -17499,7 +17623,7 @@ namespace { * Add an "or where null" clause to the query. * * @param string $column - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereNull($column) @@ -17513,7 +17637,7 @@ namespace { * * @param string|array $columns * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereNotNull($columns, $boolean = 'and') @@ -17543,7 +17667,7 @@ namespace { * * @param string $column * @param array $values - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereBetween($column, $values) @@ -17558,7 +17682,7 @@ namespace { * @param string $column * @param array $values * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereNotBetween($column, $values, $boolean = 'and') @@ -17572,7 +17696,7 @@ namespace { * * @param string $column * @param array $values - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereNotBetween($column, $values) @@ -17585,7 +17709,7 @@ namespace { * Add an "or where not null" clause to the query. * * @param string $column - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereNotNull($column) @@ -17601,7 +17725,7 @@ namespace { * @param string $operator * @param \DateTimeInterface|string|null $value * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereDate($column, $operator, $value = null, $boolean = 'and') @@ -17616,7 +17740,7 @@ namespace { * @param string $column * @param string $operator * @param \DateTimeInterface|string|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereDate($column, $operator, $value = null) @@ -17632,7 +17756,7 @@ namespace { * @param string $operator * @param \DateTimeInterface|string|null $value * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereTime($column, $operator, $value = null, $boolean = 'and') @@ -17647,7 +17771,7 @@ namespace { * @param string $column * @param string $operator * @param \DateTimeInterface|string|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereTime($column, $operator, $value = null) @@ -17663,7 +17787,7 @@ namespace { * @param string $operator * @param \DateTimeInterface|string|null $value * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereDay($column, $operator, $value = null, $boolean = 'and') @@ -17678,7 +17802,7 @@ namespace { * @param string $column * @param string $operator * @param \DateTimeInterface|string|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereDay($column, $operator, $value = null) @@ -17694,7 +17818,7 @@ namespace { * @param string $operator * @param \DateTimeInterface|string|null $value * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereMonth($column, $operator, $value = null, $boolean = 'and') @@ -17709,7 +17833,7 @@ namespace { * @param string $column * @param string $operator * @param \DateTimeInterface|string|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereMonth($column, $operator, $value = null) @@ -17725,7 +17849,7 @@ namespace { * @param string $operator * @param \DateTimeInterface|string|int|null $value * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereYear($column, $operator, $value = null, $boolean = 'and') @@ -17740,7 +17864,7 @@ namespace { * @param string $column * @param string $operator * @param \DateTimeInterface|string|int|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereYear($column, $operator, $value = null) @@ -17754,7 +17878,7 @@ namespace { * * @param \Closure $callback * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereNested($callback, $boolean = 'and') @@ -17778,7 +17902,7 @@ namespace { /** * Add another query builder as a nested where to the query builder. * - * @param \Illuminate\Database\Query\Builder|static $query + * @param $this $query * @param string $boolean * @return \Illuminate\Database\Query\Builder * @static @@ -17809,7 +17933,7 @@ namespace { * * @param \Closure $callback * @param bool $not - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereExists($callback, $not = false) @@ -17823,7 +17947,7 @@ namespace { * * @param \Closure $callback * @param string $boolean - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function whereNotExists($callback, $boolean = 'and') @@ -17836,7 +17960,7 @@ namespace { * Add a where not exists clause to the query. * * @param \Closure $callback - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orWhereNotExists($callback) @@ -18003,10 +18127,10 @@ namespace { * @return \Illuminate\Database\Query\Builder * @static */ - public static function groupBy($groups = null) + public static function groupBy(...$groups) { /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->groupBy($groups); + return $instance->groupBy(...$groups); } /** @@ -18045,7 +18169,7 @@ namespace { * @param string $column * @param string|null $operator * @param string|null $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orHaving($column, $operator = null, $value = null) @@ -18061,7 +18185,7 @@ namespace { * @param array $values * @param string $boolean * @param bool $not - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function havingBetween($column, $values, $boolean = 'and', $not = false) @@ -18090,7 +18214,7 @@ namespace { * * @param string $sql * @param array $bindings - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function orHavingRaw($sql, $bindings = []) @@ -18102,7 +18226,7 @@ namespace { /** * Add an "order by" clause to the query. * - * @param \Closure|\Illuminate\Database\Query\Builder|string $column + * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string $column * @param string $direction * @return \Illuminate\Database\Query\Builder * @throws \InvalidArgumentException @@ -18158,7 +18282,7 @@ namespace { * Alias to set the "offset" value of the query. * * @param int $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function skip($value) @@ -18184,7 +18308,7 @@ namespace { * Alias to set the "limit" value of the query. * * @param int $value - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function take($value) @@ -18211,7 +18335,7 @@ namespace { * * @param int $page * @param int $perPage - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function forPage($page, $perPage = 15) @@ -18226,7 +18350,7 @@ namespace { * @param int $perPage * @param int|null $lastId * @param string $column - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function forPageBeforeId($perPage = 15, $lastId = 0, $column = 'id') @@ -18241,7 +18365,7 @@ namespace { * @param int $perPage * @param int|null $lastId * @param string $column - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function forPageAfterId($perPage = 15, $lastId = 0, $column = 'id') @@ -18250,12 +18374,24 @@ namespace { return $instance->forPageAfterId($perPage, $lastId, $column); } + /** + * Remove all existing orders and optionally add a new order. + * + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function reorder($column = null, $direction = 'asc') + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->reorder($column, $direction); + } + /** * Add a union statement to the query. * * @param \Illuminate\Database\Query\Builder|\Closure $query * @param bool $all - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function union($query, $all = false) @@ -18268,7 +18404,7 @@ namespace { * Add a union all statement to the query. * * @param \Illuminate\Database\Query\Builder|\Closure $query - * @return \Illuminate\Database\Query\Builder|static + * @return \Illuminate\Database\Query\Builder * @static */ public static function unionAll($query) diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php index 5db5b9d2..3156ddb4 100644 --- a/app/Http/Controllers/Admin/PlacesController.php +++ b/app/Http/Controllers/Admin/PlacesController.php @@ -10,7 +10,7 @@ use App\Services\PlaceService; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\View\View; -use Phaza\LaravelPostgis\Geometries\Point; +use MStaack\LaravelPostgis\Geometries\Point; class PlacesController extends Controller { diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index 1a3620c2..43209c67 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -17,7 +17,7 @@ use Intervention\Image\Exception\NotReadableException; use Intervention\Image\ImageManager; use Monolog\Handler\StreamHandler; use Monolog\Logger; -use Phaza\LaravelPostgis\Geometries\Point; +use MStaack\LaravelPostgis\Geometries\Point; use Ramsey\Uuid\Uuid; class MicropubController extends Controller diff --git a/app/Models/Place.php b/app/Models/Place.php index 55adf7de..e6e278bf 100644 --- a/app/Models/Place.php +++ b/app/Models/Place.php @@ -36,10 +36,10 @@ use MStaack\LaravelPostgis\Geometries\Point; * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Note[] $notes * @property-read int|null $notes_count * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place findSimilarSlugs($attribute, $config, $slug) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place near(\Phaza\LaravelPostgis\Geometries\Point $point, $distance = 1000) - * @method static \Phaza\LaravelPostgis\Eloquent\Builder|\App\Models\Place newModelQuery() - * @method static \Phaza\LaravelPostgis\Eloquent\Builder|\App\Models\Place newQuery() - * @method static \Phaza\LaravelPostgis\Eloquent\Builder|\App\Models\Place query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place near(\MStaack\LaravelPostgis\Geometries\Point $point, $distance = 1000) + * @method static \MStaack\LaravelPostgis\Eloquent\Builder|\App\Models\Place newModelQuery() + * @method static \MStaack\LaravelPostgis\Eloquent\Builder|\App\Models\Place newQuery() + * @method static \MStaack\LaravelPostgis\Eloquent\Builder|\App\Models\Place query() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Place whereExternalURL($url) diff --git a/app/Services/PlaceService.php b/app/Services/PlaceService.php index 44436735..e16b7da9 100644 --- a/app/Services/PlaceService.php +++ b/app/Services/PlaceService.php @@ -6,7 +6,7 @@ namespace App\Services; use App\Models\Place; use Illuminate\Support\Arr; -use Phaza\LaravelPostgis\Geometries\Point; +use MStaack\LaravelPostgis\Geometries\Point; class PlaceService { diff --git a/tests/Feature/Admin/ArticlesTest.php b/tests/Feature/Admin/ArticlesTest.php index c483aa23..7a952212 100644 --- a/tests/Feature/Admin/ArticlesTest.php +++ b/tests/Feature/Admin/ArticlesTest.php @@ -51,7 +51,7 @@ class ArticlesTest extends TestCase fclose($fh); } $path = sys_get_temp_dir() . '/article.md'; - $file = new UploadedFile($path, 'article.md', 'text/plain', filesize($path), null, true); + $file = new UploadedFile($path, 'article.md', 'text/plain', null, true); $this->actingAs($user) ->post('/admin/blog', [ diff --git a/tests/Feature/Admin/ContactsTest.php b/tests/Feature/Admin/ContactsTest.php index 87d64ae6..9a5759f9 100644 --- a/tests/Feature/Admin/ContactsTest.php +++ b/tests/Feature/Admin/ContactsTest.php @@ -86,7 +86,7 @@ class ContactsTest extends TestCase { copy(__DIR__ . '/../../aaron.png', sys_get_temp_dir() . '/tantek.png'); $path = sys_get_temp_dir() . '/tantek.png'; - $file = new UploadedFile($path, 'tantek.png', 'image/png', filesize($path), null, true); + $file = new UploadedFile($path, 'tantek.png', 'image/png', null, true); $user = factory(User::class)->create(); $this->actingAs($user)->post('/admin/contacts/1', [ diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index 0206da24..788c5add 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -12,7 +12,7 @@ use Illuminate\Http\UploadedFile; use App\Jobs\SyndicateNoteToTwitter; use Illuminate\Support\Facades\Queue; use Illuminate\Support\Facades\Storage; -use Phaza\LaravelPostgis\Geometries\Point; +use MStaack\LaravelPostgis\Geometries\Point; use Illuminate\Foundation\Testing\DatabaseTransactions; class MicropubControllerTest extends TestCase @@ -697,14 +697,7 @@ class MicropubControllerTest extends TestCase $response = $this->post( '/api/media', [ - 'file' => new UploadedFile( - $file, - 'aaron.png', - 'image/png', - filesize(__DIR__ . '/../aaron.png'), - null, - true - ), + 'file' => new UploadedFile($file, 'aaron.png', 'image/png', null, true), ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); @@ -726,7 +719,7 @@ class MicropubControllerTest extends TestCase $response = $this->post( '/api/media', [ - 'file' => new UploadedFile($file, 'audio.mp3', 'audio/mpeg', filesize($file), null, true), + 'file' => new UploadedFile($file, 'audio.mp3', 'audio/mpeg', null, true), ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); @@ -748,7 +741,7 @@ class MicropubControllerTest extends TestCase $response = $this->post( '/api/media', [ - 'file' => new UploadedFile($file, 'video.ogv', 'video/ogg', filesize($file), null, true), + 'file' => new UploadedFile($file, 'video.ogv', 'video/ogg', null, true), ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); @@ -790,7 +783,13 @@ class MicropubControllerTest extends TestCase $response = $this->post( '/api/media', [ - 'file' => new UploadedFile(__DIR__ . '/../aaron.png', 'aaron.png', 'image/png', UPLOAD_ERR_INI_SIZE, true), + 'file' => new UploadedFile( + __DIR__ . '/../aaron.png', + 'aaron.png', + 'image/png', + UPLOAD_ERR_INI_SIZE, + true + ), ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); diff --git a/tests/Unit/PlacesTest.php b/tests/Unit/PlacesTest.php index b989f9af..16b27b68 100644 --- a/tests/Unit/PlacesTest.php +++ b/tests/Unit/PlacesTest.php @@ -5,7 +5,7 @@ namespace Tests\Unit; use Tests\TestCase; use App\Models\Place; use App\Services\PlaceService; -use Phaza\LaravelPostgis\Geometries\Point; +use MStaack\LaravelPostgis\Geometries\Point; use Illuminate\Database\Eloquent\Collection; use Illuminate\Foundation\Testing\DatabaseTransactions;