Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 12:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge v5-develop

Browse Source
This commit is contained in:
David Bomba 2023-02-21 10:59:11 +11:00
parent 19fdd9e96e
commit e3949c0479
3 changed files with 235 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
_ide_helper.php
View File

@ -4193,7 +4193,7 @@
*/
public static function lock($name, $seconds = 0, $owner = null)
{
/** @var \Illuminate\Cache\RedisStore $instance */
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->lock($name, $seconds, $owner);
}
/**
@ -4206,7 +4206,7 @@
*/
public static function restoreLock($name, $owner)
{
/** @var \Illuminate\Cache\RedisStore $instance */
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->restoreLock($name, $owner);
}
/**
@ -4217,65 +4217,30 @@
*/
public static function flush()
{
/** @var \Illuminate\Cache\RedisStore $instance */
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->flush();
}
/**
* Get the Redis connection instance.
* Get the Filesystem instance.
*
* @return \Illuminate\Redis\Connections\Connection
* @return \Illuminate\Filesystem\Filesystem
* @static
*/
public static function connection()
public static function getFilesystem()
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->connection();
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->getFilesystem();
}
/**
* Get the Redis connection instance that should be used to manage locks.
* Get the working directory of the cache.
*
* @return \Illuminate\Redis\Connections\Connection
* @return string
* @static
*/
public static function lockConnection()
public static function getDirectory()
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->lockConnection();
}
/**
* Specify the name of the connection that should be used to store data.
*
* @param string $connection
* @return void
* @static
*/
public static function setConnection($connection)
{
/** @var \Illuminate\Cache\RedisStore $instance */
$instance->setConnection($connection);
}
/**
* Specify the name of the connection that should be used to manage locks.
*
* @param string $connection
* @return \Illuminate\Cache\RedisStore
* @static
*/
public static function setLockConnection($connection)
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->setLockConnection($connection);
}
/**
* Get the Redis database instance.
*
* @return \Illuminate\Contracts\Redis\Factory
* @static
*/
public static function getRedis()
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->getRedis();
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->getDirectory();
}
/**
* Get the cache key prefix.
@ -4285,20 +4250,8 @@
*/
public static function getPrefix()
{
/** @var \Illuminate\Cache\RedisStore $instance */
/** @var \Illuminate\Cache\FileStore $instance */
return $instance->getPrefix();
}
/**
* Set the cache key prefix.
*
* @param string $prefix
* @return void
* @static
*/
public static function setPrefix($prefix)
{
/** @var \Illuminate\Cache\RedisStore $instance */
$instance->setPrefix($prefix);
}
}
@ -9901,44 +9854,45 @@
return $instance->setConnectionName($name);
}
/**
* Migrate the delayed jobs that are ready to the regular queue.
* Release a reserved job back onto the queue after (n) seconds.
*
* @param string $from
* @param string $to
* @param int $limit
* @return array
* @param string $queue
* @param \Illuminate\Queue\Jobs\DatabaseJobRecord $job
* @param int $delay
* @return mixed
* @static
*/
public static function migrateExpiredJobs($from, $to)
public static function release($queue, $job, $delay)
{
/** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->migrateExpiredJobs($from, $to);
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->release($queue, $job, $delay);
}
/**
* Delete a reserved job from the queue.
*
* @param string $queue
* @param \Illuminate\Queue\Jobs\RedisJob $job
* @param string $id
* @return void
* @throws \Throwable
* @static
*/
public static function deleteReserved($queue, $job)
public static function deleteReserved($queue, $id)
{
/** @var \Illuminate\Queue\RedisQueue $instance */
$instance->deleteReserved($queue, $job);
/** @var \Illuminate\Queue\DatabaseQueue $instance */
$instance->deleteReserved($queue, $id);
}
/**
* Delete a reserved job from the reserved queue and release it.
*
* @param string $queue
* @param \Illuminate\Queue\Jobs\RedisJob $job
* @param \Illuminate\Queue\Jobs\DatabaseJob $job
* @param int $delay
* @return void
* @static
*/
public static function deleteAndRelease($queue, $job, $delay)
{
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
$instance->deleteAndRelease($queue, $job, $delay);
}
/**
@ -9950,7 +9904,7 @@
*/
public static function clear($queue)
{
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->clear($queue);
}
/**
@ -9962,30 +9916,19 @@
*/
public static function getQueue($queue)
{
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->getQueue($queue);
}
/**
* Get the connection for the queue.
* Get the underlying database instance.
*
* @return \Illuminate\Redis\Connections\Connection
* @return \Illuminate\Database\Connection
* @static
*/
public static function getConnection()
public static function getDatabase()
{
/** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getConnection();
}
/**
* Get the underlying Redis instance.
*
* @return \Illuminate\Contracts\Redis\Factory
* @static
*/
public static function getRedis()
{
/** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getRedis();
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->getDatabase();
}
/**
* Get the backoff for an object-based queue handler.
@ -9996,7 +9939,7 @@
*/
public static function getJobBackoff($job)
{ //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->getJobBackoff($job);
}
/**
@ -10008,7 +9951,7 @@
*/
public static function getJobExpiration($job)
{ //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->getJobExpiration($job);
}
/**
@ -10020,7 +9963,7 @@
*/
public static function createPayloadUsing($callback)
{ //Method inherited from \Illuminate\Queue\Queue
\Illuminate\Queue\RedisQueue::createPayloadUsing($callback);
\Illuminate\Queue\DatabaseQueue::createPayloadUsing($callback);
}
/**
* Get the container instance being used by the connection.
@ -10030,7 +9973,7 @@
*/
public static function getContainer()
{ //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
return $instance->getContainer();
}
/**
@ -10042,7 +9985,7 @@
*/
public static function setContainer($container)
{ //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\RedisQueue $instance */
/** @var \Illuminate\Queue\DatabaseQueue $instance */
$instance->setContainer($container);
}
@ -17854,6 +17797,25 @@
/**
*
*
* @method static void createSubscription(array|string $channels, \Closure $callback, string $method = 'subscribe')
* @method static \Illuminate\Redis\Limiters\ConcurrencyLimiterBuilder funnel(string $name)
* @method static \Illuminate\Redis\Limiters\DurationLimiterBuilder throttle(string $name)
* @method static mixed client()
* @method static void subscribe(array|string $channels, \Closure $callback)
* @method static void psubscribe(array|string $channels, \Closure $callback)
* @method static mixed command(string $method, array $parameters = [])
* @method static void listen(\Closure $callback)
* @method static string|null getName()
* @method static \Illuminate\Redis\Connections\Connection setName(string $name)
* @method static \Illuminate\Contracts\Events\Dispatcher getEventDispatcher()
* @method static void setEventDispatcher(\Illuminate\Contracts\Events\Dispatcher $events)
* @method static void unsetEventDispatcher()
* @method static void macro(string $name, object|callable $macro)
* @method static void mixin(object $mixin, bool $replace = true)
* @method static bool hasMacro(string $name)
* @method static void flushMacros()
* @method static mixed macroCall(string $method, array $parameters)
* @see \Illuminate\Redis\RedisManager
*/
class Redis {
/**

4
app/Http/Controllers/PreviewController.php
View File

@ -177,7 +177,7 @@ class PreviewController extends BaseController
public function design(DesignPreviewRequest $request)
{
if(Ninja::isHosted() && !in_array($request->getHost(), ['preview.invoicing.co','staging.invoicing.co']))
if(Ninja::isHosted() && !in_array($request->getHost(), ['preview.invoicing.co','staging.invoicing.co'])){
return response()->json(['message' => 'This server cannot handle this request.'], 400);
}
@ -351,7 +351,7 @@ class PreviewController extends BaseController
{
if(Ninja::isHosted() && !in_array($request->getHost(), ['preview.invoicing.co','staging.invoicing.co']))
return response()->json(['message' => 'This server cannot handle this request.'], 400);
}
$company = auth()->user()->company();

3
app/Repositories/BaseRepository.php
View File

@ -147,7 +147,7 @@ class BaseRepository
*/
protected function alternativeSave($data, $model)
{
if(array_key_exists('client_id', $data) && !empty($data['client_id']))
if (array_key_exists('client_id', $data) && !empty($data['client_id'])) {
$model->client_id = $data['client_id'];
}
@ -364,3 +364,4 @@ class BaseRepository
return $model->fresh();
}
}
}