diff --git a/.phpstorm.meta.php/laravel.meta.php b/.phpstorm.meta.php/laravel.meta.php index a212c1dba..b0b1ad1a8 100644 --- a/.phpstorm.meta.php/laravel.meta.php +++ b/.phpstorm.meta.php/laravel.meta.php @@ -5,13 +5,14 @@ /** * PhpStorm Meta file, to provide autocomplete information for PhpStorm - * Generated on 2020-04-25 14:39:50. + * Generated on 2020-07-16 10:33:21. * * @author Barry vd. Heuvel * @see https://github.com/barryvdh/laravel-ide-helper */ override(new \Illuminate\Contracts\Container\Container, map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -87,6 +88,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -207,6 +209,7 @@ ])); override(\Illuminate\Container\Container::makeWith(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -282,6 +285,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -402,6 +406,7 @@ ])); override(\Illuminate\Contracts\Container\Container::make(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -477,6 +482,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -597,6 +603,7 @@ ])); override(\Illuminate\Contracts\Container\Container::makeWith(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -672,6 +679,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -792,6 +800,7 @@ ])); override(\App::make(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -867,6 +876,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -987,6 +997,7 @@ ])); override(\App::makeWith(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -1062,6 +1073,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -1182,6 +1194,7 @@ ])); override(\app(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -1257,6 +1270,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, @@ -1377,6 +1391,7 @@ ])); override(\resolve(0), map([ '' => '@', + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Doctrine\ORM\Mapping\ClassMetadataFactory' => \Doctrine\ORM\Mapping\ClassMetadataFactory::class, 'Facade\IgnitionContracts\SolutionProviderRepository' => \Facade\Ignition\SolutionProviders\SolutionProviderRepository::class, 'Facade\Ignition\DumpRecorder\DumpRecorder' => \Facade\Ignition\DumpRecorder\DumpRecorder::class, @@ -1452,6 +1467,7 @@ 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class, 'command.countries.migration' => \Webpatser\Countries\MigrationCommand::class, 'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class, + 'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class, 'command.down' => \Illuminate\Foundation\Console\DownCommand::class, 'command.dumpserver' => \BeyondCode\DumpServer\DumpServerCommand::class, 'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, diff --git a/_ide_helper.php b/_ide_helper.php index 577ffe564..255a300bd 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -3,7 +3,7 @@ /** * A helper file for Laravel, to provide autocomplete information to your IDE - * Generated for Laravel 6.18.10 on 2020-04-25 14:39:50. + * Generated for Laravel 6.18.10 on 2020-07-16 10:33:20. * * This file should not be included in your code, only analyzed by your IDE! * @@ -3570,49 +3570,44 @@ public static function macroCall($method, $parameters) */ public static function flush() { - /** @var \Illuminate\Cache\ArrayStore $instance */ + /** @var \Illuminate\Cache\FileStore $instance */ return $instance->flush(); } /** - * Get the cache key prefix. + * Get the Filesystem instance. * - * @return string + * @return \Illuminate\Filesystem\Filesystem * @static */ - public static function getPrefix() + public static function getFilesystem() { - /** @var \Illuminate\Cache\ArrayStore $instance */ - return $instance->getPrefix(); + /** @var \Illuminate\Cache\FileStore $instance */ + return $instance->getFilesystem(); } /** - * Get a lock instance. + * Get the working directory of the cache. * - * @param string $name - * @param int $seconds - * @param string|null $owner - * @return \Illuminate\Contracts\Cache\Lock + * @return string * @static */ - public static function lock($name, $seconds = 0, $owner = null) + public static function getDirectory() { - /** @var \Illuminate\Cache\ArrayStore $instance */ - return $instance->lock($name, $seconds, $owner); + /** @var \Illuminate\Cache\FileStore $instance */ + return $instance->getDirectory(); } /** - * Restore a lock instance using the owner identifier. + * Get the cache key prefix. * - * @param string $name - * @param string $owner - * @return \Illuminate\Contracts\Cache\Lock + * @return string * @static */ - public static function restoreLock($name, $owner) + public static function getPrefix() { - /** @var \Illuminate\Cache\ArrayStore $instance */ - return $instance->restoreLock($name, $owner); + /** @var \Illuminate\Cache\FileStore $instance */ + return $instance->getPrefix(); } } @@ -20702,6 +20697,612 @@ public static function setStateless($stateless = true) } +namespace Barryvdh\Debugbar { + + /** + * + * + * @method static void alert(string $message) + * @method static void critical(string $message) + * @method static void debug(string $message) + * @method static void emergency(string $message) + * @method static void error(string $message) + * @method static void info(string $message) + * @method static void log(string $message) + * @method static void notice(string $message) + * @method static void warning(string $message) + * @see \Barryvdh\Debugbar\LaravelDebugbar + */ + class Facade { + + /** + * Enable the Debugbar and boot, if not already booted. + * + * @static + */ + public static function enable() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->enable(); + } + + /** + * Boot the debugbar (add collectors, renderer and listener) + * + * @static + */ + public static function boot() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->boot(); + } + + /** + * + * + * @static + */ + public static function shouldCollect($name, $default = false) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->shouldCollect($name, $default); + } + + /** + * Adds a data collector + * + * @param \Barryvdh\Debugbar\DataCollectorInterface $collector + * @throws DebugBarException + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function addCollector($collector) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->addCollector($collector); + } + + /** + * Handle silenced errors + * + * @param $level + * @param $message + * @param string $file + * @param int $line + * @param array $context + * @throws \ErrorException + * @static + */ + public static function handleError($level, $message, $file = '', $line = 0, $context = []) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->handleError($level, $message, $file, $line, $context); + } + + /** + * Starts a measure + * + * @param string $name Internal name, used to stop the measure + * @param string $label Public name + * @static + */ + public static function startMeasure($name, $label = null) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->startMeasure($name, $label); + } + + /** + * Stops a measure + * + * @param string $name + * @static + */ + public static function stopMeasure($name) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->stopMeasure($name); + } + + /** + * Adds an exception to be profiled in the debug bar + * + * @param \Exception $e + * @deprecated in favor of addThrowable + * @static + */ + public static function addException($e) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->addException($e); + } + + /** + * Adds an exception to be profiled in the debug bar + * + * @param \Exception $e + * @static + */ + public static function addThrowable($e) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->addThrowable($e); + } + + /** + * Returns a JavascriptRenderer for this instance + * + * @param string $baseUrl + * @param string $basePathng + * @return \Barryvdh\Debugbar\JavascriptRenderer + * @static + */ + public static function getJavascriptRenderer($baseUrl = null, $basePath = null) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getJavascriptRenderer($baseUrl, $basePath); + } + + /** + * Modify the response and inject the debugbar (or data in headers) + * + * @param \Symfony\Component\HttpFoundation\Request $request + * @param \Symfony\Component\HttpFoundation\Response $response + * @return \Symfony\Component\HttpFoundation\Response + * @static + */ + public static function modifyResponse($request, $response) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->modifyResponse($request, $response); + } + + /** + * Check if the Debugbar is enabled + * + * @return boolean + * @static + */ + public static function isEnabled() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->isEnabled(); + } + + /** + * Collects the data from the collectors + * + * @return array + * @static + */ + public static function collect() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->collect(); + } + + /** + * Injects the web debug toolbar into the given Response. + * + * @param \Symfony\Component\HttpFoundation\Response $response A Response instance + * Based on https://github.com/symfony/WebProfilerBundle/blob/master/EventListener/WebDebugToolbarListener.php + * @static + */ + public static function injectDebugbar($response) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->injectDebugbar($response); + } + + /** + * Disable the Debugbar + * + * @static + */ + public static function disable() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->disable(); + } + + /** + * Adds a measure + * + * @param string $label + * @param float $start + * @param float $end + * @static + */ + public static function addMeasure($label, $start, $end) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->addMeasure($label, $start, $end); + } + + /** + * Utility function to measure the execution of a Closure + * + * @param string $label + * @param \Closure $closure + * @static + */ + public static function measure($label, $closure) + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->measure($label, $closure); + } + + /** + * Collect data in a CLI request + * + * @return array + * @static + */ + public static function collectConsole() + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->collectConsole(); + } + + /** + * Adds a message to the MessagesCollector + * + * A message can be anything from an object to a string + * + * @param mixed $message + * @param string $label + * @static + */ + public static function addMessage($message, $label = 'info') + { + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->addMessage($message, $label); + } + + /** + * Checks if a data collector has been added + * + * @param string $name + * @return boolean + * @static + */ + public static function hasCollector($name) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->hasCollector($name); + } + + /** + * Returns a data collector + * + * @param string $name + * @return \DebugBar\DataCollectorInterface + * @throws DebugBarException + * @static + */ + public static function getCollector($name) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getCollector($name); + } + + /** + * Returns an array of all data collectors + * + * @return \DebugBar\array[DataCollectorInterface] + * @static + */ + public static function getCollectors() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getCollectors(); + } + + /** + * Sets the request id generator + * + * @param \DebugBar\RequestIdGeneratorInterface $generator + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function setRequestIdGenerator($generator) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->setRequestIdGenerator($generator); + } + + /** + * + * + * @return \DebugBar\RequestIdGeneratorInterface + * @static + */ + public static function getRequestIdGenerator() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getRequestIdGenerator(); + } + + /** + * Returns the id of the current request + * + * @return string + * @static + */ + public static function getCurrentRequestId() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getCurrentRequestId(); + } + + /** + * Sets the storage backend to use to store the collected data + * + * @param \DebugBar\StorageInterface $storage + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function setStorage($storage = null) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->setStorage($storage); + } + + /** + * + * + * @return \DebugBar\StorageInterface + * @static + */ + public static function getStorage() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getStorage(); + } + + /** + * Checks if the data will be persisted + * + * @return boolean + * @static + */ + public static function isDataPersisted() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->isDataPersisted(); + } + + /** + * Sets the HTTP driver + * + * @param \DebugBar\HttpDriverInterface $driver + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function setHttpDriver($driver) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->setHttpDriver($driver); + } + + /** + * Returns the HTTP driver + * + * If no http driver where defined, a PhpHttpDriver is automatically created + * + * @return \DebugBar\HttpDriverInterface + * @static + */ + public static function getHttpDriver() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getHttpDriver(); + } + + /** + * Returns collected data + * + * Will collect the data if none have been collected yet + * + * @return array + * @static + */ + public static function getData() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getData(); + } + + /** + * Returns an array of HTTP headers containing the data + * + * @param string $headerName + * @param integer $maxHeaderLength + * @return array + * @static + */ + public static function getDataAsHeaders($headerName = 'phpdebugbar', $maxHeaderLength = 4096, $maxTotalHeaderLength = 250000) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getDataAsHeaders($headerName, $maxHeaderLength, $maxTotalHeaderLength); + } + + /** + * Sends the data through the HTTP headers + * + * @param bool $useOpenHandler + * @param string $headerName + * @param integer $maxHeaderLength + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function sendDataInHeaders($useOpenHandler = null, $headerName = 'phpdebugbar', $maxHeaderLength = 4096) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->sendDataInHeaders($useOpenHandler, $headerName, $maxHeaderLength); + } + + /** + * Stacks the data in the session for later rendering + * + * @static + */ + public static function stackData() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->stackData(); + } + + /** + * Checks if there is stacked data in the session + * + * @return boolean + * @static + */ + public static function hasStackedData() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->hasStackedData(); + } + + /** + * Returns the data stacked in the session + * + * @param boolean $delete Whether to delete the data in the session + * @return array + * @static + */ + public static function getStackedData($delete = true) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getStackedData($delete); + } + + /** + * Sets the key to use in the $_SESSION array + * + * @param string $ns + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function setStackDataSessionNamespace($ns) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->setStackDataSessionNamespace($ns); + } + + /** + * Returns the key used in the $_SESSION array + * + * @return string + * @static + */ + public static function getStackDataSessionNamespace() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->getStackDataSessionNamespace(); + } + + /** + * Sets whether to only use the session to store stacked data even + * if a storage is enabled + * + * @param boolean $enabled + * @return \Barryvdh\Debugbar\LaravelDebugbar + * @static + */ + public static function setStackAlwaysUseSessionStorage($enabled = true) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->setStackAlwaysUseSessionStorage($enabled); + } + + /** + * Checks if the session is always used to store stacked data + * even if a storage is enabled + * + * @return boolean + * @static + */ + public static function isStackAlwaysUseSessionStorage() + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->isStackAlwaysUseSessionStorage(); + } + + /** + * + * + * @static + */ + public static function offsetSet($key, $value) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->offsetSet($key, $value); + } + + /** + * + * + * @static + */ + public static function offsetGet($key) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->offsetGet($key); + } + + /** + * + * + * @static + */ + public static function offsetExists($key) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->offsetExists($key); + } + + /** + * + * + * @static + */ + public static function offsetUnset($key) + { + //Method inherited from \DebugBar\DebugBar + /** @var \Barryvdh\Debugbar\LaravelDebugbar $instance */ + return $instance->offsetUnset($key); + } + + } + +} + namespace Facade\Ignition\Facades { /** @@ -24004,6 +24605,8 @@ class Countries extends \Webpatser\Countries\CountriesFacade {} class Google2FA extends \PragmaRX\Google2FALaravel\Facade {} + class Debugbar extends \Barryvdh\Debugbar\Facade {} + class Flare extends \Facade\Ignition\Facades\Flare {} class EntityManager extends \LaravelDoctrine\ORM\Facades\EntityManager {} diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php index f486d0546..a524505d1 100644 --- a/app/Models/ApiKey.php +++ b/app/Models/ApiKey.php @@ -20,6 +20,7 @@ * @property string|null $lastseenAt * @property string|null $lastseenFrom * @property string|null $description + * @property-read \IXP\Models\User $user * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ApiKey newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ApiKey newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ApiKey query() @@ -33,7 +34,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ApiKey whereLastseenFrom($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ApiKey whereUserId($value) * @mixin \Eloquent - * @property-read \IXP\Models\User $user */ class ApiKey extends Model { diff --git a/app/Models/Cabinet.php b/app/Models/Cabinet.php index 5fbf51827..eb843daa2 100644 --- a/app/Models/Cabinet.php +++ b/app/Models/Cabinet.php @@ -12,19 +12,25 @@ /** * IXP\Models\Cabinet * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet query() - * @mixin \Eloquent * @property int $id * @property int|null $locationid * @property string|null $name - * @property string|null $cololocation + * @property string|null $colocation * @property int|null $height * @property string|null $type * @property string|null $notes * @property int|null $u_counts_from - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereCololocation($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServer[] $consoleServers + * @property-read int|null $console_servers_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\CustomerEquipment[] $customerEquipment + * @property-read int|null $customer_equipment_count + * @property-read \IXP\Models\Location|null $location + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Switcher[] $switchers + * @property-read int|null $switchers_count + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet query() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereColocation($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereHeight($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereLocationid($value) @@ -32,15 +38,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereNotes($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereType($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereUCountsFrom($value) - * @property-read \IXP\Models\Location $location - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Switcher[] $switchers - * @property-read int|null $switchers_count - * @property string|null $colocation - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\CustomerEquipment[] $customerEquipment - * @property-read int|null $customer_equipment_count - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Cabinet whereColocation($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServer[] $consoleServers - * @property-read int|null $console_servers_count + * @mixin \Eloquent */ class Cabinet extends Model { diff --git a/app/Models/ConsoleServer.php b/app/Models/ConsoleServer.php index e20f6c971..b2d961dfa 100644 --- a/app/Models/ConsoleServer.php +++ b/app/Models/ConsoleServer.php @@ -11,10 +11,6 @@ /** * IXP\Models\ConsoleServer * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer query() - * @mixin \Eloquent * @property int $id * @property int|null $vendor_id * @property int|null $cabinet_id @@ -24,6 +20,13 @@ * @property string|null $serialNumber * @property int|null $active * @property string|null $notes + * @property-read \IXP\Models\Cabinet|null $cabinet + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections + * @property-read int|null $console_server_connections_count + * @property-read \IXP\Models\Vendor|null $vendor + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer query() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereCabinetId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereHostname($value) @@ -33,10 +36,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereNotes($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereSerialNumber($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServer whereVendorId($value) - * @property-read \IXP\Models\Cabinet|null $cabinet - * @property-read \IXP\Models\Vendor|null $vendor - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections - * @property-read int|null $console_server_connections_count + * @mixin \Eloquent */ class ConsoleServer extends Model { diff --git a/app/Models/ConsoleServerConnection.php b/app/Models/ConsoleServerConnection.php index 2f708a581..e169ad6e3 100644 --- a/app/Models/ConsoleServerConnection.php +++ b/app/Models/ConsoleServerConnection.php @@ -12,7 +12,6 @@ * * @property int $id * @property int|null $custid - * @property int|null $switchid * @property string|null $description * @property string|null $port * @property int|null $speed @@ -22,6 +21,9 @@ * @property int|null $autobaud * @property string|null $notes * @property int|null $console_server_id + * @property-read \IXP\Models\ConsoleServer|null $consoleServer + * @property-read \IXP\Models\CustomerTag|null $customer + * @property-read \IXP\Models\Switcher $switcher * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection query() @@ -36,11 +38,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection wherePort($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection whereSpeed($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection whereStopbits($value) - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ConsoleServerConnection whereSwitchid($value) * @mixin \Eloquent - * @property-read \IXP\Models\ConsoleServer|null $consoleServer - * @property-read \IXP\Models\CustomerTag|null $customer - * @property-read \IXP\Models\Switcher|null $switcher */ class ConsoleServerConnection extends Model { diff --git a/app/Models/Contact.php b/app/Models/Contact.php index 2cd909ac1..78f68ad71 100644 --- a/app/Models/Contact.php +++ b/app/Models/Contact.php @@ -14,10 +14,6 @@ /** * IXP\Models\Contact * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact query() - * @mixin \Eloquent * @property int $id * @property int|null $custid * @property string $name @@ -32,6 +28,16 @@ * @property string|null $created * @property string|null $position * @property string|null $notes + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactGroups + * @property-read int|null $contact_groups_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactGroupsAll + * @property-read int|null $contact_groups_all_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactRoles + * @property-read int|null $contact_roles_count + * @property-read \IXP\Models\Customer|null $customer + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact query() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact whereCreated($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact whereCreator($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact whereCustid($value) @@ -46,13 +52,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact whereNotes($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact wherePhone($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Contact wherePosition($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactGroups - * @property-read int|null $contact_groups_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactGroupsAll - * @property-read int|null $contact_groups_all_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ContactGroup[] $contactRoles - * @property-read int|null $contact_roles_count - * @property-read \IXP\Models\Customer|null $customer + * @mixin \Eloquent */ class Contact extends Model { diff --git a/app/Models/ContactGroup.php b/app/Models/ContactGroup.php index ed75947c1..b04fdef4a 100644 --- a/app/Models/ContactGroup.php +++ b/app/Models/ContactGroup.php @@ -11,10 +11,6 @@ /** * IXP\Models\ContactGroup * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup query() - * @mixin \Eloquent * @property int $id * @property string $name * @property string $description @@ -22,6 +18,11 @@ * @property int $active * @property int $limited_to * @property string $created + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Contact[] $contacts + * @property-read int|null $contacts_count + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup query() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereCreated($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereDescription($value) @@ -29,8 +30,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereLimitedTo($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\ContactGroup whereType($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Contact[] $contacts - * @property-read int|null $contacts_count + * @mixin \Eloquent */ class ContactGroup extends Model { diff --git a/app/Models/Customer.php b/app/Models/Customer.php index ced1d4829..675c15e09 100644 --- a/app/Models/Customer.php +++ b/app/Models/Customer.php @@ -77,10 +77,17 @@ * @property int $in_manrs * @property int $in_peeringdb * @property int $peeringdb_oauth + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections + * @property-read int|null $console_server_connections_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Contact[] $contacts + * @property-read int|null $contacts_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\DocstoreCustomerDirectory[] $docstoreCustomerDirectories * @property-read int|null $docstore_customer_directories_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\DocstoreCustomerFile[] $docstoreCustomerFiles * @property-read int|null $docstore_customer_files_count + * @property-read \IXP\Models\IrrdbConfig|null $irrdbConfig + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\User[] $users + * @property-read int|null $users_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\VirtualInterface[] $virtualInterfaces * @property-read int|null $virtual_interfaces_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Customer current() @@ -124,13 +131,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Customer whereStatus($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Customer whereType($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Contact[] $contacts - * @property-read int|null $contacts_count - * @property-read \IXP\Models\IrrdbConfig $irrdbConfig - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\User[] $users - * @property-read int|null $users_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections - * @property-read int|null $console_server_connections_count */ class Customer extends Model { diff --git a/app/Models/CustomerEquipment.php b/app/Models/CustomerEquipment.php index a61968222..81dd46f2c 100644 --- a/app/Models/CustomerEquipment.php +++ b/app/Models/CustomerEquipment.php @@ -16,6 +16,7 @@ * @property int|null $cabinetid * @property string|null $name * @property string|null $descr + * @property-read \IXP\Models\Cabinet|null $cabinet * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerEquipment newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerEquipment newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerEquipment query() @@ -25,7 +26,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerEquipment whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerEquipment whereName($value) * @mixin \Eloquent - * @property-read \IXP\Models\Cabinet $cabinet */ class CustomerEquipment extends Model { diff --git a/app/Models/CustomerTag.php b/app/Models/CustomerTag.php index 9d3146f1e..e83438398 100644 --- a/app/Models/CustomerTag.php +++ b/app/Models/CustomerTag.php @@ -9,17 +9,16 @@ /** * IXP\Models\CustomerTag * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag query() - * @mixin \Eloquent * @property int $id * @property string $tag * @property string $display_as * @property string|null $description * @property int $internal_only - * @property string $created - * @property string $updated + * @property \Illuminate\Support\Carbon $created + * @property \Illuminate\Support\Carbon $updated + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag query() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereCreated($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereDescription($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereDisplayAs($value) @@ -27,6 +26,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereInternalOnly($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereTag($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\CustomerTag whereUpdated($value) + * @mixin \Eloquent */ class CustomerTag extends Model { diff --git a/app/Models/IPv4Address.php b/app/Models/IPv4Address.php index 186701e37..ff7e1f81a 100644 --- a/app/Models/IPv4Address.php +++ b/app/Models/IPv4Address.php @@ -11,6 +11,7 @@ * @property int $id * @property int|null $vlanid * @property string|null $address + * @property-read \IXP\Models\Vlan|null $vlan * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv4Address newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv4Address newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv4Address query() @@ -18,7 +19,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv4Address whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv4Address whereVlanid($value) * @mixin \Eloquent - * @property-read \IXP\Models\Vlan $vlan */ class IPv4Address extends Model { diff --git a/app/Models/IPv6Address.php b/app/Models/IPv6Address.php index 08e3bb1e4..52ba4f7f4 100644 --- a/app/Models/IPv6Address.php +++ b/app/Models/IPv6Address.php @@ -11,6 +11,7 @@ * @property int $id * @property int|null $vlanid * @property string|null $address + * @property-read \IXP\Models\Vlan|null $vlan * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv6Address newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv6Address newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv6Address query() @@ -18,7 +19,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv6Address whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IPv6Address whereVlanid($value) * @mixin \Eloquent - * @property-read \IXP\Models\Vlan $vlan */ class IPv6Address extends Model { diff --git a/app/Models/Infrastructure.php b/app/Models/Infrastructure.php index c95f48309..b43f52406 100644 --- a/app/Models/Infrastructure.php +++ b/app/Models/Infrastructure.php @@ -32,31 +32,27 @@ * IXP\Models\Infrastructure * * @property int $id - * @property int $ixp_id * @property string|null $name * @property string|null $shortname * @property int $isPrimary * @property int|null $peeringdb_ix_id * @property int|null $ixf_ix_id * @property string|null $country - * @method static Builder|Infrastructure newModelQuery() - * @method static Builder|Infrastructure newQuery() - * @method static Builder|Infrastructure query() - * @method static Builder|Infrastructure whereCountry($value) - * @method static Builder|Infrastructure whereId($value) - * @method static Builder|Infrastructure whereIsPrimary($value) - * @method static Builder|Infrastructure whereIxfIxId($value) - * @method static Builder|Infrastructure whereIxpId($value) - * @method static Builder|Infrastructure whereName($value) - * @method static Builder|Infrastructure wherePeeringdbIxId($value) - * @method static Builder|Infrastructure whereShortname($value) - * @mixin Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Vlan[] $Vlans - * @property-read int|null $vlans_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Switcher[] $Switchers - * @property-read int|null $switchers_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Switcher[] $switchers + * @property-read int|null $switchers_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Vlan[] $vlans + * @property-read int|null $vlans_count + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure query() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereCountry($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereIsPrimary($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereIxfIxId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure wherePeeringdbIxId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Infrastructure whereShortname($value) + * @mixin \Eloquent */ class Infrastructure extends Model { diff --git a/app/Models/IrrdbConfig.php b/app/Models/IrrdbConfig.php index 01b53ba29..1ec5f4ddb 100644 --- a/app/Models/IrrdbConfig.php +++ b/app/Models/IrrdbConfig.php @@ -15,6 +15,8 @@ * @property string|null $protocol * @property string|null $source * @property string|null $notes + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Customer[] $customers + * @property-read int|null $customers_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IrrdbConfig newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IrrdbConfig newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IrrdbConfig query() @@ -24,8 +26,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IrrdbConfig whereProtocol($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\IrrdbConfig whereSource($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Customer[] $customers - * @property-read int|null $customers_count */ class IrrdbConfig extends Model { diff --git a/app/Models/Layer2Address.php b/app/Models/Layer2Address.php index b11c4622a..70c294471 100644 --- a/app/Models/Layer2Address.php +++ b/app/Models/Layer2Address.php @@ -19,6 +19,7 @@ * @property string|null $firstseen * @property string|null $lastseen * @property string|null $created + * @property-read \IXP\Models\VlanInterface $vlanInterface * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Layer2Address newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Layer2Address newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Layer2Address query() @@ -29,7 +30,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Layer2Address whereMac($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Layer2Address whereVlanInterfaceId($value) * @mixin \Eloquent - * @property-read \IXP\Models\VlanInterface $vlanInterface */ class Layer2Address extends Model { diff --git a/app/Models/Location.php b/app/Models/Location.php index dc511566a..d6669d070 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -11,10 +11,6 @@ /** * IXP\Models\Location * - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location query() - * @mixin \Eloquent * @property int $id * @property string|null $name * @property string|null $shortname @@ -30,6 +26,11 @@ * @property int|null $pdb_facility_id * @property string|null $city * @property string|null $country + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Cabinet[] $cabinets + * @property-read int|null $cabinets_count + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location query() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location whereAddress($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location whereCity($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location whereCountry($value) @@ -45,8 +46,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location wherePdbFacilityId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location whereShortname($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Location whereTag($value) - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Cabinet[] $cabinets - * @property-read int|null $cabinets_count + * @mixin \Eloquent */ class Location extends Model { diff --git a/app/Models/PatchPanelPort.php b/app/Models/PatchPanelPort.php index a88290e03..bbe26e355 100644 --- a/app/Models/PatchPanelPort.php +++ b/app/Models/PatchPanelPort.php @@ -62,6 +62,9 @@ * @property-read \IXP\Models\PatchPanel|null $patchPanel * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PatchPanelPortFile[] $patchPanelPortFiles * @property-read int|null $patch_panel_port_files_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PatchPanelPort[] $slavePort + * @property-read int|null $slave_port_count + * @property-read \IXP\Models\SwitchPort|null $switchPort * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PatchPanelPort newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PatchPanelPort newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PatchPanelPort query() @@ -88,9 +91,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PatchPanelPort whereSwitchPortId($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PatchPanelPort whereTicketRef($value) * @mixin \Eloquent - * @property-read \IXP\Models\SwitchPort|null $switchPort - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PatchPanelPort[] $slavePort - * @property-read int|null $slave_port_count */ class PatchPanelPort extends Model diff --git a/app/Models/PhysicalInterface.php b/app/Models/PhysicalInterface.php index d6be741ce..1930bef03 100644 --- a/app/Models/PhysicalInterface.php +++ b/app/Models/PhysicalInterface.php @@ -41,6 +41,7 @@ * @property string|null $notes * @property int|null $fanout_physical_interface_id * @property int $autoneg + * @property-read \IXP\Models\SwitchPort|null $switchPort * @property-read \IXP\Models\VirtualInterface|null $virtualInterface * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PhysicalInterface newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PhysicalInterface newQuery() @@ -55,7 +56,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PhysicalInterface whereSwitchportid($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\PhysicalInterface whereVirtualinterfaceid($value) * @mixin \Eloquent - * @property-read \IXP\Models\SwitchPort|null $switchPort */ class PhysicalInterface extends Model { diff --git a/app/Models/SwitchPort.php b/app/Models/SwitchPort.php index 001b4b67c..a5f8f9831 100644 --- a/app/Models/SwitchPort.php +++ b/app/Models/SwitchPort.php @@ -34,9 +34,12 @@ * @property string|null $mauType * @property string|null $mauState * @property string|null $mauAvailability - * @property string|null $mauJacktype * @property int|null $mauAutoNegSupported + * @property string|null $mauJacktype * @property int|null $mauAutoNegAdminState + * @property-read \IXP\Models\PatchPanelPort|null $patchPanelPort + * @property-read \IXP\Models\PhysicalInterface|null $physicalInterface + * @property-read \IXP\Models\Switcher|null $switcher * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\SwitchPort newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\SwitchPort newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\SwitchPort query() @@ -63,11 +66,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\SwitchPort whereSwitchid($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\SwitchPort whereType($value) * @mixin \Eloquent - * @property-read \IXP\Models\Switcher|null $switcher - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PatchPanelPort[] $patchPanelPorts - * @property-read int|null $patch_panel_ports_count - * @property-read \IXP\Models\PatchPanelPort|null $patchPanelPort - * @property-read \IXP\Models\PhysicalInterface|null $physicalInterface */ class SwitchPort extends Model { diff --git a/app/Models/Switcher.php b/app/Models/Switcher.php index c31d5b060..025e1b9c5 100644 --- a/app/Models/Switcher.php +++ b/app/Models/Switcher.php @@ -30,7 +30,7 @@ * @property string|null $ipv4addr * @property string|null $ipv6addr * @property string|null $snmppasswd - * @property int|null $infrastructure + * @property \IXP\Models\Infrastructure|null $infrastructure * @property string|null $model * @property int|null $active * @property string|null $notes @@ -48,6 +48,11 @@ * @property int|null $snmp_engine_time * @property int|null $snmp_system_uptime * @property int|null $snmp_engine_boots + * @property-read \IXP\Models\Cabinet|null $cabinet + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections + * @property-read int|null $console_server_connections_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\SwitchPort[] $switchPorts + * @property-read int|null $switch_ports_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Switcher newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Switcher newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Switcher query() @@ -77,11 +82,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Switcher whereSnmppasswd($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Switcher whereVendorid($value) * @mixin \Eloquent - * @property-read \IXP\Models\Cabinet $cabinet - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\SwitchPort[] $switchPorts - * @property-read int|null $switch_ports_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServerConnection[] $consoleServerConnections - * @property-read int|null $console_server_connections_count */ class Switcher extends Model { diff --git a/app/Models/User.php b/app/Models/User.php index 2b7adc114..5f2ff6cae 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -46,7 +46,13 @@ * @property string|null $name * @property int|null $peeringdb_id * @property mixed|null $extra_attributes + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ApiKey[] $apiKeys + * @property-read int|null $api_keys_count * @property-read \IXP\Models\Customer|null $customer + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Customer[] $customers + * @property-read int|null $customers_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\UserRememberToken[] $userRememberTokens + * @property-read int|null $user_remember_tokens_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\User newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\User query() @@ -67,12 +73,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\User whereUid($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\User whereUsername($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ApiKey[] $apiKeys - * @property-read int|null $api_keys_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Customer[] $customers - * @property-read int|null $customers_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\UserRememberToken[] $userRememberTokens - * @property-read int|null $user_remember_tokens_count */ class User extends Model { diff --git a/app/Models/UserRememberToken.php b/app/Models/UserRememberToken.php index 9974b439e..326c05cff 100644 --- a/app/Models/UserRememberToken.php +++ b/app/Models/UserRememberToken.php @@ -19,6 +19,7 @@ * @property string $created * @property string $expires * @property int $is_2fa_complete + * @property-read \IXP\Models\User $user * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\UserRememberToken newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\UserRememberToken newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\UserRememberToken query() @@ -31,7 +32,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\UserRememberToken whereToken($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\UserRememberToken whereUserId($value) * @mixin \Eloquent - * @property-read \IXP\Models\User $user */ class UserRememberToken extends Model { diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index b38d3c340..0fb56d1fa 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -15,6 +15,8 @@ * @property string|null $shortname * @property string|null $nagios_name * @property string|null $bundle_name + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServer[] $consoleServers + * @property-read int|null $console_servers_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vendor newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vendor newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vendor query() @@ -24,8 +26,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vendor whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vendor whereShortname($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\ConsoleServer[] $consoleServers - * @property-read int|null $console_servers_count */ class Vendor extends Model { diff --git a/app/Models/VirtualInterface.php b/app/Models/VirtualInterface.php index 5747b6021..19c40820c 100644 --- a/app/Models/VirtualInterface.php +++ b/app/Models/VirtualInterface.php @@ -40,6 +40,8 @@ * @property int $lag_framing * @property int $fastlacp * @property-read \IXP\Models\Customer|null $customer + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PhysicalInterface[] $physicalInterfaces + * @property-read int|null $physical_interfaces_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\VlanInterface[] $vlanInterfaces * @property-read int|null $vlan_interfaces_count * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VirtualInterface newModelQuery() @@ -55,8 +57,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VirtualInterface whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VirtualInterface whereTrunk($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\PhysicalInterface[] $physicalInterfaces - * @property-read int|null $physical_interfaces_count */ class VirtualInterface extends Model { diff --git a/app/Models/Vlan.php b/app/Models/Vlan.php index c0b228181..0484b44ce 100644 --- a/app/Models/Vlan.php +++ b/app/Models/Vlan.php @@ -41,6 +41,11 @@ * @property int $peering_matrix * @property int $peering_manager * @property string|null $config_name + * @property-read \IXP\Models\Infrastructure $infrastructure + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\IPv4Address[] $ipv4addresses + * @property-read int|null $ipv4addresses_count + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\IPv6Address[] $ipv6addresses + * @property-read int|null $ipv6addresses_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Router[] $routers * @property-read int|null $routers_count * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\VlanInterface[] $vlanInterfaces @@ -58,11 +63,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vlan wherePeeringMatrix($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\Vlan wherePrivate($value) * @mixin \Eloquent - * @property-read \IXP\Models\Infrastructure $infrastructure - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\IPv4Address[] $ipv4addresses - * @property-read int|null $ipv4addresses_count - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\IPv6Address[] $ipv6addresses - * @property-read int|null $ipv6addresses_count */ class Vlan extends Model { diff --git a/app/Models/VlanInterface.php b/app/Models/VlanInterface.php index 01e85c473..10040d4da 100644 --- a/app/Models/VlanInterface.php +++ b/app/Models/VlanInterface.php @@ -55,6 +55,8 @@ * @property int|null $busyhost * @property string|null $notes * @property int $rsmorespecifics + * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Layer2Address[] $layer2addresses + * @property-read int|null $layer2addresses_count * @property-read \IXP\Models\VirtualInterface|null $virtualInterface * @property-read \IXP\Models\Vlan|null $vlan * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VlanInterface newModelQuery() @@ -85,8 +87,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VlanInterface whereVirtualinterfaceid($value) * @method static \Illuminate\Database\Eloquent\Builder|\IXP\Models\VlanInterface whereVlanid($value) * @mixin \Eloquent - * @property-read \Illuminate\Database\Eloquent\Collection|\IXP\Models\Layer2Address[] $layer2addresses - * @property-read int|null $layer2addresses_count */ class VlanInterface extends Model { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 23b81bac8..89e332d3b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -176,7 +176,7 @@ protected function mapApiV4AuthRoutes() 'prefix' => 'api/v4', ], function ($router) { if( class_exists( "\Debugbar" ) ) { - \Debugbar::disable(); + //\Debugbar::disable(); } require base_path('routes/apiv4-auth.php'); diff --git a/composer.json b/composer.json index f37d0a051..6e73a5900 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,8 @@ "barryvdh/laravel-ide-helper": "^2.3", "laravel/dusk": "^5.0", "nunomaduro/collision": "^3.0", - "staudenmeir/dusk-updater": "^1.0" + "staudenmeir/dusk-updater": "^1.0", + "barryvdh/laravel-debugbar": "^3.3" }, "support": { "issues": "https://www.ixpmanager.org/support.php", diff --git a/composer.lock b/composer.lock index 0660ea64d..6fbcc063e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c9c90b381491f3457458a2b2901f6c50", + "content-hash": "cc4ff7658406ee95abbfc2cecba23f64", "packages": [ { "name": "anahkiasen/former", @@ -868,20 +868,6 @@ "sqlserver", "sqlsrv" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", - "type": "tidelift" - } - ], "time": "2020-04-20T17:19:26+00:00" }, { @@ -1227,20 +1213,6 @@ "database", "orm" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine/orm", - "type": "tidelift" - } - ], "time": "2020-03-19T06:41:02+00:00" }, { @@ -1324,20 +1296,6 @@ "orm", "persistence" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", - "type": "tidelift" - } - ], "time": "2020-03-21T15:13:52+00:00" }, { @@ -2336,7 +2294,6 @@ "symfony/serializer": "^2.7|^3.0|^4.0|^5.0" }, "require-dev": { - "barryvdh/laravel-debugbar": "~3.0", "illuminate/log": "^6.0", "illuminate/notifications": "^6.0", "illuminate/queue": "^6.0", @@ -2391,12 +2348,6 @@ "laravel", "orm" ], - "funding": [ - { - "url": "https://github.com/patrickbrouwers", - "type": "github" - } - ], "time": "2020-04-01T15:15:39+00:00" }, { @@ -2876,32 +2827,6 @@ "md", "parser" ], - "funding": [ - { - "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", - "type": "custom" - }, - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/commonmark", - "type": "tidelift" - } - ], "time": "2020-04-24T13:39:56+00:00" }, { @@ -2986,12 +2911,6 @@ "sftp", "storage" ], - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], "time": "2020-04-16T13:21:26+00:00" }, { @@ -4080,20 +3999,6 @@ "x.509", "x509" ], - "funding": [ - { - "url": "https://github.com/terrafrost", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpseclib", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", - "type": "tidelift" - } - ], "time": "2020-04-04T23:17:33+00:00" }, { @@ -5110,20 +5015,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5180,20 +5071,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -5320,20 +5197,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -5441,20 +5304,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -5510,20 +5359,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T14:07:33+00:00" }, { @@ -5676,20 +5511,6 @@ "mime", "mime-type" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5748,20 +5569,6 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -5821,20 +5628,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -5897,20 +5690,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -5970,20 +5749,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -6039,20 +5804,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -6111,20 +5862,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -6854,6 +6591,74 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v3.3.3", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/57f2219f6d9efe41ed1bc880d86701c52f261bf5", + "reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5", + "shasum": "" + }, + "require": { + "illuminate/routing": "^5.5|^6|^7", + "illuminate/session": "^5.5|^6|^7", + "illuminate/support": "^5.5|^6|^7", + "maximebf/debugbar": "^1.15.1", + "php": ">=7.0", + "symfony/debug": "^3|^4|^5", + "symfony/finder": "^3|^4|^5" + }, + "require-dev": { + "laravel/framework": "5.5.x" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facade" + } + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "time": "2020-05-05T10:53:32+00:00" + }, { "name": "barryvdh/laravel-ide-helper", "version": "v2.7.0", @@ -6923,12 +6728,6 @@ "phpstorm", "sublime" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-04-22T09:57:26+00:00" }, { @@ -7095,16 +6894,6 @@ "ssl", "tls" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -7814,6 +7603,67 @@ ], "time": "2020-03-24T16:21:49+00:00" }, + { + "name": "maximebf/debugbar", + "version": "v1.16.3", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "1a1605b8e9bacb34cc0c6278206d699772e1d372" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/1a1605b8e9bacb34cc0c6278206d699772e1d372", + "reference": "1a1605b8e9bacb34cc0c6278206d699772e1d372", + "shasum": "" + }, + "require": { + "php": "^7.1", + "psr/log": "^1.0", + "symfony/var-dumper": "^2.6|^3|^4|^5" + }, + "require-dev": { + "phpunit/phpunit": "^5" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.16-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "time": "2020-05-06T07:06:27+00:00" + }, { "name": "mockery/mockery", "version": "1.3.1", @@ -8705,16 +8555,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-23T04:39:42+00:00" }, { @@ -9694,6 +9534,5 @@ "platform-dev": [], "platform-overrides": { "php": "7.3.0" - }, - "plugin-api-version": "1.1.0" + } } diff --git a/config/debugbar.php b/config/debugbar.php index 48d9b8be1..ae95836fa 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -30,14 +30,14 @@ | | Debugbar is enabled by default, when debug is set to true in app.php. | You can override the value by setting enable to true or false instead of null. - | + | | You can provide an array of URI's that must be ignored (eg. 'api/*') | */ 'enabled' => env('DEBUGBAR_ENABLED', null), 'except' => [ - // + 'telescope*' ], /* @@ -100,7 +100,7 @@ | */ 'error_handler' => false, - + /* |-------------------------------------------------------------------------- | Clockwork integration @@ -128,12 +128,12 @@ 'memory' => true, // Memory usage 'exceptions' => true, // Exception displayer 'log' => true, // Logs from Monolog (merged in messages if enabled) - // --------------------------------------------------------------------------- - // barryo - 20180214 - the following is set to false as Eloquent namespace - // conflicts with Doctrine namespace for the debugbar. So, no Eloquent love - // in IXP Manager on this valentine's day xxx - 'db' => false, // Show database (PDO) queries and bindings - // --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // barryo - 20180214 - the following is set to false as Eloquent namespace + // conflicts with Doctrine namespace for the debugbar. So, no Eloquent love + // in IXP Manager on this valentine's day xxx + 'db' => true, // Show database (PDO) queries and bindings + // --------------------------------------------------------------------------- 'views' => true, // Views with their data 'route' => true, // Current route information 'auth' => true, // Display Laravel authentication status @@ -148,6 +148,7 @@ 'files' => false, // Show the included files 'config' => false, // Display config settings 'cache' => false, // Display cache events + 'models' => true, // Display models ], /* @@ -165,7 +166,7 @@ ], 'db' => [ 'with_params' => true, // Render SQL with the parameters substituted - 'backtrace' => true, // Use a backtrace to find the origin of the query in your files. + 'backtrace' => false, // Use a backtrace to find the origin of the query in your files. 'timeline' => false, // Add the queries to the timeline 'explain' => [ // Show EXPLAIN output on queries 'enabled' => false, @@ -224,4 +225,4 @@ | To override default domain, specify it as a non-empty value. */ 'route_domain' => null, -]; +]; \ No newline at end of file diff --git a/resources/views/frontend/js/list.foil.php b/resources/views/frontend/js/list.foil.php index 360c5312c..24d00510b 100644 --- a/resources/views/frontend/js/list.foil.php +++ b/resources/views/frontend/js/list.foil.php @@ -2,7 +2,7 @@ $(document).ready(function() { - feParams->readonly ) || !$t->feParams->readonly || $t->feParams->allowDeleteForReadOnly ): ?> + feParams->readonly ) || !$t->feParams->readonly || isset( $t->feParams->readonly ) || $t->feParams->allowDeleteForReadOnly ): ?> $( '.btn-2f-list-delete' ).on( 'click', function( event ) { event.preventDefault(); diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore index c96a04f00..d6b7ef32c 100644 --- a/storage/debugbar/.gitignore +++ b/storage/debugbar/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore \ No newline at end of file +!.gitignore