diff --git a/.idea/mivita.care.iml b/.idea/mivita.care.iml index 505da3a..518b499 100644 --- a/.idea/mivita.care.iml +++ b/.idea/mivita.care.iml @@ -2,15 +2,18 @@ - - + + + + + @@ -18,13 +21,13 @@ + - + - @@ -33,36 +36,55 @@ - - + + + + + + + + + + + + + + + + + - + + + + + @@ -70,6 +92,8 @@ + + @@ -80,6 +104,7 @@ + @@ -101,11 +126,10 @@ - - + diff --git a/.idea/php.xml b/.idea/php.xml index 9f3c863..08699a1 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -10,23 +10,19 @@ - - - - @@ -34,7 +30,6 @@ - @@ -58,7 +53,6 @@ - @@ -76,7 +70,6 @@ - @@ -96,12 +89,9 @@ - - - @@ -113,9 +103,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 646ab68..e3e6e97 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,57 +2,118 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - - + + + + + + + + + + + - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + + + + + + + @@ -268,7 +353,7 @@ - + @@ -276,18 +361,18 @@ - - + + + + - - + - @@ -469,6 +554,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -509,39 +619,49 @@ - + - - + + - + + + + + - + - + - + - + + + + + + + - + - + diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php index 1edde74..1add5b7 100644 --- a/.phpstorm.meta.php +++ b/.phpstorm.meta.php @@ -5,7 +5,7 @@ namespace PHPSTORM_META { /** * PhpStorm Meta file, to provide autocomplete information for PhpStorm - * Generated on 2020-03-07 13:24:22. + * Generated on 2020-06-12 14:15:43. * * @author Barry vd. Heuvel * @see https://github.com/barryvdh/laravel-ide-helper @@ -13,6 +13,7 @@ namespace PHPSTORM_META { override(new \Illuminate\Contracts\Container\Container, map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -27,13 +28,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -43,8 +53,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -55,9 +63,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -82,6 +95,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -120,15 +135,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -144,7 +155,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -169,6 +179,7 @@ namespace PHPSTORM_META { override(\Illuminate\Container\Container::makeWith(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -183,13 +194,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -199,8 +219,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -211,9 +229,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -238,6 +261,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -276,15 +301,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -300,7 +321,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -325,6 +345,7 @@ namespace PHPSTORM_META { override(\Illuminate\Contracts\Container\Container::make(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -339,13 +360,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -355,8 +385,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -367,9 +395,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -394,6 +427,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -432,15 +467,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -456,7 +487,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -481,6 +511,7 @@ namespace PHPSTORM_META { override(\Illuminate\Contracts\Container\Container::makeWith(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -495,13 +526,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -511,8 +551,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -523,9 +561,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -550,6 +593,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -588,15 +633,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -612,7 +653,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -637,6 +677,7 @@ namespace PHPSTORM_META { override(\App::make(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -651,13 +692,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -667,8 +717,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -679,9 +727,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -706,6 +759,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -744,15 +799,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -768,7 +819,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -793,6 +843,7 @@ namespace PHPSTORM_META { override(\App::makeWith(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -807,13 +858,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -823,8 +883,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -835,9 +893,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -862,6 +925,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -900,15 +965,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -924,7 +985,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -949,6 +1009,7 @@ namespace PHPSTORM_META { override(\app(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -963,13 +1024,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -979,8 +1049,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -991,9 +1059,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -1018,6 +1091,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -1056,15 +1131,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -1080,7 +1151,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, @@ -1105,6 +1175,7 @@ namespace PHPSTORM_META { override(\resolve(0), map([ '' => '@', 'App\Services\Yard' => \App\Services\Yard::class, + 'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class, 'Cviebrock\EloquentSluggable\SluggableObserver' => \Cviebrock\EloquentSluggable\SluggableObserver::class, 'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class, 'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class, @@ -1119,13 +1190,22 @@ namespace PHPSTORM_META { 'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class, 'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class, 'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class, + 'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class, 'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class, 'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class, 'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class, 'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class, 'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class, + 'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class, + 'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class, + 'Maatwebsite\Excel\Files\Filesystem' => \Maatwebsite\Excel\Files\Filesystem::class, + 'Maatwebsite\Excel\Files\TemporaryFileFactory' => \Maatwebsite\Excel\Files\TemporaryFileFactory::class, + 'Maatwebsite\Excel\Transactions\TransactionHandler' => \Maatwebsite\Excel\Transactions\DbTransactionHandler::class, + 'Maatwebsite\Excel\Transactions\TransactionManager' => \Maatwebsite\Excel\Transactions\TransactionManager::class, 'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class, 'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class, + 'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class, + 'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class, 'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class, 'auth' => \Illuminate\Auth\AuthManager::class, 'auth.driver' => \Illuminate\Auth\SessionGuard::class, @@ -1135,8 +1215,6 @@ namespace PHPSTORM_META { 'cache' => \Illuminate\Cache\CacheManager::class, 'cache.store' => \Illuminate\Cache\Repository::class, 'cart' => \Gloudemans\Shoppingcart\Cart::class, - 'command.app.name' => \Illuminate\Foundation\Console\AppNameCommand::class, - 'command.auth.make' => \Illuminate\Auth\Console\AuthMakeCommand::class, 'command.auth.resets.clear' => \Illuminate\Auth\Console\ClearResetsCommand::class, 'command.cache.clear' => \Illuminate\Cache\Console\ClearCommand::class, 'command.cache.forget' => \Illuminate\Cache\Console\ForgetCommand::class, @@ -1147,9 +1225,14 @@ namespace PHPSTORM_META { 'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class, 'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class, 'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::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.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class, + 'command.event.cache' => \Illuminate\Foundation\Console\EventCacheCommand::class, + 'command.event.clear' => \Illuminate\Foundation\Console\EventClearCommand::class, 'command.event.generate' => \Illuminate\Foundation\Console\EventGenerateCommand::class, + 'command.event.list' => \Illuminate\Foundation\Console\EventListCommand::class, 'command.event.make' => \Illuminate\Foundation\Console\EventMakeCommand::class, 'command.exception.make' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class, 'command.factory.make' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class, @@ -1174,6 +1257,8 @@ namespace PHPSTORM_META { 'command.notification.make' => \Illuminate\Foundation\Console\NotificationMakeCommand::class, 'command.notification.table' => \Illuminate\Notifications\Console\NotificationTableCommand::class, 'command.observer.make' => \Illuminate\Foundation\Console\ObserverMakeCommand::class, + 'command.optimize' => \Illuminate\Foundation\Console\OptimizeCommand::class, + 'command.optimize.clear' => \Illuminate\Foundation\Console\OptimizeClearCommand::class, 'command.package.discover' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class, 'command.policy.make' => \Illuminate\Foundation\Console\PolicyMakeCommand::class, 'command.preset' => \Illuminate\Foundation\Console\PresetCommand::class, @@ -1212,15 +1297,11 @@ namespace PHPSTORM_META { 'db' => \Illuminate\Database\DatabaseManager::class, 'db.connection' => \Illuminate\Database\MySqlConnection::class, 'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class, + 'dompdf' => \Dompdf\Dompdf::class, + 'dompdf.wrapper' => \Barryvdh\DomPDF\PDF::class, 'encrypter' => \Illuminate\Encryption\Encrypter::class, 'events' => \Illuminate\Events\Dispatcher::class, 'excel' => \Maatwebsite\Excel\Excel::class, - 'excel.identifier' => \Maatwebsite\Excel\Classes\FormatIdentifier::class, - 'excel.parsers.css' => \Maatwebsite\Excel\Parsers\CssParser::class, - 'excel.parsers.view' => \Maatwebsite\Excel\Parsers\ViewParser::class, - 'excel.reader' => \Maatwebsite\Excel\Readers\LaravelExcelReader::class, - 'excel.readers.html' => \Maatwebsite\Excel\Readers\Html::class, - 'excel.writer' => \Maatwebsite\Excel\Writers\LaravelExcelWriter::class, 'files' => \Illuminate\Filesystem\Filesystem::class, 'filesystem' => \Illuminate\Filesystem\FilesystemManager::class, 'filesystem.disk' => \Illuminate\Filesystem\FilesystemAdapter::class, @@ -1236,7 +1317,6 @@ namespace PHPSTORM_META { 'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class, 'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class, 'migrator' => \Illuminate\Database\Migrations\Migrator::class, - 'phpexcel' => \Maatwebsite\Excel\Classes\PHPExcel::class, 'profanityFilter' => \Askedio\Laravel5ProfanityFilter\ProfanityFilter::class, 'queue' => \Illuminate\Queue\QueueManager::class, 'queue.connection' => \Illuminate\Queue\SyncQueue::class, diff --git a/.rnd b/.rnd new file mode 100644 index 0000000..61a1bb6 Binary files /dev/null and b/.rnd differ diff --git a/_ide_helper.php b/_ide_helper.php index ea8dfcb..aea3cf0 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 5.6.39 on 2020-03-07 13:24:22. + * A helper file for Laravel, to provide autocomplete information to your IDE + * Generated for Laravel 6.18.14 on 2020-06-12 14:15:41. * * This file should not be included in your code, only analyzed by your IDE! * @@ -16,7 +16,7 @@ namespace Illuminate\Support\Facades { /** * * - * @see \Illuminate\Foundation\Application + * @see \Illuminate\Contracts\Foundation\Application */ class App { @@ -35,7 +35,7 @@ namespace Illuminate\Support\Facades { /** * Run the given array of bootstrap classes. * - * @param array $bootstrappers + * @param string[] $bootstrappers * @return void * @static */ @@ -114,7 +114,7 @@ namespace Illuminate\Support\Facades { /** * Get the path to the application "app" directory. * - * @param string $path Optionally, a path to append to the app path + * @param string $path * @return string * @static */ @@ -124,6 +124,19 @@ namespace Illuminate\Support\Facades { return $instance->path($path); } + /** + * Set the application directory. + * + * @param string $path + * @return \Illuminate\Foundation\Application + * @static + */ + public static function useAppPath($path) + { + /** @var \Illuminate\Foundation\Application $instance */ + return $instance->useAppPath($path); + } + /** * Get the base path of the Laravel installation. * @@ -316,13 +329,14 @@ namespace Illuminate\Support\Facades { /** * Get or check the current application environment. * + * @param string|array $environments * @return string|bool * @static */ - public static function environment() + public static function environment(...$environments) { /** @var \Illuminate\Foundation\Application $instance */ - return $instance->environment(); + return $instance->environment(...$environments); } /** @@ -337,6 +351,18 @@ namespace Illuminate\Support\Facades { return $instance->isLocal(); } + /** + * Determine if application is in production environment. + * + * @return bool + * @static + */ + public static function isProduction() + { + /** @var \Illuminate\Foundation\Application $instance */ + return $instance->isProduction(); + } + /** * Detect the application's current environment. * @@ -390,15 +416,14 @@ namespace Illuminate\Support\Facades { * Register a service provider with the application. * * @param \Illuminate\Support\ServiceProvider|string $provider - * @param array $options * @param bool $force * @return \Illuminate\Support\ServiceProvider * @static */ - public static function register($provider, $options = [], $force = false) + public static function register($provider, $force = false) { /** @var \Illuminate\Foundation\Application $instance */ - return $instance->register($provider, $options, $force); + return $instance->register($provider, $force); } /** @@ -481,8 +506,6 @@ namespace Illuminate\Support\Facades { /** * Resolve the given type from the container. - * - * (Overriding Container::make) * * @param string $abstract * @param array $parameters @@ -497,8 +520,6 @@ namespace Illuminate\Support\Facades { /** * Determine if the given abstract type has been bound. - * - * (Overriding Container::bound) * * @param string $abstract * @return bool @@ -537,7 +558,7 @@ namespace Illuminate\Support\Facades { /** * Register a new boot listener. * - * @param mixed $callback + * @param callable $callback * @return void * @static */ @@ -550,7 +571,7 @@ namespace Illuminate\Support\Facades { /** * Register a new "booted" listener. * - * @param mixed $callback + * @param callable $callback * @return void * @static */ @@ -655,6 +676,30 @@ namespace Illuminate\Support\Facades { return $instance->getCachedRoutesPath(); } + /** + * Determine if the application events are cached. + * + * @return bool + * @static + */ + public static function eventsAreCached() + { + /** @var \Illuminate\Foundation\Application $instance */ + return $instance->eventsAreCached(); + } + + /** + * Get the path to the events cache file. + * + * @return string + * @static + */ + public static function getCachedEventsPath() + { + /** @var \Illuminate\Foundation\Application $instance */ + return $instance->getCachedEventsPath(); + } + /** * Determine if the application is currently down for maintenance. * @@ -675,6 +720,7 @@ namespace Illuminate\Support\Facades { * @param array $headers * @return void * @throws \Symfony\Component\HttpKernel\Exception\HttpException + * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * @static */ public static function abort($code, $message = '', $headers = []) @@ -686,7 +732,7 @@ namespace Illuminate\Support\Facades { /** * Register a terminating callback with the application. * - * @param \Closure $callback + * @param callable|string $callback * @return \Illuminate\Foundation\Application * @static */ @@ -862,7 +908,7 @@ namespace Illuminate\Support\Facades { /** * Define a contextual binding. * - * @param string $concrete + * @param array|string $concrete * @return \Illuminate\Contracts\Container\ContextualBindingBuilder * @static */ @@ -1041,6 +1087,21 @@ namespace Illuminate\Support\Facades { $instance->singleton($abstract, $concrete); } + /** + * Register a shared binding if it hasn't already been registered. + * + * @param string $abstract + * @param \Closure|string|null $concrete + * @return void + * @static + */ + public static function singletonIf($abstract, $concrete = null) + { + //Method inherited from \Illuminate\Container\Container + /** @var \Illuminate\Foundation\Application $instance */ + $instance->singletonIf($abstract, $concrete); + } + /** * "Extend" an abstract type in the container. * @@ -1091,7 +1152,7 @@ namespace Illuminate\Support\Facades { * Resolve all of the bindings for a given tag. * * @param string $tag - * @return array + * @return \Illuminate\Container\iterable * @static */ public static function tagged($tag) @@ -1107,6 +1168,7 @@ namespace Illuminate\Support\Facades { * @param string $abstract * @param string $alias * @return void + * @throws \LogicException * @static */ public static function alias($abstract, $alias) @@ -1286,7 +1348,6 @@ namespace Illuminate\Support\Facades { * * @param string $abstract * @return string - * @throws \LogicException * @static */ public static function getAlias($abstract) @@ -1338,7 +1399,7 @@ namespace Illuminate\Support\Facades { } /** - * Set the globally available instance of the container. + * Get the globally available instance of the container. * * @return static * @static @@ -1432,7 +1493,7 @@ namespace Illuminate\Support\Facades { * Run the console application. * * @param \Symfony\Component\Console\Input\InputInterface $input - * @param \Symfony\Component\Console\Output\OutputInterface $output + * @param \Symfony\Component\Console\Output\OutputInterface|null $output * @return int * @static */ @@ -1492,8 +1553,9 @@ namespace Illuminate\Support\Facades { * * @param string $command * @param array $parameters - * @param \Symfony\Component\Console\Output\OutputInterface $outputBuffer + * @param \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer * @return int + * @throws \Symfony\Component\Console\Exception\CommandNotFoundException * @static */ public static function call($command, $parameters = [], $outputBuffer = null) @@ -1586,7 +1648,7 @@ namespace Illuminate\Support\Facades { /** * Attempt to get the guard from the local cache. * - * @param string $name + * @param string|null $name * @return \Illuminate\Contracts\Auth\Guard|\Illuminate\Contracts\Auth\StatefulGuard * @static */ @@ -1729,6 +1791,18 @@ namespace Illuminate\Support\Facades { return $instance->provider($name, $callback); } + /** + * Determines if any guards have already been resolved. + * + * @return bool + * @static + */ + public static function hasResolvedGuards() + { + /** @var \Illuminate\Auth\AuthManager $instance */ + return $instance->hasResolvedGuards(); + } + /** * Create the user provider implementation for the driver. * @@ -1900,6 +1974,18 @@ namespace Illuminate\Support\Facades { $instance->logout(); } + /** + * Log the user out of the application on their current device only. + * + * @return void + * @static + */ + public static function logoutCurrentDevice() + { + /** @var \Illuminate\Auth\SessionGuard $instance */ + $instance->logoutCurrentDevice(); + } + /** * Invalidate other sessions for the current user. * @@ -2091,7 +2177,7 @@ namespace Illuminate\Support\Facades { } /** - * Determine if the current user is authenticated. + * Determine if current user is authenticated. If not, throw an exception. * * @return \App\User * @throws \Illuminate\Auth\AuthenticationException @@ -2181,13 +2267,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Auth\SessionGuard::mixin($mixin); + \Illuminate\Auth\SessionGuard::mixin($mixin, $replace); } /** @@ -2214,7 +2301,7 @@ namespace Illuminate\Support\Facades { /** * Compile the view at the given path. * - * @param string $path + * @param string|null $path * @return void * @static */ @@ -2332,7 +2419,7 @@ namespace Illuminate\Support\Facades { * Register a component alias directive. * * @param string $path - * @param string $alias + * @param string|null $alias * @return void * @static */ @@ -2346,7 +2433,7 @@ namespace Illuminate\Support\Facades { * Register an include alias directive. * * @param string $path - * @param string $alias + * @param string|null $alias * @return void * @static */ @@ -2362,6 +2449,7 @@ namespace Illuminate\Support\Facades { * @param string $name * @param callable $handler * @return void + * @throws \InvalidArgumentException * @static */ public static function directive($name, $handler) @@ -2446,26 +2534,13 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ return $instance->isExpired($path); } - - /** - * Compile the default values for the echo statement. - * - * @param string $value - * @return string - * @static - */ - public static function compileEchoDefaults($value) - { - /** @var \Illuminate\View\Compilers\BladeCompiler $instance */ - return $instance->compileEchoDefaults($value); - } } /** * * - * @method static \Illuminate\Broadcasting\Broadcasters\Broadcaster channel(string $channel, callable|string $callback) + * @method static \Illuminate\Broadcasting\Broadcasters\Broadcaster channel(string $channel, callable|string $callback, array $options = []) * @method static mixed auth(\Illuminate\Http\Request $request) * @see \Illuminate\Contracts\Broadcasting\Factory */ @@ -2526,7 +2601,7 @@ namespace Illuminate\Support\Facades { /** * Get a driver instance. * - * @param string $driver + * @param string|null $driver * @return mixed * @static */ @@ -2655,7 +2730,6 @@ namespace Illuminate\Support\Facades { * * @param mixed $command * @return mixed - * @throws \RuntimeException * @static */ public static function dispatchToQueue($command) @@ -2664,6 +2738,20 @@ namespace Illuminate\Support\Facades { return $instance->dispatchToQueue($command); } + /** + * Dispatch a command to its appropriate handler after the current process. + * + * @param mixed $command + * @param mixed $handler + * @return void + * @static + */ + public static function dispatchAfterResponse($command, $handler = null) + { + /** @var \Illuminate\Bus\Dispatcher $instance */ + $instance->dispatchAfterResponse($command, $handler); + } + /** * Set the pipes through which commands should be piped before dispatching. * @@ -2704,6 +2792,20 @@ namespace Illuminate\Support\Facades { $instance->assertDispatched($command, $callback); } + /** + * Assert if a job was pushed a number of times. + * + * @param string $command + * @param int $times + * @return void + * @static + */ + public static function assertDispatchedTimes($command, $times = 1) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + $instance->assertDispatchedTimes($command, $times); + } + /** * Determine if a job was dispatched based on a truth-test callback. * @@ -2718,6 +2820,48 @@ namespace Illuminate\Support\Facades { $instance->assertNotDispatched($command, $callback); } + /** + * Assert if a job was dispatched after the response was sent based on a truth-test callback. + * + * @param string $command + * @param callable|int|null $callback + * @return void + * @static + */ + public static function assertDispatchedAfterResponse($command, $callback = null) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + $instance->assertDispatchedAfterResponse($command, $callback); + } + + /** + * Assert if a job was pushed after the response was sent a number of times. + * + * @param string $command + * @param int $times + * @return void + * @static + */ + public static function assertDispatchedAfterResponseTimes($command, $times = 1) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + $instance->assertDispatchedAfterResponseTimes($command, $times); + } + + /** + * Determine if a job was dispatched based on a truth-test callback. + * + * @param string $command + * @param callable|null $callback + * @return void + * @static + */ + public static function assertNotDispatchedAfterResponse($command, $callback = null) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + $instance->assertNotDispatchedAfterResponse($command, $callback); + } + /** * Get all of the jobs matching a truth-test callback. * @@ -2732,6 +2876,20 @@ namespace Illuminate\Support\Facades { return $instance->dispatched($command, $callback); } + /** + * Get all of the jobs dispatched after the response was sent matching a truth-test callback. + * + * @param string $command + * @param callable|null $callback + * @return \Illuminate\Support\Collection + * @static + */ + public static function dispatchedAfterResponse($command, $callback = null) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + return $instance->dispatchedAfterResponse($command, $callback); + } + /** * Determine if there are any stored commands for a given class. * @@ -2744,6 +2902,19 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ return $instance->hasDispatched($command); } + + /** + * Determine if there are any stored commands for a given class. + * + * @param string $command + * @return bool + * @static + */ + public static function hasDispatchedAfterResponse($command) + { + /** @var \Illuminate\Support\Testing\Fakes\BusFake $instance */ + return $instance->hasDispatchedAfterResponse($command); + } } @@ -2756,7 +2927,7 @@ namespace Illuminate\Support\Facades { class Cache { /** - * Get a cache store instance by name. + * Get a cache store instance by name, wrapped in a repository. * * @param string|null $name * @return \Illuminate\Contracts\Cache\Repository @@ -2772,7 +2943,7 @@ namespace Illuminate\Support\Facades { * Get a cache driver instance. * * @param string|null $driver - * @return mixed + * @return \Illuminate\Contracts\Cache\Repository * @static */ public static function driver($driver = null) @@ -2794,6 +2965,18 @@ namespace Illuminate\Support\Facades { return $instance->repository($store); } + /** + * Re-set the event dispatcher on all resolved cache repositories. + * + * @return void + * @static + */ + public static function refreshEventDispatcher() + { + /** @var \Illuminate\Cache\CacheManager $instance */ + $instance->refreshEventDispatcher(); + } + /** * Get the default cache driver name. * @@ -2819,6 +3002,19 @@ namespace Illuminate\Support\Facades { $instance->setDefaultDriver($name); } + /** + * Unset the given driver instances. + * + * @param array|string|null $name + * @return \Illuminate\Cache\CacheManager + * @static + */ + public static function forgetDriver($name = null) + { + /** @var \Illuminate\Cache\CacheManager $instance */ + return $instance->forgetDriver($name); + } + /** * Register a custom driver creator Closure. * @@ -2846,6 +3042,19 @@ namespace Illuminate\Support\Facades { return $instance->has($key); } + /** + * Determine if an item doesn't exist in the cache. + * + * @param string $key + * @return bool + * @static + */ + public static function missing($key) + { + /** @var \Illuminate\Cache\Repository $instance */ + return $instance->missing($key); + } + /** * Retrieve an item from the cache by key. * @@ -2911,14 +3120,14 @@ namespace Illuminate\Support\Facades { * * @param string $key * @param mixed $value - * @param \DateTimeInterface|\DateInterval|float|int|null $minutes - * @return void + * @param \DateTimeInterface|\DateInterval|int|null $ttl + * @return bool * @static */ - public static function put($key, $value, $minutes = null) + public static function put($key, $value, $ttl = null) { /** @var \Illuminate\Cache\Repository $instance */ - $instance->put($key, $value, $minutes); + return $instance->put($key, $value, $ttl); } /** @@ -2941,17 +3150,17 @@ namespace Illuminate\Support\Facades { } /** - * Store multiple items in the cache for a given number of minutes. + * Store multiple items in the cache for a given number of seconds. * * @param array $values - * @param \DateTimeInterface|\DateInterval|float|int $minutes - * @return void + * @param \DateTimeInterface|\DateInterval|int|null $ttl + * @return bool * @static */ - public static function putMany($values, $minutes) + public static function putMany($values, $ttl = null) { /** @var \Illuminate\Cache\Repository $instance */ - $instance->putMany($values, $minutes); + return $instance->putMany($values, $ttl); } /** @@ -2978,14 +3187,14 @@ namespace Illuminate\Support\Facades { * * @param string $key * @param mixed $value - * @param \DateTimeInterface|\DateInterval|float|int $minutes + * @param \DateTimeInterface|\DateInterval|int|null $ttl * @return bool * @static */ - public static function add($key, $value, $minutes) + public static function add($key, $value, $ttl = null) { /** @var \Illuminate\Cache\Repository $instance */ - return $instance->add($key, $value, $minutes); + return $instance->add($key, $value, $ttl); } /** @@ -3021,32 +3230,32 @@ namespace Illuminate\Support\Facades { * * @param string $key * @param mixed $value - * @return void + * @return bool * @static */ public static function forever($key, $value) { /** @var \Illuminate\Cache\Repository $instance */ - $instance->forever($key, $value); + return $instance->forever($key, $value); } /** - * Get an item from the cache, or store the default value. + * Get an item from the cache, or execute the given Closure and store the result. * * @param string $key - * @param \DateTimeInterface|\DateInterval|float|int $minutes + * @param \DateTimeInterface|\DateInterval|int|null $ttl * @param \Closure $callback * @return mixed * @static */ - public static function remember($key, $minutes, $callback) + public static function remember($key, $ttl, $callback) { /** @var \Illuminate\Cache\Repository $instance */ - return $instance->remember($key, $minutes, $callback); + return $instance->remember($key, $ttl, $callback); } /** - * Get an item from the cache, or store the default value forever. + * Get an item from the cache, or execute the given Closure and store the result forever. * * @param string $key * @param \Closure $callback @@ -3060,7 +3269,7 @@ namespace Illuminate\Support\Facades { } /** - * Get an item from the cache, or store the default value forever. + * Get an item from the cache, or execute the given Closure and store the result forever. * * @param string $key * @param \Closure $callback @@ -3146,7 +3355,7 @@ namespace Illuminate\Support\Facades { /** * Get the default cache time. * - * @return float|int + * @return int|null * @static */ public static function getDefaultCacheTime() @@ -3156,16 +3365,16 @@ namespace Illuminate\Support\Facades { } /** - * Set the default cache time in minutes. + * Set the default cache time in seconds. * - * @param float|int $minutes + * @param int|null $seconds * @return \Illuminate\Cache\Repository * @static */ - public static function setDefaultCacheTime($minutes) + public static function setDefaultCacheTime($seconds) { /** @var \Illuminate\Cache\Repository $instance */ - return $instance->setDefaultCacheTime($minutes); + return $instance->setDefaultCacheTime($seconds); } /** @@ -3180,6 +3389,18 @@ namespace Illuminate\Support\Facades { return $instance->getStore(); } + /** + * Get the event dispatcher instance. + * + * @return \Illuminate\Contracts\Events\Dispatcher + * @static + */ + public static function getEventDispatcher() + { + /** @var \Illuminate\Cache\Repository $instance */ + return $instance->getEventDispatcher(); + } + /** * Set the event dispatcher instance. * @@ -3263,13 +3484,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Cache\Repository::mixin($mixin); + \Illuminate\Cache\Repository::mixin($mixin, $replace); } /** @@ -3518,8 +3740,8 @@ namespace Illuminate\Support\Facades { * @param string $name * @param string $value * @param int $minutes - * @param string $path - * @param string $domain + * @param string|null $path + * @param string|null $domain * @param bool|null $secure * @param bool $httpOnly * @param bool $raw @@ -3538,8 +3760,8 @@ namespace Illuminate\Support\Facades { * * @param string $name * @param string $value - * @param string $path - * @param string $domain + * @param string|null $path + * @param string|null $domain * @param bool|null $secure * @param bool $httpOnly * @param bool $raw @@ -3557,8 +3779,8 @@ namespace Illuminate\Support\Facades { * Expire the given cookie. * * @param string $name - * @param string $path - * @param string $domain + * @param string|null $path + * @param string|null $domain * @return \Symfony\Component\HttpFoundation\Cookie * @static */ @@ -3572,13 +3794,14 @@ namespace Illuminate\Support\Facades { * Determine if a cookie has been queued. * * @param string $key + * @param string|null $path * @return bool * @static */ - public static function hasQueued($key) + public static function hasQueued($key, $path = null) { /** @var \Illuminate\Cookie\CookieJar $instance */ - return $instance->hasQueued($key); + return $instance->hasQueued($key, $path); } /** @@ -3586,13 +3809,14 @@ namespace Illuminate\Support\Facades { * * @param string $key * @param mixed $default + * @param string|null $path * @return \Symfony\Component\HttpFoundation\Cookie * @static */ - public static function queued($key, $default = null) + public static function queued($key, $default = null, $path = null) { /** @var \Illuminate\Cookie\CookieJar $instance */ - return $instance->queued($key, $default); + return $instance->queued($key, $default, $path); } /** @@ -3612,13 +3836,14 @@ namespace Illuminate\Support\Facades { * Remove a cookie from the queue. * * @param string $name + * @param string|null $path * @return void * @static */ - public static function unqueue($name) + public static function unqueue($name, $path = null) { /** @var \Illuminate\Cookie\CookieJar $instance */ - $instance->unqueue($name); + $instance->unqueue($name, $path); } /** @@ -3627,7 +3852,7 @@ namespace Illuminate\Support\Facades { * @param string $path * @param string $domain * @param bool $secure - * @param string $sameSite + * @param string|null $sameSite * @return \Illuminate\Cookie\CookieJar * @static */ @@ -3648,6 +3873,45 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\Cookie\CookieJar $instance */ return $instance->getQueuedCookies(); } + + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * @return void + * @static + */ + public static function macro($name, $macro) + { + \Illuminate\Cookie\CookieJar::macro($name, $macro); + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * @param bool $replace + * @return void + * @throws \ReflectionException + * @static + */ + public static function mixin($mixin, $replace = true) + { + \Illuminate\Cookie\CookieJar::mixin($mixin, $replace); + } + + /** + * Checks if macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + return \Illuminate\Cookie\CookieJar::hasMacro($name); + } } @@ -3703,6 +3967,7 @@ namespace Illuminate\Support\Facades { * * @param string $value * @return string + * @throws \Illuminate\Contracts\Encryption\EncryptException * @static */ public static function encryptString($value) @@ -3714,7 +3979,7 @@ namespace Illuminate\Support\Facades { /** * Decrypt the given value. * - * @param mixed $payload + * @param string $payload * @param bool $unserialize * @return mixed * @throws \Illuminate\Contracts\Encryption\DecryptException @@ -3731,6 +3996,7 @@ namespace Illuminate\Support\Facades { * * @param string $payload * @return string + * @throws \Illuminate\Contracts\Encryption\DecryptException * @static */ public static function decryptString($payload) @@ -3764,7 +4030,7 @@ namespace Illuminate\Support\Facades { /** * Get a database connection instance. * - * @param string $name + * @param string|null $name * @return \Illuminate\Database\Connection * @static */ @@ -3777,7 +4043,7 @@ namespace Illuminate\Support\Facades { /** * Disconnect from the given database and remove from local cache. * - * @param string $name + * @param string|null $name * @return void * @static */ @@ -3790,7 +4056,7 @@ namespace Illuminate\Support\Facades { /** * Disconnect from the given database. * - * @param string $name + * @param string|null $name * @return void * @static */ @@ -3803,7 +4069,7 @@ namespace Illuminate\Support\Facades { /** * Reconnect to the given database. * - * @param string $name + * @param string|null $name * @return \Illuminate\Database\Connection * @static */ @@ -3888,6 +4154,19 @@ namespace Illuminate\Support\Facades { return $instance->getConnections(); } + /** + * Set the database reconnector callback. + * + * @param callable $reconnector + * @return void + * @static + */ + public static function setReconnector($reconnector) + { + /** @var \Illuminate\Database\DatabaseManager $instance */ + $instance->setReconnector($reconnector); + } + /** * Get a schema builder instance for the connection. * @@ -3900,20 +4179,6 @@ namespace Illuminate\Support\Facades { 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) - { - /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->bindValues($statement, $bindings); - } - /** * Set the query grammar to the default implementation. * @@ -3956,15 +4221,16 @@ namespace Illuminate\Support\Facades { /** * Begin a fluent query against a database table. * - * @param string $table + * @param \Closure|\Illuminate\Database\Query\Builder|string $table + * @param string|null $as * @return \Illuminate\Database\Query\Builder * @static */ - public static function table($table) + public static function table($table, $as = null) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - return $instance->table($table); + return $instance->table($table, $as); } /** @@ -4146,6 +4412,21 @@ namespace Illuminate\Support\Facades { 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 \Illuminate\Database\MySqlConnection $instance */ + $instance->bindValues($statement, $bindings); + } + /** * Prepare the query bindings for execution. * @@ -4285,6 +4566,19 @@ namespace Illuminate\Support\Facades { return $instance->getPdo(); } + /** + * Get the current PDO connection parameter without executing any reconnect logic. + * + * @return \PDO|\Closure|null + * @static + */ + public static function getRawPdo() + { + //Method inherited from \Illuminate\Database\Connection + /** @var \Illuminate\Database\MySqlConnection $instance */ + return $instance->getRawPdo(); + } + /** * Get the current PDO connection used for reading. * @@ -4298,6 +4592,19 @@ namespace Illuminate\Support\Facades { return $instance->getReadPdo(); } + /** + * Get the current read PDO connection parameter without executing any reconnect logic. + * + * @return \PDO|\Closure|null + * @static + */ + public static function getRawReadPdo() + { + //Method inherited from \Illuminate\Database\Connection + /** @var \Illuminate\Database\MySqlConnection $instance */ + return $instance->getRawReadPdo(); + } + /** * Set the PDO connection. * @@ -4326,20 +4633,6 @@ namespace Illuminate\Support\Facades { return $instance->setReadPdo($pdo); } - /** - * Set the reconnect instance on the connection. - * - * @param callable $reconnector - * @return \Illuminate\Database\MySqlConnection - * @static - */ - public static function setReconnector($reconnector) - { - //Method inherited from \Illuminate\Database\Connection - /** @var \Illuminate\Database\MySqlConnection $instance */ - return $instance->setReconnector($reconnector); - } - /** * Get the database connection name. * @@ -4397,14 +4690,14 @@ namespace Illuminate\Support\Facades { * Set the query grammar used by the connection. * * @param \Illuminate\Database\Query\Grammars\Grammar $grammar - * @return void + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setQueryGrammar($grammar) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->setQueryGrammar($grammar); + return $instance->setQueryGrammar($grammar); } /** @@ -4424,14 +4717,14 @@ namespace Illuminate\Support\Facades { * Set the schema grammar used by the connection. * * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar - * @return void + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setSchemaGrammar($grammar) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->setSchemaGrammar($grammar); + return $instance->setSchemaGrammar($grammar); } /** @@ -4451,14 +4744,14 @@ namespace Illuminate\Support\Facades { * Set the query post processor used by the connection. * * @param \Illuminate\Database\Query\Processors\Processor $processor - * @return void + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setPostProcessor($processor) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->setPostProcessor($processor); + return $instance->setPostProcessor($processor); } /** @@ -4478,14 +4771,14 @@ namespace Illuminate\Support\Facades { * Set the event dispatcher instance on the connection. * * @param \Illuminate\Contracts\Events\Dispatcher $events - * @return void + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setEventDispatcher($events) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->setEventDispatcher($events); + return $instance->setEventDispatcher($events); } /** @@ -4502,7 +4795,7 @@ namespace Illuminate\Support\Facades { } /** - * Determine if the connection in a "dry run". + * Determine if the connection is in a "dry run". * * @return bool * @static @@ -4596,7 +4889,7 @@ namespace Illuminate\Support\Facades { * Set the name of the connected database. * * @param string $database - * @return string + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setDatabaseName($database) @@ -4623,14 +4916,14 @@ namespace Illuminate\Support\Facades { * Set the table prefix in use by the connection. * * @param string $prefix - * @return void + * @return \Illuminate\Database\MySqlConnection * @static */ public static function setTablePrefix($prefix) { //Method inherited from \Illuminate\Database\Connection /** @var \Illuminate\Database\MySqlConnection $instance */ - $instance->setTablePrefix($prefix); + return $instance->setTablePrefix($prefix); } /** @@ -4758,7 +5051,7 @@ namespace Illuminate\Support\Facades { * Register an event listener with the dispatcher. * * @param string|array $events - * @param mixed $listener + * @param \Closure|string $listener * @return void * @static */ @@ -4781,6 +5074,19 @@ namespace Illuminate\Support\Facades { return $instance->hasListeners($eventName); } + /** + * Determine if the given event has any wildcard listeners. + * + * @param string $eventName + * @return bool + * @static + */ + public static function hasWildcardListeners($eventName) + { + /** @var \Illuminate\Events\Dispatcher $instance */ + return $instance->hasWildcardListeners($eventName); + } + /** * Register an event and payload to be fired later. * @@ -4835,21 +5141,6 @@ namespace Illuminate\Support\Facades { return $instance->until($event, $payload); } - /** - * Fire an event and call the listeners. - * - * @param string|object $event - * @param mixed $payload - * @param bool $halt - * @return array|null - * @static - */ - public static function fire($event, $payload = [], $halt = false) - { - /** @var \Illuminate\Events\Dispatcher $instance */ - return $instance->fire($event, $payload, $halt); - } - /** * Fire an event and call the listeners. * @@ -4944,6 +5235,45 @@ namespace Illuminate\Support\Facades { return $instance->setQueueResolver($resolver); } + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * @return void + * @static + */ + public static function macro($name, $macro) + { + \Illuminate\Events\Dispatcher::macro($name, $macro); + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * @param bool $replace + * @return void + * @throws \ReflectionException + * @static + */ + public static function mixin($mixin, $replace = true) + { + \Illuminate\Events\Dispatcher::mixin($mixin, $replace); + } + + /** + * Checks if macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + return \Illuminate\Events\Dispatcher::hasMacro($name); + } + /** * Assert if an event was dispatched based on a truth-test callback. * @@ -5035,6 +5365,19 @@ namespace Illuminate\Support\Facades { return $instance->exists($path); } + /** + * Determine if a file or directory is missing. + * + * @param string $path + * @return bool + * @static + */ + public static function missing($path) + { + /** @var \Illuminate\Filesystem\Filesystem $instance */ + return $instance->missing($path); + } + /** * Get the contents of a file. * @@ -5109,7 +5452,7 @@ namespace Illuminate\Support\Facades { * @param string $path * @param string $contents * @param bool $lock - * @return int + * @return int|bool * @static */ public static function put($path, $contents, $lock = false) @@ -5118,6 +5461,20 @@ namespace Illuminate\Support\Facades { return $instance->put($path, $contents, $lock); } + /** + * Write the contents of a file, replacing it atomically if it already exists. + * + * @param string $path + * @param string $content + * @return void + * @static + */ + public static function replace($path, $content) + { + /** @var \Illuminate\Filesystem\Filesystem $instance */ + $instance->replace($path, $content); + } + /** * Prepend to a file. * @@ -5150,7 +5507,7 @@ namespace Illuminate\Support\Facades { * Get or set UNIX mode of a file or directory. * * @param string $path - * @param int $mode + * @param int|null $mode * @return mixed * @static */ @@ -5202,7 +5559,7 @@ namespace Illuminate\Support\Facades { } /** - * Create a hard link to the target file or directory. + * Create a symlink to the target file or directory. On Windows, a hard link is created if the target is a file. * * @param string $target * @param string $link @@ -5426,6 +5783,21 @@ namespace Illuminate\Support\Facades { return $instance->directories($directory); } + /** + * Ensure a directory exists. + * + * @param string $path + * @param int $mode + * @param bool $recursive + * @return void + * @static + */ + public static function ensureDirectoryExists($path, $mode = 493, $recursive = true) + { + /** @var \Illuminate\Filesystem\Filesystem $instance */ + $instance->ensureDirectoryExists($path, $mode, $recursive); + } + /** * Create a directory. * @@ -5462,7 +5834,7 @@ namespace Illuminate\Support\Facades { * * @param string $directory * @param string $destination - * @param int $options + * @param int|null $options * @return bool * @static */ @@ -5531,13 +5903,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Filesystem\Filesystem::mixin($mixin); + \Illuminate\Filesystem\Filesystem::mixin($mixin, $replace); } /** @@ -5700,6 +6073,20 @@ namespace Illuminate\Support\Facades { return $instance->any($abilities, $arguments); } + /** + * Determine if all of the given abilities should be denied for the current user. + * + * @param \Illuminate\Auth\Access\iterable|string $abilities + * @param array|mixed $arguments + * @return bool + * @static + */ + public static function none($abilities, $arguments = []) + { + /** @var \Illuminate\Auth\Access\Gate $instance */ + return $instance->none($abilities, $arguments); + } + /** * Determine if the given ability should be granted for the current user. * @@ -5715,6 +6102,35 @@ namespace Illuminate\Support\Facades { return $instance->authorize($ability, $arguments); } + /** + * Inspect the user for the given ability. + * + * @param string $ability + * @param array|mixed $arguments + * @return \Illuminate\Auth\Access\Response + * @static + */ + public static function inspect($ability, $arguments = []) + { + /** @var \Illuminate\Auth\Access\Gate $instance */ + return $instance->inspect($ability, $arguments); + } + + /** + * Get the raw result from the authorization callback. + * + * @param string $ability + * @param array|mixed $arguments + * @return mixed + * @throws \Illuminate\Auth\Access\AuthorizationException + * @static + */ + public static function raw($ability, $arguments = []) + { + /** @var \Illuminate\Auth\Access\Gate $instance */ + return $instance->raw($ability, $arguments); + } + /** * Get a policy instance for a given class. * @@ -5728,11 +6144,25 @@ namespace Illuminate\Support\Facades { return $instance->getPolicyFor($class); } + /** + * Specify a callback to be used to guess policy names. + * + * @param callable $callback + * @return \Illuminate\Auth\Access\Gate + * @static + */ + public static function guessPolicyNamesUsing($callback) + { + /** @var \Illuminate\Auth\Access\Gate $instance */ + return $instance->guessPolicyNamesUsing($callback); + } + /** * Build a policy class instance of the given type. * * @param object|string $class * @return mixed + * @throws \Illuminate\Contracts\Container\BindingResolutionException * @static */ public static function resolvePolicy($class) @@ -5800,7 +6230,7 @@ namespace Illuminate\Support\Facades { } /** - * Create an instance of the Argon2 hash Driver. + * Create an instance of the Argon2i hash Driver. * * @return \Illuminate\Hashing\ArgonHasher * @static @@ -5811,6 +6241,18 @@ namespace Illuminate\Support\Facades { return $instance->createArgonDriver(); } + /** + * Create an instance of the Argon2id hash Driver. + * + * @return \Illuminate\Hashing\Argon2IdHasher + * @static + */ + public static function createArgon2idDriver() + { + /** @var \Illuminate\Hashing\HashManager $instance */ + return $instance->createArgon2idDriver(); + } + /** * Get information about the given hashed value. * @@ -5960,21 +6402,6 @@ namespace Illuminate\Support\Facades { return $instance->has($key, $locale, $fallback); } - /** - * Get the translation for a given key. - * - * @param string $key - * @param array $replace - * @param string $locale - * @return string|array|null - * @static - */ - public static function trans($key, $replace = [], $locale = null) - { - /** @var \Illuminate\Translation\Translator $instance */ - return $instance->trans($key, $replace, $locale); - } - /** * Get the translation for the given key. * @@ -5982,7 +6409,7 @@ namespace Illuminate\Support\Facades { * @param array $replace * @param string|null $locale * @param bool $fallback - * @return string|array|null + * @return string|array * @static */ public static function get($key, $replace = [], $locale = null, $fallback = true) @@ -5991,44 +6418,13 @@ namespace Illuminate\Support\Facades { return $instance->get($key, $replace, $locale, $fallback); } - /** - * Get the translation for a given key from the JSON translation files. - * - * @param string $key - * @param array $replace - * @param string $locale - * @return string|array|null - * @static - */ - public static function getFromJson($key, $replace = [], $locale = null) - { - /** @var \Illuminate\Translation\Translator $instance */ - return $instance->getFromJson($key, $replace, $locale); - } - /** * Get a translation according to an integer value. * * @param string $key - * @param int|array|\Countable $number + * @param \Countable|int|array $number * @param array $replace - * @param string $locale - * @return string - * @static - */ - public static function transChoice($key, $number, $replace = [], $locale = null) - { - /** @var \Illuminate\Translation\Translator $instance */ - return $instance->transChoice($key, $number, $replace, $locale); - } - - /** - * Get a translation according to an integer value. - * - * @param string $key - * @param int|array|\Countable $number - * @param array $replace - * @param string $locale + * @param string|null $locale * @return string * @static */ @@ -6252,13 +6648,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Translation\Translator::mixin($mixin); + \Illuminate\Translation\Translator::mixin($mixin, $replace); } /** @@ -6282,118 +6679,6 @@ namespace Illuminate\Support\Facades { */ class Log { - /** - * Adds a log record at the DEBUG level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function debug($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addDebug($message, $context); - } - - /** - * Adds a log record at the INFO level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function info($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addInfo($message, $context); - } - - /** - * Adds a log record at the NOTICE level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function notice($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addNotice($message, $context); - } - - /** - * Adds a log record at the WARNING level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function warning($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addWarning($message, $context); - } - - /** - * Adds a log record at the ERROR level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function error($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addError($message, $context); - } - - /** - * Adds a log record at the CRITICAL level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function critical($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addCritical($message, $context); - } - - /** - * Adds a log record at the ALERT level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function alert($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addAlert($message, $context); - } - - /** - * Adds a log record at the EMERGENCY level. - * - * @param string $message The log message - * @param array $context The log context - * @return bool Whether the record has been processed - * @static - */ - public static function emergency($message, $context = []) - { - /** @var \Monolog\Logger $instance */ - return $instance->addEmergency($message, $context); - } - /** * Create a new, on-demand aggregate logger instance. * @@ -6412,7 +6697,7 @@ namespace Illuminate\Support\Facades { * Get a log channel instance. * * @param string|null $channel - * @return mixed + * @return \Psr\Log\LoggerInterface * @static */ public static function channel($channel = null) @@ -6425,7 +6710,7 @@ namespace Illuminate\Support\Facades { * Get a log driver instance. * * @param string|null $driver - * @return mixed + * @return \Psr\Log\LoggerInterface * @static */ public static function driver($driver = null) @@ -6434,6 +6719,18 @@ namespace Illuminate\Support\Facades { return $instance->driver($driver); } + /** + * + * + * @return array + * @static + */ + public static function getChannels() + { + /** @var \Illuminate\Log\LogManager $instance */ + return $instance->getChannels(); + } + /** * Get the default log driver name. * @@ -6473,6 +6770,142 @@ namespace Illuminate\Support\Facades { return $instance->extend($driver, $callback); } + /** + * Unset the given channel instance. + * + * @param string|null $name + * @return \Illuminate\Log\LogManager + * @static + */ + public static function forgetChannel($driver = null) + { + /** @var \Illuminate\Log\LogManager $instance */ + return $instance->forgetChannel($driver); + } + + /** + * System is unusable. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function emergency($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->emergency($message, $context); + } + + /** + * Action must be taken immediately. + * + * Example: Entire website down, database unavailable, etc. This should + * trigger the SMS alerts and wake you up. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function alert($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->alert($message, $context); + } + + /** + * Critical conditions. + * + * Example: Application component unavailable, unexpected exception. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function critical($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->critical($message, $context); + } + + /** + * Runtime errors that do not require immediate action but should typically + * be logged and monitored. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function error($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->error($message, $context); + } + + /** + * Exceptional occurrences that are not errors. + * + * Example: Use of deprecated APIs, poor use of an API, undesirable things + * that are not necessarily wrong. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function warning($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->warning($message, $context); + } + + /** + * Normal but significant events. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function notice($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->notice($message, $context); + } + + /** + * Interesting events. + * + * Example: User logs in, SQL logs. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function info($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->info($message, $context); + } + + /** + * Detailed debug information. + * + * @param string $message + * @param array $context + * @return void + * @static + */ + public static function debug($message, $context = []) + { + /** @var \Illuminate\Log\LogManager $instance */ + $instance->debug($message, $context); + } + /** * Logs with an arbitrary level. * @@ -6494,6 +6927,7 @@ namespace Illuminate\Support\Facades { * * * @see \Illuminate\Mail\Mailer + * @see \Illuminate\Support\Testing\Fakes\MailFake */ class Mail { @@ -6552,6 +6986,19 @@ namespace Illuminate\Support\Facades { 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. * @@ -6580,7 +7027,7 @@ namespace Illuminate\Support\Facades { } /** - * Send a new message when only a raw text part. + * Send a new message with only a raw text part. * * @param string $text * @param mixed $callback @@ -6594,7 +7041,7 @@ namespace Illuminate\Support\Facades { } /** - * Send a new message when only a plain part. + * Send a new message with only a plain part. * * @param string $view * @param array $data @@ -6625,9 +7072,9 @@ namespace Illuminate\Support\Facades { /** * Send a new message using a view. * - * @param string|array|\Illuminate\Mail\MailableContract $view + * @param \Illuminate\Contracts\Mail\Mailable|string|array $view * @param array $data - * @param \Closure|string $callback + * @param \Closure|string|null $callback * @return void * @static */ @@ -6640,9 +7087,10 @@ namespace Illuminate\Support\Facades { /** * Queue a new e-mail message for sending. * - * @param string|array|\Illuminate\Mail\MailableContract $view + * @param \Illuminate\Contracts\Mail\Mailable $view * @param string|null $queue * @return mixed + * @throws \InvalidArgumentException * @static */ public static function queue($view, $queue = null) @@ -6655,7 +7103,7 @@ namespace Illuminate\Support\Facades { * Queue a new e-mail message for sending on the given queue. * * @param string $queue - * @param string|array $view + * @param \Illuminate\Contracts\Mail\Mailable $view * @return mixed * @static */ @@ -6671,7 +7119,7 @@ namespace Illuminate\Support\Facades { * This method didn't match rest of framework's "onQueue" phrasing. Added "onQueue". * * @param string $queue - * @param string|array $view + * @param \Illuminate\Contracts\Mail\Mailable $view * @return mixed * @static */ @@ -6685,9 +7133,10 @@ namespace Illuminate\Support\Facades { * Queue a new e-mail message for sending after (n) seconds. * * @param \DateTimeInterface|\DateInterval|int $delay - * @param string|array|\Illuminate\Mail\MailableContract $view + * @param \Illuminate\Contracts\Mail\Mailable $view * @param string|null $queue * @return mixed + * @throws \InvalidArgumentException * @static */ public static function later($delay, $view, $queue = null) @@ -6701,7 +7150,7 @@ namespace Illuminate\Support\Facades { * * @param string $queue * @param \DateTimeInterface|\DateInterval|int $delay - * @param string|array $view + * @param \Illuminate\Contracts\Mail\Mailable $view * @return mixed * @static */ @@ -6712,15 +7161,15 @@ namespace Illuminate\Support\Facades { } /** - * Get the view factory instance. + * Get the array of failed recipients. * - * @return \Illuminate\Contracts\View\Factory + * @return array * @static */ - public static function getViewFactory() + public static function failures() { /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->getViewFactory(); + return $instance->failures(); } /** @@ -6736,15 +7185,15 @@ namespace Illuminate\Support\Facades { } /** - * Get the array of failed recipients. + * Get the view factory instance. * - * @return array + * @return \Illuminate\Contracts\View\Factory * @static */ - public static function failures() + public static function getViewFactory() { /** @var \Illuminate\Mail\Mailer $instance */ - return $instance->failures(); + return $instance->getViewFactory(); } /** @@ -6790,13 +7239,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Mail\Mailer::mixin($mixin); + \Illuminate\Mail\Mailer::mixin($mixin, $replace); } /** @@ -7033,6 +7483,19 @@ namespace Illuminate\Support\Facades { $instance->deliverVia($channel); } + /** + * Set the locale of notifications. + * + * @param string $locale + * @return \Illuminate\Notifications\ChannelManager + * @static + */ + public static function locale($locale) + { + /** @var \Illuminate\Notifications\ChannelManager $instance */ + return $instance->locale($locale); + } + /** * Get a driver instance. * @@ -7083,6 +7546,7 @@ namespace Illuminate\Support\Facades { * @param string $notification * @param callable|null $callback * @return void + * @throws \Exception * @static */ public static function assertSentTo($notifiable, $notification, $callback = null) @@ -7113,6 +7577,7 @@ namespace Illuminate\Support\Facades { * @param string $notification * @param callable|null $callback * @return void + * @throws \Exception * @static */ public static function assertNotSentTo($notifiable, $notification, $callback = null) @@ -7175,6 +7640,45 @@ namespace Illuminate\Support\Facades { /** @var \Illuminate\Support\Testing\Fakes\NotificationFake $instance */ return $instance->hasSent($notifiable, $notification); } + + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * @return void + * @static + */ + public static function macro($name, $macro) + { + \Illuminate\Support\Testing\Fakes\NotificationFake::macro($name, $macro); + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * @param bool $replace + * @return void + * @throws \ReflectionException + * @static + */ + public static function mixin($mixin, $replace = true) + { + \Illuminate\Support\Testing\Fakes\NotificationFake::mixin($mixin, $replace); + } + + /** + * Checks if macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + return \Illuminate\Support\Testing\Fakes\NotificationFake::hasMacro($name); + } } @@ -7183,8 +7687,6 @@ namespace Illuminate\Support\Facades { * * @method static string sendResetLink(array $credentials) * @method static mixed reset(array $credentials, \Closure $callback) - * @method static void validator(\Closure $callback) - * @method static bool validateNewPassword(array $credentials) * @see \Illuminate\Auth\Passwords\PasswordBroker */ class Password { @@ -7318,7 +7820,7 @@ namespace Illuminate\Support\Facades { /** * Determine if the driver is connected. * - * @param string $name + * @param string|null $name * @return bool * @static */ @@ -7331,7 +7833,7 @@ namespace Illuminate\Support\Facades { /** * Resolve a queue connection instance. * - * @param string $name + * @param string|null $name * @return \Illuminate\Contracts\Queue\Queue * @static */ @@ -7397,7 +7899,7 @@ namespace Illuminate\Support\Facades { /** * Get the full name for the given connection. * - * @param string $connection + * @param string|null $connection * @return string * @static */ @@ -7407,18 +7909,6 @@ namespace Illuminate\Support\Facades { return $instance->getName($connection); } - /** - * Determine if the application is in maintenance mode. - * - * @return bool - * @static - */ - public static function isDownForMaintenance() - { - /** @var \Illuminate\Queue\QueueManager $instance */ - return $instance->isDownForMaintenance(); - } - /** * Assert if a job was pushed based on a truth-test callback. * @@ -7463,6 +7953,20 @@ namespace Illuminate\Support\Facades { $instance->assertPushedWithChain($job, $expectedChain, $callback); } + /** + * Assert if a job was pushed with an empty chain based on a truth-test callback. + * + * @param string $job + * @param callable|null $callback + * @return void + * @static + */ + public static function assertPushedWithoutChain($job, $callback = null) + { + /** @var \Illuminate\Support\Testing\Fakes\QueueFake $instance */ + $instance->assertPushedWithoutChain($job, $callback); + } + /** * Determine if a job was pushed based on a truth-test callback. * @@ -7519,7 +8023,7 @@ namespace Illuminate\Support\Facades { /** * Get the size of the queue. * - * @param string $queue + * @param string|null $queue * @return int * @static */ @@ -7534,7 +8038,7 @@ namespace Illuminate\Support\Facades { * * @param string $job * @param mixed $data - * @param string $queue + * @param string|null $queue * @return mixed * @static */ @@ -7548,7 +8052,7 @@ namespace Illuminate\Support\Facades { * Push a raw payload onto the queue. * * @param string $payload - * @param string $queue + * @param string|null $queue * @param array $options * @return mixed * @static @@ -7562,10 +8066,10 @@ namespace Illuminate\Support\Facades { /** * Push a new job onto the queue after a delay. * - * @param \DateTime|int $delay + * @param \DateTimeInterface|\DateInterval|int $delay * @param string $job * @param mixed $data - * @param string $queue + * @param string|null $queue * @return mixed * @static */ @@ -7594,7 +8098,7 @@ namespace Illuminate\Support\Facades { * Push a new job onto the queue after a delay. * * @param string $queue - * @param \DateTime|int $delay + * @param \DateTimeInterface|\DateInterval|int $delay * @param string $job * @param mixed $data * @return mixed @@ -7609,7 +8113,7 @@ namespace Illuminate\Support\Facades { /** * Pop the next job off of the queue. * - * @param string $queue + * @param string|null $queue * @return \Illuminate\Contracts\Queue\Job|null * @static */ @@ -7624,7 +8128,7 @@ namespace Illuminate\Support\Facades { * * @param array $jobs * @param mixed $data - * @param string $queue + * @param string|null $queue * @return mixed * @static */ @@ -7634,6 +8138,18 @@ namespace Illuminate\Support\Facades { return $instance->bulk($jobs, $data, $queue); } + /** + * Get the jobs that have been pushed. + * + * @return array + * @static + */ + public static function pushedJobs() + { + /** @var \Illuminate\Support\Testing\Fakes\QueueFake $instance */ + return $instance->pushedJobs(); + } + /** * Get the connection name for the queue. * @@ -7659,6 +8175,20 @@ namespace Illuminate\Support\Facades { return $instance->setConnectionName($name); } + /** + * Get the retry delay for an object-based queue handler. + * + * @param mixed $job + * @return mixed + * @static + */ + public static function getJobRetryDelay($job) + { + //Method inherited from \Illuminate\Queue\Queue + /** @var \Illuminate\Queue\SyncQueue $instance */ + return $instance->getJobRetryDelay($job); + } + /** * Get the expiration timestamp for an object-based queue handler. * @@ -7673,6 +8203,19 @@ namespace Illuminate\Support\Facades { return $instance->getJobExpiration($job); } + /** + * Register a callback to be executed when creating job payloads. + * + * @param callable $callback + * @return void + * @static + */ + public static function createPayloadUsing($callback) + { + //Method inherited from \Illuminate\Queue\Queue + \Illuminate\Queue\SyncQueue::createPayloadUsing($callback); + } + /** * Set the IoC container instance. * @@ -7744,7 +8287,7 @@ namespace Illuminate\Support\Facades { * @param string $path * @param int $status * @param array $headers - * @param bool $secure + * @param bool|null $secure * @return \Illuminate\Http\RedirectResponse * @static */ @@ -7760,7 +8303,7 @@ namespace Illuminate\Support\Facades { * @param string $default * @param int $status * @param array $headers - * @param bool $secure + * @param bool|null $secure * @return \Illuminate\Http\RedirectResponse * @static */ @@ -7770,13 +8313,26 @@ namespace Illuminate\Support\Facades { return $instance->intended($default, $status, $headers, $secure); } + /** + * Set the intended url. + * + * @param string $url + * @return void + * @static + */ + public static function setIntendedUrl($url) + { + /** @var \Illuminate\Routing\Redirector $instance */ + $instance->setIntendedUrl($url); + } + /** * Create a new redirect response to the given path. * * @param string $path * @param int $status * @param array $headers - * @param bool $secure + * @param bool|null $secure * @return \Illuminate\Http\RedirectResponse * @static */ @@ -7835,7 +8391,7 @@ namespace Illuminate\Support\Facades { /** * Create a new redirect response to a controller action. * - * @param string $action + * @param string|array $action * @param mixed $parameters * @param int $status * @param array $headers @@ -7890,13 +8446,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Routing\Redirector::mixin($mixin); + \Illuminate\Routing\Redirector::mixin($mixin, $replace); } /** @@ -7916,6 +8473,7 @@ namespace Illuminate\Support\Facades { /** * * + * @method static mixed filterFiles(mixed $files) * @see \Illuminate\Http\Request */ class Request { @@ -8117,6 +8675,18 @@ namespace Illuminate\Support\Facades { return $instance->pjax(); } + /** + * Determine if the request is the result of an prefetch call. + * + * @return bool + * @static + */ + public static function prefetch() + { + /** @var \Illuminate\Http\Request $instance */ + return $instance->prefetch(); + } + /** * Determine if the request is over HTTPS. * @@ -8132,7 +8702,7 @@ namespace Illuminate\Support\Facades { /** * Get the client IP address. * - * @return string + * @return string|null * @static */ public static function ip() @@ -8156,7 +8726,7 @@ namespace Illuminate\Support\Facades { /** * Get the client user agent. * - * @return string + * @return string|null * @static */ public static function userAgent() @@ -8210,7 +8780,7 @@ namespace Illuminate\Support\Facades { /** * Get the JSON payload for the request. * - * @param string $key + * @param string|null $key * @param mixed $default * @return \Symfony\Component\HttpFoundation\ParameterBag|mixed * @static @@ -8238,7 +8808,7 @@ namespace Illuminate\Support\Facades { * Create an Illuminate request from a Symfony instance. * * @param \Symfony\Component\HttpFoundation\Request $request - * @return \Illuminate\Http\Request + * @return static * @static */ public static function createFromBase($request) @@ -8319,13 +8889,14 @@ namespace Illuminate\Support\Facades { * Get the route handling the request. * * @param string|null $param - * @return \Illuminate\Routing\Route|object|string + * @param mixed $default + * @return \Illuminate\Routing\Route|object|string|null * @static */ - public static function route($param = null) + public static function route($param = null, $default = null) { /** @var \Illuminate\Http\Request $instance */ - return $instance->route($param); + return $instance->route($param, $default); } /** @@ -9385,7 +9956,9 @@ 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. + * + * 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 */ @@ -9622,7 +10195,7 @@ namespace Illuminate\Support\Facades { /** * Retrieve an old input item. * - * @param string $key + * @param string|null $key * @param string|array|null $default * @return string|array * @static @@ -9686,9 +10259,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a server variable from the request. * - * @param string $key + * @param string|null $key * @param string|array|null $default - * @return string|array + * @return string|array|null * @static */ public static function server($key = null, $default = null) @@ -9713,9 +10286,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a header from the request. * - * @param string $key + * @param string|null $key * @param string|array|null $default - * @return string|array + * @return string|array|null * @static */ public static function header($key = null, $default = null) @@ -9801,6 +10374,19 @@ namespace Illuminate\Support\Facades { return $instance->anyFilled($keys); } + /** + * Determine if the request is missing a given input item key. + * + * @param string|array $key + * @return bool + * @static + */ + public static function missing($key) + { + /** @var \Illuminate\Http\Request $instance */ + return $instance->missing($key); + } + /** * Get the keys for all of the input and files. * @@ -9816,7 +10402,7 @@ namespace Illuminate\Support\Facades { /** * Get all of the input and files for the request. * - * @param array|mixed $keys + * @param array|mixed|null $keys * @return array * @static */ @@ -9830,8 +10416,8 @@ namespace Illuminate\Support\Facades { * Retrieve an input item from the request. * * @param string|null $key - * @param string|array|null $default - * @return string|array|null + * @param mixed $default + * @return mixed * @static */ public static function input($key = null, $default = null) @@ -9840,6 +10426,22 @@ namespace Illuminate\Support\Facades { return $instance->input($key, $default); } + /** + * Retrieve input as a boolean value. + * + * Returns true when value is "1", "true", "on", and "yes". Otherwise, returns false. + * + * @param string|null $key + * @param bool $default + * @return bool + * @static + */ + public static function boolean($key = null, $default = false) + { + /** @var \Illuminate\Http\Request $instance */ + return $instance->boolean($key, $default); + } + /** * Get a subset containing the provided keys with values from the input data. * @@ -9869,9 +10471,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a query string item from the request. * - * @param string $key + * @param string|null $key * @param string|array|null $default - * @return string|array + * @return string|array|null * @static */ public static function query($key = null, $default = null) @@ -9883,9 +10485,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a request payload item from the request. * - * @param string $key + * @param string|null $key * @param string|array|null $default - * @return string|array + * @return string|array|null * @static */ public static function post($key = null, $default = null) @@ -9910,9 +10512,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a cookie from the request. * - * @param string $key + * @param string|null $key * @param string|array|null $default - * @return string|array + * @return string|array|null * @static */ public static function cookie($key = null, $default = null) @@ -9949,9 +10551,9 @@ namespace Illuminate\Support\Facades { /** * Retrieve a file from the request. * - * @param string $key + * @param string|null $key * @param mixed $default - * @return \Illuminate\Http\UploadedFile|array|null + * @return \Illuminate\Http\UploadedFile|\Illuminate\Http\UploadedFile[]|array|null * @static */ public static function file($key = null, $default = null) @@ -9977,13 +10579,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Http\Request::mixin($mixin); + \Illuminate\Http\Request::mixin($mixin, $replace); } /** @@ -10013,9 +10616,19 @@ namespace Illuminate\Support\Facades { * * @static */ - public static function hasValidSignature() + public static function validateWithBag($errorBag, $rules, ...$params) { - return \Illuminate\Http\Request::hasValidSignature(); + return \Illuminate\Http\Request::validateWithBag($errorBag, $rules, ...$params); + } + + /** + * + * + * @static + */ + public static function hasValidSignature($absolute = true) + { + return \Illuminate\Http\Request::hasValidSignature($absolute); } } @@ -10028,7 +10641,7 @@ namespace Illuminate\Support\Facades { class Response { /** - * Return a new response from the application. + * Create a new response instance. * * @param string $content * @param int $status @@ -10043,9 +10656,23 @@ namespace Illuminate\Support\Facades { } /** - * Return a new view response from the application. + * Create a new "no content" response. * - * @param string $view + * @param int $status + * @param array $headers + * @return \Illuminate\Http\Response + * @static + */ + public static function noContent($status = 204, $headers = []) + { + /** @var \Illuminate\Routing\ResponseFactory $instance */ + return $instance->noContent($status, $headers); + } + + /** + * Create a new response for a given view. + * + * @param string|array $view * @param array $data * @param int $status * @param array $headers @@ -10059,7 +10686,7 @@ namespace Illuminate\Support\Facades { } /** - * Return a new JSON response from the application. + * Create a new JSON response instance. * * @param mixed $data * @param int $status @@ -10075,7 +10702,7 @@ namespace Illuminate\Support\Facades { } /** - * Return a new JSONP response from the application. + * Create a new JSONP response instance. * * @param string $callback * @param mixed $data @@ -10092,7 +10719,7 @@ namespace Illuminate\Support\Facades { } /** - * Return a new streamed response from the application. + * Create a new streamed response instance. * * @param \Closure $callback * @param int $status @@ -10107,7 +10734,7 @@ namespace Illuminate\Support\Facades { } /** - * Return a new streamed response as a file download from the application. + * Create a new streamed response instance as a file download. * * @param \Closure $callback * @param string|null $name @@ -10249,13 +10876,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Routing\ResponseFactory::mixin($mixin); + \Illuminate\Routing\ResponseFactory::mixin($mixin, $replace); } /** @@ -10290,7 +10918,7 @@ namespace Illuminate\Support\Facades { * Register a new GET route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10304,7 +10932,7 @@ namespace Illuminate\Support\Facades { * Register a new POST route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10318,7 +10946,7 @@ namespace Illuminate\Support\Facades { * Register a new PUT route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10332,7 +10960,7 @@ namespace Illuminate\Support\Facades { * Register a new PATCH route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10346,7 +10974,7 @@ namespace Illuminate\Support\Facades { * Register a new DELETE route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10360,7 +10988,7 @@ namespace Illuminate\Support\Facades { * Register a new OPTIONS route with the router. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10374,7 +11002,7 @@ namespace Illuminate\Support\Facades { * Register a new route responding to all verbs. * * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10387,7 +11015,7 @@ namespace Illuminate\Support\Facades { /** * Register a new Fallback route with the router. * - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10406,12 +11034,26 @@ namespace Illuminate\Support\Facades { * @return \Illuminate\Routing\Route * @static */ - public static function redirect($uri, $destination, $status = 301) + public static function redirect($uri, $destination, $status = 302) { /** @var \Illuminate\Routing\Router $instance */ return $instance->redirect($uri, $destination, $status); } + /** + * Create a permanent redirect from one URI to another. + * + * @param string $uri + * @param string $destination + * @return \Illuminate\Routing\Route + * @static + */ + public static function permanentRedirect($uri, $destination) + { + /** @var \Illuminate\Routing\Router $instance */ + return $instance->permanentRedirect($uri, $destination); + } + /** * Register a new route that returns a view. * @@ -10432,7 +11074,7 @@ namespace Illuminate\Support\Facades { * * @param array|string $methods * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10446,13 +11088,14 @@ namespace Illuminate\Support\Facades { * Register an array of resource controllers. * * @param array $resources + * @param array $options * @return void * @static */ - public static function resources($resources) + public static function resources($resources, $options = []) { /** @var \Illuminate\Routing\Router $instance */ - $instance->resources($resources); + $instance->resources($resources, $options); } /** @@ -10474,13 +11117,14 @@ namespace Illuminate\Support\Facades { * Register an array of API resource controllers. * * @param array $resources + * @param array $options * @return void * @static */ - public static function apiResources($resources) + public static function apiResources($resources, $options = []) { /** @var \Illuminate\Routing\Router $instance */ - $instance->apiResources($resources); + $instance->apiResources($resources, $options); } /** @@ -10542,7 +11186,7 @@ namespace Illuminate\Support\Facades { * * @param array|string $methods * @param string $uri - * @param \Closure|array|string|null $action + * @param \Closure|array|string|callable|null $action * @return \Illuminate\Routing\Route * @static */ @@ -10556,7 +11200,7 @@ namespace Illuminate\Support\Facades { * Return the response returned by the given route. * * @param string $name - * @return mixed + * @return \Symfony\Component\HttpFoundation\Response * @static */ public static function respondWithRoute($name) @@ -10569,7 +11213,7 @@ namespace Illuminate\Support\Facades { * Dispatch the request to the application. * * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response * @static */ public static function dispatch($request) @@ -10582,7 +11226,7 @@ namespace Illuminate\Support\Facades { * Dispatch the request to a route and return the response. * * @param \Illuminate\Http\Request $request - * @return mixed + * @return \Symfony\Component\HttpFoundation\Response * @static */ public static function dispatchToRoute($request) @@ -10609,7 +11253,7 @@ namespace Illuminate\Support\Facades { * * @param \Symfony\Component\HttpFoundation\Request $request * @param mixed $response - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response * @static */ public static function prepareResponse($request, $response) @@ -10623,7 +11267,7 @@ namespace Illuminate\Support\Facades { * * @param \Symfony\Component\HttpFoundation\Request $request * @param mixed $response - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response * @static */ public static function toResponse($request, $response) @@ -10636,6 +11280,7 @@ namespace Illuminate\Support\Facades { * * @param \Illuminate\Routing\Route $route * @return \Illuminate\Routing\Route + * @throws \Illuminate\Database\Eloquent\ModelNotFoundException * @static */ public static function substituteBindings($route) @@ -10649,6 +11294,7 @@ namespace Illuminate\Support\Facades { * * @param \Illuminate\Routing\Route $route * @return void + * @throws \Illuminate\Database\Eloquent\ModelNotFoundException * @static */ public static function substituteImplicitBindings($route) @@ -10788,7 +11434,6 @@ namespace Illuminate\Support\Facades { * @param string $class * @param \Closure|null $callback * @return void - * @throws \Illuminate\Database\Eloquent\ModelNotFoundException * @static */ public static function model($key, $class, $callback = null) @@ -10877,7 +11522,7 @@ namespace Illuminate\Support\Facades { * Get a route parameter for the current route. * * @param string $key - * @param string $default + * @param string|null $default * @return mixed * @static */ @@ -10914,7 +11559,7 @@ namespace Illuminate\Support\Facades { /** * Get the currently dispatched route instance. * - * @return \Illuminate\Routing\Route + * @return \Illuminate\Routing\Route|null * @static */ public static function current() @@ -11015,13 +11660,50 @@ namespace Illuminate\Support\Facades { /** * Register the typical authentication routes for an application. * + * @param array $options * @return void * @static */ - public static function auth() + public static function auth($options = []) { /** @var \Illuminate\Routing\Router $instance */ - $instance->auth(); + $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(); } /** @@ -11105,13 +11787,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Routing\Router::mixin($mixin); + \Illuminate\Routing\Router::mixin($mixin, $replace); } /** @@ -11200,6 +11883,30 @@ namespace Illuminate\Support\Facades { $instance->dropAllViews(); } + /** + * Get all of the table names for the database. + * + * @return array + * @static + */ + public static function getAllTables() + { + /** @var \Illuminate\Database\Schema\MySqlBuilder $instance */ + return $instance->getAllTables(); + } + + /** + * Get all of the view names for the database. + * + * @return array + * @static + */ + public static function getAllViews() + { + /** @var \Illuminate\Database\Schema\MySqlBuilder $instance */ + return $instance->getAllViews(); + } + /** * Set the default string length for migrations. * @@ -11316,6 +12023,20 @@ namespace Illuminate\Support\Facades { $instance->dropIfExists($table); } + /** + * Drop all types from the database. + * + * @return void + * @throws \LogicException + * @static + */ + public static function dropAllTypes() + { + //Method inherited from \Illuminate\Database\Schema\Builder + /** @var \Illuminate\Database\Schema\MySqlBuilder $instance */ + $instance->dropAllTypes(); + } + /** * Rename a table on the schema. * @@ -11357,6 +12078,24 @@ namespace Illuminate\Support\Facades { return $instance->disableForeignKeyConstraints(); } + /** + * Register a custom Doctrine mapping type. + * + * @param string $class + * @param string $name + * @param string $type + * @return void + * @throws \Doctrine\DBAL\DBALException + * @throws \RuntimeException + * @static + */ + public static function registerCustomDoctrineType($class, $name, $type) + { + //Method inherited from \Illuminate\Database\Schema\Builder + /** @var \Illuminate\Database\Schema\MySqlBuilder $instance */ + $instance->registerCustomDoctrineType($class, $name, $type); + } + /** * Get the database connection instance. * @@ -11503,13 +12242,13 @@ namespace Illuminate\Support\Facades { /** * Save the session data to storage. * - * @return bool + * @return void * @static */ public static function save() { /** @var \Illuminate\Session\Store $instance */ - return $instance->save(); + $instance->save(); } /** @@ -11536,6 +12275,19 @@ namespace Illuminate\Support\Facades { return $instance->all(); } + /** + * Get a subset of the session data. + * + * @param array $keys + * @return array + * @static + */ + public static function only($keys) + { + /** @var \Illuminate\Session\Store $instance */ + return $instance->only($keys); + } + /** * Checks if a key exists. * @@ -11580,7 +12332,7 @@ namespace Illuminate\Support\Facades { * Get the value of a given key and then forget it. * * @param string $key - * @param string $default + * @param string|null $default * @return mixed * @static */ @@ -11593,7 +12345,7 @@ namespace Illuminate\Support\Facades { /** * Determine if the session contains old input. * - * @param string $key + * @param string|null $key * @return bool * @static */ @@ -11606,7 +12358,7 @@ namespace Illuminate\Support\Facades { /** * Get the requested item from the flashed input array. * - * @param string $key + * @param string|null $key * @param mixed $default * @return mixed * @static @@ -12028,7 +12780,7 @@ namespace Illuminate\Support\Facades { /** * Get a filesystem instance. * - * @param string $name + * @param string|null $name * @return \Illuminate\Filesystem\FilesystemAdapter * @static */ @@ -12041,7 +12793,7 @@ namespace Illuminate\Support\Facades { /** * Get a filesystem instance. * - * @param string $name + * @param string|null $name * @return \Illuminate\Filesystem\FilesystemAdapter * @static */ @@ -12115,19 +12867,6 @@ namespace Illuminate\Support\Facades { return $instance->createS3Driver($config); } - /** - * Create an instance of the Rackspace driver. - * - * @param array $config - * @return \Illuminate\Contracts\Filesystem\Cloud - * @static - */ - public static function createRackspaceDriver($config) - { - /** @var \Illuminate\Filesystem\FilesystemManager $instance */ - return $instance->createRackspaceDriver($config); - } - /** * Set the given disk instance. * @@ -12196,27 +12935,27 @@ namespace Illuminate\Support\Facades { /** * Assert that the given file exists. * - * @param string $path - * @return void + * @param string|array $path + * @return \Illuminate\Filesystem\FilesystemAdapter * @static */ public static function assertExists($path) { /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ - $instance->assertExists($path); + return $instance->assertExists($path); } /** * Assert that the given file does not exist. * - * @param string $path - * @return void + * @param string|array $path + * @return \Illuminate\Filesystem\FilesystemAdapter * @static */ public static function assertMissing($path) { /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ - $instance->assertMissing($path); + return $instance->assertMissing($path); } /** @@ -12232,6 +12971,19 @@ namespace Illuminate\Support\Facades { return $instance->exists($path); } + /** + * Determine if a file or directory is missing. + * + * @param string $path + * @return bool + * @static + */ + public static function missing($path) + { + /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ + return $instance->missing($path); + } + /** * Get the full path for the file at the given "short" path. * @@ -12309,7 +13061,7 @@ namespace Illuminate\Support\Facades { * Store the uploaded file on the disk. * * @param string $path - * @param \Illuminate\Http\File|\Illuminate\Http\UploadedFile $file + * @param \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file * @param array $options * @return string|false * @static @@ -12324,7 +13076,7 @@ namespace Illuminate\Support\Facades { * Store the uploaded file on the disk with a given name. * * @param string $path - * @param \Illuminate\Http\File|\Illuminate\Http\UploadedFile $file + * @param \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file * @param string $name * @param array $options * @return string|false @@ -12354,13 +13106,13 @@ namespace Illuminate\Support\Facades { * * @param string $path * @param string $visibility - * @return void + * @return bool * @static */ public static function setVisibility($path, $visibility) { /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ - $instance->setVisibility($path, $visibility); + return $instance->setVisibility($path, $visibility); } /** @@ -12369,10 +13121,11 @@ namespace Illuminate\Support\Facades { * @param string $path * @param string $data * @param string $separator - * @return int + * @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); @@ -12384,10 +13137,11 @@ namespace Illuminate\Support\Facades { * @param string $path * @param string $data * @param string $separator - * @return int + * @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); @@ -12478,6 +13232,7 @@ namespace Illuminate\Support\Facades { * * @param string $path * @return string + * @throws \RuntimeException * @static */ public static function url($path) @@ -12486,6 +13241,37 @@ namespace Illuminate\Support\Facades { return $instance->url($path); } + /** + * Get a resource to read the file. + * + * @param string $path + * @return resource|null The path resource or null on failure. + * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException + * @static + */ + public static function readStream($path) + { + /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ + return $instance->readStream($path); + } + + /** + * Write a new file using a stream. + * + * @param string $path + * @param resource $resource + * @param array $options + * @return bool + * @throws \InvalidArgumentException If $resource is not a file handle. + * @throws \Illuminate\Contracts\Filesystem\FileExistsException + * @static + */ + public static function writeStream($path, $resource, $options = []) + { + /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ + return $instance->writeStream($path, $resource, $options); + } + /** * Get a temporary URL for the file at the given path. * @@ -12493,6 +13279,7 @@ namespace Illuminate\Support\Facades { * @param \DateTimeInterface $expiration * @param array $options * @return string + * @throws \RuntimeException * @static */ public static function temporaryUrl($path, $expiration, $options = []) @@ -12517,22 +13304,6 @@ namespace Illuminate\Support\Facades { return $instance->getAwsTemporaryUrl($adapter, $path, $expiration, $options); } - /** - * Get a temporary URL for the file at the given path. - * - * @param \League\Flysystem\Rackspace\RackspaceAdapter $adapter - * @param string $path - * @param \DateTimeInterface $expiration - * @param array $options - * @return string - * @static - */ - public static function getRackspaceTemporaryUrl($adapter, $path, $expiration, $options) - { - /** @var \Illuminate\Filesystem\FilesystemAdapter $instance */ - return $instance->getRackspaceTemporaryUrl($adapter, $path, $expiration, $options); - } - /** * Get an array of all files in a directory. * @@ -12761,7 +13532,7 @@ namespace Illuminate\Support\Facades { * @return string * @static */ - public static function formatScheme($secure) + public static function formatScheme($secure = null) { /** @var \Illuminate\Routing\UrlGenerator $instance */ return $instance->formatScheme($secure); @@ -12772,42 +13543,73 @@ namespace Illuminate\Support\Facades { * * @param string $name * @param array $parameters - * @param \DateTimeInterface|int $expiration + * @param \DateTimeInterface|\DateInterval|int|null $expiration + * @param bool $absolute * @return string + * @throws \InvalidArgumentException * @static */ - public static function signedRoute($name, $parameters = [], $expiration = null) + public static function signedRoute($name, $parameters = [], $expiration = null, $absolute = true) { /** @var \Illuminate\Routing\UrlGenerator $instance */ - return $instance->signedRoute($name, $parameters, $expiration); + return $instance->signedRoute($name, $parameters, $expiration, $absolute); } /** * Create a temporary signed route URL for a named route. * * @param string $name - * @param \DateTimeInterface|int $expiration + * @param \DateTimeInterface|\DateInterval|int $expiration * @param array $parameters + * @param bool $absolute * @return string * @static */ - public static function temporarySignedRoute($name, $expiration, $parameters = []) + public static function temporarySignedRoute($name, $expiration, $parameters = [], $absolute = true) { /** @var \Illuminate\Routing\UrlGenerator $instance */ - return $instance->temporarySignedRoute($name, $expiration, $parameters); + return $instance->temporarySignedRoute($name, $expiration, $parameters, $absolute); } /** * Determine if the given request has a valid signature. * * @param \Illuminate\Http\Request $request + * @param bool $absolute * @return bool * @static */ - public static function hasValidSignature($request) + public static function hasValidSignature($request, $absolute = true) { /** @var \Illuminate\Routing\UrlGenerator $instance */ - return $instance->hasValidSignature($request); + return $instance->hasValidSignature($request, $absolute); + } + + /** + * Determine if the signature from the given request matches the URL. + * + * @param \Illuminate\Http\Request $request + * @param bool $absolute + * @return bool + * @static + */ + public static function hasCorrectSignature($request, $absolute = true) + { + /** @var \Illuminate\Routing\UrlGenerator $instance */ + return $instance->hasCorrectSignature($request, $absolute); + } + + /** + * Determine if the expires timestamp from the given request is not from the past. + * + * @param \Illuminate\Http\Request $request + * @return bool + * @static + */ + public static function signatureHasNotExpired($request) + { + /** @var \Illuminate\Routing\UrlGenerator $instance */ + return $instance->signatureHasNotExpired($request); } /** @@ -12817,7 +13619,7 @@ namespace Illuminate\Support\Facades { * @param mixed $parameters * @param bool $absolute * @return string - * @throws \InvalidArgumentException + * @throws \Symfony\Component\Routing\Exception\RouteNotFoundException * @static */ public static function route($name, $parameters = [], $absolute = true) @@ -12826,10 +13628,26 @@ namespace Illuminate\Support\Facades { return $instance->route($name, $parameters, $absolute); } + /** + * Get the URL for a given route instance. + * + * @param \Illuminate\Routing\Route $route + * @param mixed $parameters + * @param bool $absolute + * @return string + * @throws \Illuminate\Routing\Exceptions\UrlGenerationException + * @static + */ + public static function toRoute($route, $parameters, $absolute) + { + /** @var \Illuminate\Routing\UrlGenerator $instance */ + return $instance->toRoute($route, $parameters, $absolute); + } + /** * Get the URL to a controller action. * - * @param string $action + * @param string|array $action * @param mixed $parameters * @param bool $absolute * @return string @@ -12859,7 +13677,7 @@ namespace Illuminate\Support\Facades { * Get the base URL for the request. * * @param string $scheme - * @param string $root + * @param string|null $root * @return string * @static */ @@ -12874,13 +13692,14 @@ namespace Illuminate\Support\Facades { * * @param string $root * @param string $path + * @param \Illuminate\Routing\Route|null $route * @return string * @static */ - public static function format($root, $path) + public static function format($root, $path, $route = null) { /** @var \Illuminate\Routing\UrlGenerator $instance */ - return $instance->format($root, $path); + return $instance->format($root, $path, $route); } /** @@ -12924,14 +13743,14 @@ namespace Illuminate\Support\Facades { /** * Force the scheme for URLs. * - * @param string $schema + * @param string $scheme * @return void * @static */ - public static function forceScheme($schema) + public static function forceScheme($scheme) { /** @var \Illuminate\Routing\UrlGenerator $instance */ - $instance->forceScheme($schema); + $instance->forceScheme($scheme); } /** @@ -13079,13 +13898,14 @@ namespace Illuminate\Support\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Routing\UrlGenerator::mixin($mixin); + \Illuminate\Routing\UrlGenerator::mixin($mixin, $replace); } /** @@ -13147,7 +13967,7 @@ namespace Illuminate\Support\Facades { * * @param string $rule * @param \Closure|string $extension - * @param string $message + * @param string|null $message * @return void * @static */ @@ -13162,7 +13982,7 @@ namespace Illuminate\Support\Facades { * * @param string $rule * @param \Closure|string $extension - * @param string $message + * @param string|null $message * @return void * @static */ @@ -13177,7 +13997,7 @@ namespace Illuminate\Support\Facades { * * @param string $rule * @param \Closure|string $extension - * @param string $message + * @param string|null $message * @return void * @static */ @@ -13264,7 +14084,7 @@ namespace Illuminate\Support\Facades { * Get the evaluated view contents for the given view. * * @param string $path - * @param array $data + * @param \Illuminate\Contracts\Support\Arrayable|array $data * @param array $mergeData * @return \Illuminate\Contracts\View\View * @static @@ -13279,7 +14099,7 @@ namespace Illuminate\Support\Facades { * Get the evaluated view contents for the given view. * * @param string $view - * @param array $data + * @param \Illuminate\Contracts\Support\Arrayable|array $data * @param array $mergeData * @return \Illuminate\Contracts\View\View * @static @@ -13294,7 +14114,7 @@ namespace Illuminate\Support\Facades { * Get the first view that actually exists from the given list. * * @param array $views - * @param array $data + * @param \Illuminate\Contracts\Support\Arrayable|array $data * @param array $mergeData * @return \Illuminate\Contracts\View\View * @throws \InvalidArgumentException @@ -13311,7 +14131,7 @@ namespace Illuminate\Support\Facades { * * @param bool $condition * @param string $view - * @param array $data + * @param \Illuminate\Contracts\Support\Arrayable|array $data * @param array $mergeData * @return string * @static @@ -13369,7 +14189,7 @@ namespace Illuminate\Support\Facades { * Add a piece of shared data to the environment. * * @param array|string $key - * @param mixed $value + * @param mixed|null $value * @return mixed * @static */ @@ -13475,7 +14295,7 @@ namespace Illuminate\Support\Facades { * * @param string $extension * @param string $engine - * @param \Closure $resolver + * @param \Closure|null $resolver * @return void * @static */ @@ -13646,6 +14466,45 @@ namespace Illuminate\Support\Facades { return $instance->getShared(); } + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * @return void + * @static + */ + public static function macro($name, $macro) + { + \Illuminate\View\Factory::macro($name, $macro); + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * @param bool $replace + * @return void + * @throws \ReflectionException + * @static + */ + public static function mixin($mixin, $replace = true) + { + \Illuminate\View\Factory::mixin($mixin, $replace); + } + + /** + * Checks if macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + return \Illuminate\View\Factory::hasMacro($name); + } + /** * Start a component rendering process. * @@ -13660,6 +14519,20 @@ namespace Illuminate\Support\Facades { $instance->startComponent($name, $data); } + /** + * Get the first view that actually exists from the given list, and start a component. + * + * @param array $names + * @param array $data + * @return void + * @static + */ + public static function startComponentFirst($names, $data = []) + { + /** @var \Illuminate\View\Factory $instance */ + $instance->startComponentFirst($names, $data); + } + /** * Render the current component. * @@ -13875,7 +14748,7 @@ namespace Illuminate\Support\Facades { * Get the contents of a section. * * @param string $name - * @param string $default + * @param string|null $default * @return mixed * @static */ @@ -14076,2113 +14949,6 @@ namespace Illuminate\Support\Facades { } } - - /** - * - * - * @see \Illuminate\Http\Request - */ - class Input { - - /** - * Create a new Illuminate HTTP request from server variables. - * - * @return static - * @static - */ - public static function capture() - { - return \Illuminate\Http\Request::capture(); - } - - /** - * Return the Request instance. - * - * @return \Illuminate\Http\Request - * @static - */ - public static function instance() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->instance(); - } - - /** - * Get the request method. - * - * @return string - * @static - */ - public static function method() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->method(); - } - - /** - * Get the root URL for the application. - * - * @return string - * @static - */ - public static function root() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->root(); - } - - /** - * Get the URL (no query string) for the request. - * - * @return string - * @static - */ - public static function url() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->url(); - } - - /** - * Get the full URL for the request. - * - * @return string - * @static - */ - public static function fullUrl() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->fullUrl(); - } - - /** - * Get the full URL for the request with the added query string parameters. - * - * @param array $query - * @return string - * @static - */ - public static function fullUrlWithQuery($query) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->fullUrlWithQuery($query); - } - - /** - * Get the current path info for the request. - * - * @return string - * @static - */ - public static function path() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->path(); - } - - /** - * Get the current decoded path info for the request. - * - * @return string - * @static - */ - public static function decodedPath() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->decodedPath(); - } - - /** - * Get a segment from the URI (1 based index). - * - * @param int $index - * @param string|null $default - * @return string|null - * @static - */ - public static function segment($index, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->segment($index, $default); - } - - /** - * Get all of the segments for the request path. - * - * @return array - * @static - */ - public static function segments() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->segments(); - } - - /** - * Determine if the current request URI matches a pattern. - * - * @param mixed $patterns - * @return bool - * @static - */ - public static function is(...$patterns) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->is(...$patterns); - } - - /** - * Determine if the route name matches a given pattern. - * - * @param mixed $patterns - * @return bool - * @static - */ - public static function routeIs(...$patterns) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->routeIs(...$patterns); - } - - /** - * Determine if the current request URL and query string matches a pattern. - * - * @param mixed $patterns - * @return bool - * @static - */ - public static function fullUrlIs(...$patterns) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->fullUrlIs(...$patterns); - } - - /** - * Determine if the request is the result of an AJAX call. - * - * @return bool - * @static - */ - public static function ajax() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->ajax(); - } - - /** - * Determine if the request is the result of an PJAX call. - * - * @return bool - * @static - */ - public static function pjax() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->pjax(); - } - - /** - * Determine if the request is over HTTPS. - * - * @return bool - * @static - */ - public static function secure() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->secure(); - } - - /** - * Get the client IP address. - * - * @return string - * @static - */ - public static function ip() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->ip(); - } - - /** - * Get the client IP addresses. - * - * @return array - * @static - */ - public static function ips() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->ips(); - } - - /** - * Get the client user agent. - * - * @return string - * @static - */ - public static function userAgent() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->userAgent(); - } - - /** - * Merge new input into the current request's input array. - * - * @param array $input - * @return \Illuminate\Http\Request - * @static - */ - public static function merge($input) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->merge($input); - } - - /** - * Replace the input for the current request. - * - * @param array $input - * @return \Illuminate\Http\Request - * @static - */ - public static function replace($input) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->replace($input); - } - - /** - * This method belongs to Symfony HttpFoundation and is not usually needed when using Laravel. - * - * Instead, you may use the "input" method. - * - * @param string $key - * @param mixed $default - * @return mixed - * @static - */ - public static function get($key, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->get($key, $default); - } - - /** - * Get the JSON payload for the request. - * - * @param string $key - * @param mixed $default - * @return \Symfony\Component\HttpFoundation\ParameterBag|mixed - * @static - */ - public static function json($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->json($key, $default); - } - - /** - * Create a new request instance from the given Laravel request. - * - * @param \Illuminate\Http\Request $from - * @param \Illuminate\Http\Request|null $to - * @return static - * @static - */ - public static function createFrom($from, $to = null) - { - return \Illuminate\Http\Request::createFrom($from, $to); - } - - /** - * Create an Illuminate request from a Symfony instance. - * - * @param \Symfony\Component\HttpFoundation\Request $request - * @return \Illuminate\Http\Request - * @static - */ - public static function createFromBase($request) - { - return \Illuminate\Http\Request::createFromBase($request); - } - - /** - * Clones a request and overrides some of its parameters. - * - * @param array $query The GET parameters - * @param array $request The POST parameters - * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) - * @param array $cookies The COOKIE parameters - * @param array $files The FILES parameters - * @param array $server The SERVER parameters - * @return static - * @static - */ - public static function duplicate($query = null, $request = null, $attributes = null, $cookies = null, $files = null, $server = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->duplicate($query, $request, $attributes, $cookies, $files, $server); - } - - /** - * Get the session associated with the request. - * - * @return \Illuminate\Session\Store - * @throws \RuntimeException - * @static - */ - public static function session() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->session(); - } - - /** - * Get the session associated with the request. - * - * @return \Illuminate\Session\Store|null - * @static - */ - public static function getSession() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->getSession(); - } - - /** - * Set the session instance on the request. - * - * @param \Illuminate\Contracts\Session\Session $session - * @return void - * @static - */ - public static function setLaravelSession($session) - { - /** @var \Illuminate\Http\Request $instance */ - $instance->setLaravelSession($session); - } - - /** - * Get the user making the request. - * - * @param string|null $guard - * @return mixed - * @static - */ - public static function user($guard = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->user($guard); - } - - /** - * Get the route handling the request. - * - * @param string|null $param - * @return \Illuminate\Routing\Route|object|string - * @static - */ - public static function route($param = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->route($param); - } - - /** - * Get a unique fingerprint for the request / route / IP address. - * - * @return string - * @throws \RuntimeException - * @static - */ - public static function fingerprint() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->fingerprint(); - } - - /** - * Set the JSON payload for the request. - * - * @param \Symfony\Component\HttpFoundation\ParameterBag $json - * @return \Illuminate\Http\Request - * @static - */ - public static function setJson($json) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->setJson($json); - } - - /** - * Get the user resolver callback. - * - * @return \Closure - * @static - */ - public static function getUserResolver() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->getUserResolver(); - } - - /** - * Set the user resolver callback. - * - * @param \Closure $callback - * @return \Illuminate\Http\Request - * @static - */ - public static function setUserResolver($callback) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->setUserResolver($callback); - } - - /** - * Get the route resolver callback. - * - * @return \Closure - * @static - */ - public static function getRouteResolver() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->getRouteResolver(); - } - - /** - * Set the route resolver callback. - * - * @param \Closure $callback - * @return \Illuminate\Http\Request - * @static - */ - public static function setRouteResolver($callback) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->setRouteResolver($callback); - } - - /** - * Get all of the input and files for the request. - * - * @return array - * @static - */ - public static function toArray() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->toArray(); - } - - /** - * Determine if the given offset exists. - * - * @param string $offset - * @return bool - * @static - */ - public static function offsetExists($offset) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->offsetExists($offset); - } - - /** - * Get the value at the given offset. - * - * @param string $offset - * @return mixed - * @static - */ - public static function offsetGet($offset) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->offsetGet($offset); - } - - /** - * Set the value at the given offset. - * - * @param string $offset - * @param mixed $value - * @return void - * @static - */ - public static function offsetSet($offset, $value) - { - /** @var \Illuminate\Http\Request $instance */ - $instance->offsetSet($offset, $value); - } - - /** - * Remove the value at the given offset. - * - * @param string $offset - * @return void - * @static - */ - public static function offsetUnset($offset) - { - /** @var \Illuminate\Http\Request $instance */ - $instance->offsetUnset($offset); - } - - /** - * Sets the parameters for this request. - * - * This method also re-initializes all properties. - * - * @param array $query The GET parameters - * @param array $request The POST parameters - * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) - * @param array $cookies The COOKIE parameters - * @param array $files The FILES parameters - * @param array $server The SERVER parameters - * @param string|resource|null $content The raw body data - * @static - */ - public static function initialize($query = [], $request = [], $attributes = [], $cookies = [], $files = [], $server = [], $content = null) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->initialize($query, $request, $attributes, $cookies, $files, $server, $content); - } - - /** - * Creates a new request with values from PHP's super globals. - * - * @return static - * @static - */ - public static function createFromGlobals() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::createFromGlobals(); - } - - /** - * Creates a Request based on a given URI and configuration. - * - * The information contained in the URI always take precedence - * over the other information (server and parameters). - * - * @param string $uri The URI - * @param string $method The HTTP method - * @param array $parameters The query (GET) or request (POST) parameters - * @param array $cookies The request cookies ($_COOKIE) - * @param array $files The request files ($_FILES) - * @param array $server The server parameters ($_SERVER) - * @param string|resource|null $content The raw body data - * @return static - * @static - */ - public static function create($uri, $method = 'GET', $parameters = [], $cookies = [], $files = [], $server = [], $content = null) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::create($uri, $method, $parameters, $cookies, $files, $server, $content); - } - - /** - * Sets a callable able to create a Request instance. - * - * This is mainly useful when you need to override the Request class - * 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) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::setFactory($callable); - } - - /** - * Overrides the PHP global variables according to this request instance. - * - * It overrides $_GET, $_POST, $_REQUEST, $_SERVER, $_COOKIE. - * $_FILES is never overridden, see rfc1867 - * - * @static - */ - public static function overrideGlobals() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->overrideGlobals(); - } - - /** - * Sets a list of trusted proxies. - * - * You should only list the reverse proxies that you manage directly. - * - * @param array $proxies A list of trusted proxies, the string 'REMOTE_ADDR' will be replaced with $_SERVER['REMOTE_ADDR'] - * @param int $trustedHeaderSet A bit field of Request::HEADER_*, to set which headers to trust from your proxies - * @throws \InvalidArgumentException When $trustedHeaderSet is invalid - * @static - */ - public static function setTrustedProxies($proxies, $trustedHeaderSet) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::setTrustedProxies($proxies, $trustedHeaderSet); - } - - /** - * Gets the list of trusted proxies. - * - * @return array An array of trusted proxies - * @static - */ - public static function getTrustedProxies() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::getTrustedProxies(); - } - - /** - * Gets the set of trusted headers from trusted proxies. - * - * @return int A bit field of Request::HEADER_* that defines which headers are trusted from your proxies - * @static - */ - public static function getTrustedHeaderSet() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::getTrustedHeaderSet(); - } - - /** - * Sets a list of trusted host patterns. - * - * You should only list the hosts you manage using regexs. - * - * @param array $hostPatterns A list of trusted host patterns - * @static - */ - public static function setTrustedHosts($hostPatterns) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::setTrustedHosts($hostPatterns); - } - - /** - * Gets the list of trusted host patterns. - * - * @return array An array of trusted host patterns - * @static - */ - public static function getTrustedHosts() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::getTrustedHosts(); - } - - /** - * Normalizes a query string. - * - * 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 - */ - public static function normalizeQueryString($qs) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::normalizeQueryString($qs); - } - - /** - * Enables support for the _method request parameter to determine the intended HTTP method. - * - * Be warned that enabling this feature might lead to CSRF issues in your code. - * Check that you are using CSRF tokens when required. - * If the HTTP method parameter override is enabled, an html-form with method "POST" can be altered - * and used to send a "PUT" or "DELETE" request via the _method request parameter. - * If these methods are not protected against CSRF, this presents a possible vulnerability. - * - * The HTTP method can only be overridden when the real HTTP method is POST. - * - * @static - */ - public static function enableHttpMethodParameterOverride() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::enableHttpMethodParameterOverride(); - } - - /** - * Checks whether support for the _method request parameter is enabled. - * - * @return bool True when the _method request parameter is enabled, false otherwise - * @static - */ - public static function getHttpMethodParameterOverride() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::getHttpMethodParameterOverride(); - } - - /** - * Whether the request contains a Session which was started in one of the - * previous requests. - * - * @return bool - * @static - */ - public static function hasPreviousSession() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasPreviousSession(); - } - - /** - * Whether the request contains a Session object. - * - * This method does not give any information about the state of the session object, - * like whether the session is started or not. It is just a way to check if this Request - * is associated with a Session instance. - * - * @return bool true when the Request contains a Session object, false otherwise - * @static - */ - public static function hasSession() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasSession(); - } - - /** - * - * - * @static - */ - public static function setSession($session) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setSession($session); - } - - /** - * - * - * @internal - * @static - */ - public static function setSessionFactory($factory) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setSessionFactory($factory); - } - - /** - * Returns the client IP addresses. - * - * In the returned array the most trusted IP address is first, and the - * least trusted one last. The "real" client IP address is the last one, - * but this is also the least trusted one. Trusted proxies are stripped. - * - * Use this method carefully; you should use getClientIp() instead. - * - * @return array The client IP addresses - * @see getClientIp() - * @static - */ - public static function getClientIps() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getClientIps(); - } - - /** - * Returns the client IP address. - * - * This method can read the client IP address from the "X-Forwarded-For" header - * when trusted proxies were set via "setTrustedProxies()". The "X-Forwarded-For" - * header value is a comma+space separated list of IP addresses, the left-most - * being the original client, and each successive proxy that passed the request - * adding the IP address where it received the request from. - * - * If your reverse proxy uses a different header name than "X-Forwarded-For", - * ("Client-Ip" for instance), configure it via the $trustedHeaderSet - * argument of the Request::setTrustedProxies() method instead. - * - * @return string|null The client IP address - * @see getClientIps() - * @see https://wikipedia.org/wiki/X-Forwarded-For - * @static - */ - public static function getClientIp() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getClientIp(); - } - - /** - * Returns current script name. - * - * @return string - * @static - */ - public static function getScriptName() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getScriptName(); - } - - /** - * Returns the path being requested relative to the executed script. - * - * The path info always starts with a /. - * - * Suppose this request is instantiated from /mysite on localhost: - * - * * http://localhost/mysite returns an empty string - * * http://localhost/mysite/about returns '/about' - * * http://localhost/mysite/enco%20ded returns '/enco%20ded' - * * http://localhost/mysite/about?var=1 returns '/about' - * - * @return string The raw path (i.e. not urldecoded) - * @static - */ - public static function getPathInfo() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getPathInfo(); - } - - /** - * Returns the root path from which this request is executed. - * - * Suppose that an index.php file instantiates this request object: - * - * * http://localhost/index.php returns an empty string - * * http://localhost/index.php/page returns an empty string - * * http://localhost/web/index.php returns '/web' - * * http://localhost/we%20b/index.php returns '/we%20b' - * - * @return string The raw path (i.e. not urldecoded) - * @static - */ - public static function getBasePath() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getBasePath(); - } - - /** - * Returns the root URL from which this request is executed. - * - * The base URL never ends with a /. - * - * This is similar to getBasePath(), except that it also includes the - * script filename (e.g. index.php) if one exists. - * - * @return string The raw URL (i.e. not urldecoded) - * @static - */ - public static function getBaseUrl() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getBaseUrl(); - } - - /** - * Gets the request's scheme. - * - * @return string - * @static - */ - public static function getScheme() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getScheme(); - } - - /** - * Returns the port on which the request is made. - * - * This method can read the client port from the "X-Forwarded-Port" header - * when trusted proxies were set via "setTrustedProxies()". - * - * The "X-Forwarded-Port" header must contain the client port. - * - * @return int|string can be a string if fetched from the server bag - * @static - */ - public static function getPort() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getPort(); - } - - /** - * Returns the user. - * - * @return string|null - * @static - */ - public static function getUser() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getUser(); - } - - /** - * Returns the password. - * - * @return string|null - * @static - */ - public static function getPassword() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getPassword(); - } - - /** - * Gets the user info. - * - * @return string A user name and, optionally, scheme-specific information about how to gain authorization to access the server - * @static - */ - public static function getUserInfo() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getUserInfo(); - } - - /** - * Returns the HTTP host being requested. - * - * The port name will be appended to the host if it's non-standard. - * - * @return string - * @static - */ - public static function getHttpHost() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getHttpHost(); - } - - /** - * Returns the requested URI (path and query string). - * - * @return string The raw URI (i.e. not URI decoded) - * @static - */ - public static function getRequestUri() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getRequestUri(); - } - - /** - * Gets the scheme and HTTP host. - * - * If the URL was called with basic authentication, the user - * and the password are not added to the generated string. - * - * @return string The scheme and HTTP host - * @static - */ - public static function getSchemeAndHttpHost() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getSchemeAndHttpHost(); - } - - /** - * Generates a normalized URI (URL) for the Request. - * - * @return string A normalized URI (URL) for the Request - * @see getQueryString() - * @static - */ - public static function getUri() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getUri(); - } - - /** - * Generates a normalized URI for the given path. - * - * @param string $path A path to use instead of the current one - * @return string The normalized URI for the path - * @static - */ - public static function getUriForPath($path) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getUriForPath($path); - } - - /** - * Returns the path as relative reference from the current Request path. - * - * Only the URIs path component (no schema, host etc.) is relevant and must be given. - * Both paths must be absolute and not contain relative parts. - * Relative URLs from one resource to another are useful when generating self-contained downloadable document archives. - * Furthermore, they can be used to reduce the link size in documents. - * - * Example target paths, given a base path of "/a/b/c/d": - * - "/a/b/c/d" -> "" - * - "/a/b/c/" -> "./" - * - "/a/b/" -> "../" - * - "/a/b/c/other" -> "other" - * - "/a/x/y" -> "../../x/y" - * - * @param string $path The target path - * @return string The relative target path - * @static - */ - public static function getRelativeUriForPath($path) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getRelativeUriForPath($path); - } - - /** - * Generates the normalized query string for the Request. - * - * It builds a normalized query string, where keys/value pairs are alphabetized - * and have consistent escaping. - * - * @return string|null A normalized query string for the Request - * @static - */ - public static function getQueryString() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getQueryString(); - } - - /** - * Checks whether the request is secure or not. - * - * This method can read the client protocol from the "X-Forwarded-Proto" header - * when trusted proxies were set via "setTrustedProxies()". - * - * The "X-Forwarded-Proto" header must contain the protocol: "https" or "http". - * - * @return bool - * @static - */ - public static function isSecure() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isSecure(); - } - - /** - * Returns the host name. - * - * This method can read the client host name from the "X-Forwarded-Host" header - * when trusted proxies were set via "setTrustedProxies()". - * - * The "X-Forwarded-Host" header must contain the client host name. - * - * @return string - * @throws SuspiciousOperationException when the host name is invalid or not trusted - * @static - */ - public static function getHost() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getHost(); - } - - /** - * Sets the request method. - * - * @param string $method - * @static - */ - public static function setMethod($method) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setMethod($method); - } - - /** - * Gets the request "intended" method. - * - * If the X-HTTP-Method-Override header is set, and if the method is a POST, - * then it is used to determine the "real" intended HTTP method. - * - * The _method request parameter can also be used to determine the HTTP method, - * but only if enableHttpMethodParameterOverride() has been called. - * - * The method is always an uppercased string. - * - * @return string The request method - * @see getRealMethod() - * @static - */ - public static function getMethod() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getMethod(); - } - - /** - * Gets the "real" request method. - * - * @return string The request method - * @see getMethod() - * @static - */ - public static function getRealMethod() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getRealMethod(); - } - - /** - * 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 - */ - public static function getMimeType($format) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getMimeType($format); - } - - /** - * Gets the mime types associated with the format. - * - * @param string $format The format - * @return array The associated mime types - * @static - */ - public static function getMimeTypes($format) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - return \Illuminate\Http\Request::getMimeTypes($format); - } - - /** - * 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 - */ - public static function getFormat($mimeType) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getFormat($mimeType); - } - - /** - * 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 - */ - public static function setFormat($format, $mimeTypes) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setFormat($format, $mimeTypes); - } - - /** - * Gets the request format. - * - * Here is the process to determine the format: - * - * * format defined by the user (with setRequestFormat()) - * * _format request attribute - * * $default - * - * @see getPreferredFormat - * @param string|null $default The default format - * @return string|null The request format - * @static - */ - public static function getRequestFormat($default = 'html') - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getRequestFormat($default); - } - - /** - * Sets the request format. - * - * @param string $format The request format - * @static - */ - public static function setRequestFormat($format) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setRequestFormat($format); - } - - /** - * Gets the format associated with the request. - * - * @return string|null The format (null if no content type is present) - * @static - */ - public static function getContentType() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getContentType(); - } - - /** - * Sets the default locale. - * - * @param string $locale - * @static - */ - public static function setDefaultLocale($locale) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setDefaultLocale($locale); - } - - /** - * Get the default locale. - * - * @return string - * @static - */ - public static function getDefaultLocale() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getDefaultLocale(); - } - - /** - * Sets the locale. - * - * @param string $locale - * @static - */ - public static function setLocale($locale) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->setLocale($locale); - } - - /** - * Get the locale. - * - * @return string - * @static - */ - public static function getLocale() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getLocale(); - } - - /** - * Checks if the request method is of specified type. - * - * @param string $method Uppercase request method (GET, POST etc) - * @return bool - * @static - */ - public static function isMethod($method) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isMethod($method); - } - - /** - * Checks whether or not the method is safe. - * - * @see https://tools.ietf.org/html/rfc7231#section-4.2.1 - * @return bool - * @static - */ - public static function isMethodSafe() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isMethodSafe(); - } - - /** - * Checks whether or not the method is idempotent. - * - * @return bool - * @static - */ - public static function isMethodIdempotent() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isMethodIdempotent(); - } - - /** - * Checks whether the method is cacheable or not. - * - * @see https://tools.ietf.org/html/rfc7231#section-4.2.3 - * @return bool True for GET and HEAD, false otherwise - * @static - */ - public static function isMethodCacheable() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isMethodCacheable(); - } - - /** - * Returns the protocol version. - * - * If the application is behind a proxy, the protocol version used in the - * requests between the client and the proxy and between the proxy and the - * server might be different. This returns the former (from the "Via" header) - * if the proxy is trusted (see "setTrustedProxies()"), otherwise it returns - * the latter (from the "SERVER_PROTOCOL" server parameter). - * - * @return string - * @static - */ - public static function getProtocolVersion() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getProtocolVersion(); - } - - /** - * Returns the request body content. - * - * @param bool $asResource If true, a resource will be returned - * @return string|resource The request body content or a resource to read the body stream - * @throws \LogicException - * @static - */ - public static function getContent($asResource = false) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getContent($asResource); - } - - /** - * Gets the Etags. - * - * @return array The entity tags - * @static - */ - public static function getETags() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getETags(); - } - - /** - * - * - * @return bool - * @static - */ - public static function isNoCache() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isNoCache(); - } - - /** - * 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. - * - * @static - */ - public static function getPreferredFormat($default = 'html') - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getPreferredFormat($default); - } - - /** - * Returns the preferred language. - * - * @param string[] $locales An array of ordered available locales - * @return string|null The preferred locale - * @static - */ - public static function getPreferredLanguage($locales = null) - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getPreferredLanguage($locales); - } - - /** - * Gets a list of languages acceptable by the client browser. - * - * @return array Languages ordered in the user browser preferences - * @static - */ - public static function getLanguages() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getLanguages(); - } - - /** - * Gets a list of charsets acceptable by the client browser. - * - * @return array List of charsets in preferable order - * @static - */ - public static function getCharsets() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getCharsets(); - } - - /** - * Gets a list of encodings acceptable by the client browser. - * - * @return array List of encodings in preferable order - * @static - */ - public static function getEncodings() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getEncodings(); - } - - /** - * Gets a list of content types acceptable by the client browser. - * - * @return array List of content types in preferable order - * @static - */ - public static function getAcceptableContentTypes() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->getAcceptableContentTypes(); - } - - /** - * Returns true if the request is a XMLHttpRequest. - * - * It works if your JavaScript library sets an X-Requested-With HTTP header. - * It is known to work with common JavaScript frameworks: - * - * @see https://wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript - * @return bool true if the request is an XMLHttpRequest, false otherwise - * @static - */ - public static function isXmlHttpRequest() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isXmlHttpRequest(); - } - - /** - * Indicates whether this request originated from a trusted proxy. - * - * This can be useful to determine whether or not to trust the - * contents of a proxy-specific header. - * - * @return bool true if the request came from a trusted proxy, false otherwise - * @static - */ - public static function isFromTrustedProxy() - { - //Method inherited from \Symfony\Component\HttpFoundation\Request - /** @var \Illuminate\Http\Request $instance */ - return $instance->isFromTrustedProxy(); - } - - /** - * Determine if the given content types match. - * - * @param string $actual - * @param string $type - * @return bool - * @static - */ - public static function matchesType($actual, $type) - { - return \Illuminate\Http\Request::matchesType($actual, $type); - } - - /** - * Determine if the request is sending JSON. - * - * @return bool - * @static - */ - public static function isJson() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->isJson(); - } - - /** - * Determine if the current request probably expects a JSON response. - * - * @return bool - * @static - */ - public static function expectsJson() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->expectsJson(); - } - - /** - * Determine if the current request is asking for JSON. - * - * @return bool - * @static - */ - public static function wantsJson() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->wantsJson(); - } - - /** - * Determines whether the current requests accepts a given content type. - * - * @param string|array $contentTypes - * @return bool - * @static - */ - public static function accepts($contentTypes) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->accepts($contentTypes); - } - - /** - * Return the most suitable content type from the given array based on content negotiation. - * - * @param string|array $contentTypes - * @return string|null - * @static - */ - public static function prefers($contentTypes) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->prefers($contentTypes); - } - - /** - * Determine if the current request accepts any content type. - * - * @return bool - * @static - */ - public static function acceptsAnyContentType() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->acceptsAnyContentType(); - } - - /** - * Determines whether a request accepts JSON. - * - * @return bool - * @static - */ - public static function acceptsJson() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->acceptsJson(); - } - - /** - * Determines whether a request accepts HTML. - * - * @return bool - * @static - */ - public static function acceptsHtml() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->acceptsHtml(); - } - - /** - * Get the data format expected in the response. - * - * @param string $default - * @return string - * @static - */ - public static function format($default = 'html') - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->format($default); - } - - /** - * Retrieve an old input item. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function old($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->old($key, $default); - } - - /** - * Flash the input for the current request to the session. - * - * @return void - * @static - */ - public static function flash() - { - /** @var \Illuminate\Http\Request $instance */ - $instance->flash(); - } - - /** - * Flash only some of the input to the session. - * - * @param array|mixed $keys - * @return void - * @static - */ - public static function flashOnly($keys) - { - /** @var \Illuminate\Http\Request $instance */ - $instance->flashOnly($keys); - } - - /** - * Flash only some of the input to the session. - * - * @param array|mixed $keys - * @return void - * @static - */ - public static function flashExcept($keys) - { - /** @var \Illuminate\Http\Request $instance */ - $instance->flashExcept($keys); - } - - /** - * Flush all of the old input from the session. - * - * @return void - * @static - */ - public static function flush() - { - /** @var \Illuminate\Http\Request $instance */ - $instance->flush(); - } - - /** - * Retrieve a server variable from the request. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function server($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->server($key, $default); - } - - /** - * Determine if a header is set on the request. - * - * @param string $key - * @return bool - * @static - */ - public static function hasHeader($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasHeader($key); - } - - /** - * Retrieve a header from the request. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function header($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->header($key, $default); - } - - /** - * Get the bearer token from the request headers. - * - * @return string|null - * @static - */ - public static function bearerToken() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->bearerToken(); - } - - /** - * Determine if the request contains a given input item key. - * - * @param string|array $key - * @return bool - * @static - */ - public static function exists($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->exists($key); - } - - /** - * Determine if the request contains a given input item key. - * - * @param string|array $key - * @return bool - * @static - */ - public static function has($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->has($key); - } - - /** - * Determine if the request contains any of the given inputs. - * - * @param string|array $keys - * @return bool - * @static - */ - public static function hasAny($keys) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasAny($keys); - } - - /** - * Determine if the request contains a non-empty value for an input item. - * - * @param string|array $key - * @return bool - * @static - */ - public static function filled($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->filled($key); - } - - /** - * Determine if the request contains a non-empty value for any of the given inputs. - * - * @param string|array $keys - * @return bool - * @static - */ - public static function anyFilled($keys) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->anyFilled($keys); - } - - /** - * Get the keys for all of the input and files. - * - * @return array - * @static - */ - public static function keys() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->keys(); - } - - /** - * Get all of the input and files for the request. - * - * @param array|mixed $keys - * @return array - * @static - */ - public static function all($keys = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->all($keys); - } - - /** - * Retrieve an input item from the request. - * - * @param string|null $key - * @param string|array|null $default - * @return string|array|null - * @static - */ - public static function input($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->input($key, $default); - } - - /** - * Get a subset containing the provided keys with values from the input data. - * - * @param array|mixed $keys - * @return array - * @static - */ - public static function only($keys) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->only($keys); - } - - /** - * Get all of the input except for a specified array of items. - * - * @param array|mixed $keys - * @return array - * @static - */ - public static function except($keys) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->except($keys); - } - - /** - * Retrieve a query string item from the request. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function query($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->query($key, $default); - } - - /** - * Retrieve a request payload item from the request. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function post($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->post($key, $default); - } - - /** - * Determine if a cookie is set on the request. - * - * @param string $key - * @return bool - * @static - */ - public static function hasCookie($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasCookie($key); - } - - /** - * Retrieve a cookie from the request. - * - * @param string $key - * @param string|array|null $default - * @return string|array - * @static - */ - public static function cookie($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->cookie($key, $default); - } - - /** - * Get an array of all of the files on the request. - * - * @return array - * @static - */ - public static function allFiles() - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->allFiles(); - } - - /** - * Determine if the uploaded data contains a file. - * - * @param string $key - * @return bool - * @static - */ - public static function hasFile($key) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->hasFile($key); - } - - /** - * Retrieve a file from the request. - * - * @param string $key - * @param mixed $default - * @return \Illuminate\Http\UploadedFile|array|null - * @static - */ - public static function file($key = null, $default = null) - { - /** @var \Illuminate\Http\Request $instance */ - return $instance->file($key, $default); - } - - /** - * Register a custom macro. - * - * @param string $name - * @param object|callable $macro - * @return void - * @static - */ - public static function macro($name, $macro) - { - \Illuminate\Http\Request::macro($name, $macro); - } - - /** - * Mix another object into the class. - * - * @param object $mixin - * @return void - * @throws \ReflectionException - * @static - */ - public static function mixin($mixin) - { - \Illuminate\Http\Request::mixin($mixin); - } - - /** - * Checks if macro is registered. - * - * @param string $name - * @return bool - * @static - */ - public static function hasMacro($name) - { - return \Illuminate\Http\Request::hasMacro($name); - } - - /** - * - * - * @static - */ - public static function validate($rules, ...$params) - { - return \Illuminate\Http\Request::validate($rules, ...$params); - } - - /** - * - * - * @static - */ - public static function hasValidSignature() - { - return \Illuminate\Http\Request::hasValidSignature(); - } - - } } @@ -16745,6 +15511,20 @@ namespace Collective\Html { return $instance->button($value, $options); } + /** + * Create a datalist box field. + * + * @param string $id + * @param array $list + * @return \Illuminate\Support\HtmlString + * @static + */ + public static function datalist($id, $list = []) + { + /** @var \Collective\Html\FormBuilder $instance */ + return $instance->datalist($id, $list); + } + /** * Get the ID attribute for a field name. * @@ -16852,13 +15632,14 @@ namespace Collective\Html { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Collective\Html\FormBuilder::mixin($mixin); + \Collective\Html\FormBuilder::mixin($mixin, $replace); } /** @@ -17277,13 +16058,14 @@ namespace Collective\Html { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Collective\Html\HtmlBuilder::mixin($mixin); + \Collective\Html\HtmlBuilder::mixin($mixin, $replace); } /** @@ -17702,13 +16484,14 @@ namespace Collective\Html { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Collective\Html\HtmlBuilder::mixin($mixin); + \Collective\Html\HtmlBuilder::mixin($mixin, $replace); } /** @@ -17855,35 +16638,496 @@ namespace Intervention\Image\Facades { namespace Carbon { /** - * A simple API extension for DateTime + * A simple API extension for DateTime. + * + * * - * @property int $year - * @property int $yearIso - * @property int $month - * @property int $day - * @property int $hour - * @property int $minute - * @property int $second - * @property int $timestamp seconds since the Unix Epoch - * @property \DateTimeZone $timezone the current timezone - * @property \DateTimeZone $tz alias of timezone - * @property-read int $micro - * @property-read int $dayOfWeek 0 (for Sunday) through 6 (for Saturday) - * @property-read int $dayOfWeekIso 1 (for Monday) through 7 (for Sunday) - * @property-read int $dayOfYear 0 through 365 - * @property-read int $weekOfMonth 1 through 5 - * @property-read int $weekNumberInMonth 1 through 5 - * @property-read int $weekOfYear ISO-8601 week number of year, weeks starting on Monday - * @property-read int $daysInMonth number of days in the given month - * @property-read int $age does a diffInYears() with default parameters - * @property-read int $quarter the quarter of this instance, 1 - 4 - * @property-read int $offset the timezone offset in seconds from UTC - * @property-read int $offsetHours the timezone offset in hours from UTC - * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise - * @property-read bool $local checks if the timezone is local, true if local, false otherwise - * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise - * @property-read string $timezoneName - * @property-read string $tzName + * @property int $year + * @property int $yearIso + * @property int $month + * @property int $day + * @property int $hour + * @property int $minute + * @property int $second + * @property int $micro + * @property int $microsecond + * @property int $timestamp seconds since the Unix Epoch + * @property string $englishDayOfWeek the day of week in English + * @property string $shortEnglishDayOfWeek the abbreviated day of week in English + * @property string $englishMonth the month in English + * @property string $shortEnglishMonth the abbreviated month in English + * @property string $localeDayOfWeek the day of week in current locale LC_TIME + * @property string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME + * @property string $localeMonth the month in current locale LC_TIME + * @property string $shortLocaleMonth the abbreviated month in current locale LC_TIME + * @property int $milliseconds + * @property int $millisecond + * @property int $milli + * @property int $week 1 through 53 + * @property int $isoWeek 1 through 53 + * @property int $weekYear year according to week format + * @property int $isoWeekYear year according to ISO week format + * @property int $dayOfYear 1 through 366 + * @property int $age does a diffInYears() with default parameters + * @property int $offset the timezone offset in seconds from UTC + * @property int $offsetMinutes the timezone offset in minutes from UTC + * @property int $offsetHours the timezone offset in hours from UTC + * @property CarbonTimeZone $timezone the current timezone + * @property CarbonTimeZone $tz alias of $timezone + * @property-read int $dayOfWeek 0 (for Sunday) through 6 (for Saturday) + * @property-read int $dayOfWeekIso 1 (for Monday) through 7 (for Sunday) + * @property-read int $weekOfYear ISO-8601 week number of year, weeks starting on Monday + * @property-read int $daysInMonth number of days in the given month + * @property-read string $latinMeridiem "am"/"pm" (Ante meridiem or Post meridiem latin lowercase mark) + * @property-read string $latinUpperMeridiem "AM"/"PM" (Ante meridiem or Post meridiem latin uppercase mark) + * @property-read string $timezoneAbbreviatedName the current timezone abbreviated name + * @property-read string $tzAbbrName alias of $timezoneAbbreviatedName + * @property-read string $dayName long name of weekday translated according to Carbon locale, in english if no translation available for current language + * @property-read string $shortDayName short name of weekday translated according to Carbon locale, in english if no translation available for current language + * @property-read string $minDayName very short name of weekday translated according to Carbon locale, in english if no translation available for current language + * @property-read string $monthName long name of month translated according to Carbon locale, in english if no translation available for current language + * @property-read string $shortMonthName short name of month translated according to Carbon locale, in english if no translation available for current language + * @property-read string $meridiem lowercase meridiem mark translated according to Carbon locale, in latin if no translation available for current language + * @property-read string $upperMeridiem uppercase meridiem mark translated according to Carbon locale, in latin if no translation available for current language + * @property-read int $noZeroHour current hour from 1 to 24 + * @property-read int $weeksInYear 51 through 53 + * @property-read int $isoWeeksInYear 51 through 53 + * @property-read int $weekOfMonth 1 through 5 + * @property-read int $weekNumberInMonth 1 through 5 + * @property-read int $firstWeekDay 0 through 6 + * @property-read int $lastWeekDay 0 through 6 + * @property-read int $daysInYear 365 or 366 + * @property-read int $quarter the quarter of this instance, 1 - 4 + * @property-read int $decade the decade of this instance + * @property-read int $century the century of this instance + * @property-read int $millennium the millennium of this instance + * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise + * @property-read bool $local checks if the timezone is local, true if local, false otherwise + * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise + * @property-read string $timezoneName the current timezone name + * @property-read string $tzName alias of $timezoneName + * @property-read string $locale locale of the current instance + * @method bool isUtc() Check if the current instance has UTC timezone. (Both isUtc and isUTC cases are valid.) + * @method bool isLocal() Check if the current instance has non-UTC timezone. + * @method bool isValid() Check if the current instance is a valid date. + * @method bool isDST() Check if the current instance is in a daylight saving time. + * @method bool isSunday() Checks if the instance day is sunday. + * @method bool isMonday() Checks if the instance day is monday. + * @method bool isTuesday() Checks if the instance day is tuesday. + * @method bool isWednesday() Checks if the instance day is wednesday. + * @method bool isThursday() Checks if the instance day is thursday. + * @method bool isFriday() Checks if the instance day is friday. + * @method bool isSaturday() Checks if the instance day is saturday. + * @method bool isSameYear(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same year as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentYear() Checks if the instance is in the same year as the current moment. + * @method bool isNextYear() Checks if the instance is in the same year as the current moment next year. + * @method bool isLastYear() Checks if the instance is in the same year as the current moment last year. + * @method bool isSameWeek(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same week as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentWeek() Checks if the instance is in the same week as the current moment. + * @method bool isNextWeek() Checks if the instance is in the same week as the current moment next week. + * @method bool isLastWeek() Checks if the instance is in the same week as the current moment last week. + * @method bool isSameDay(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same day as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentDay() Checks if the instance is in the same day as the current moment. + * @method bool isNextDay() Checks if the instance is in the same day as the current moment next day. + * @method bool isLastDay() Checks if the instance is in the same day as the current moment last day. + * @method bool isSameHour(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same hour as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentHour() Checks if the instance is in the same hour as the current moment. + * @method bool isNextHour() Checks if the instance is in the same hour as the current moment next hour. + * @method bool isLastHour() Checks if the instance is in the same hour as the current moment last hour. + * @method bool isSameMinute(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same minute as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentMinute() Checks if the instance is in the same minute as the current moment. + * @method bool isNextMinute() Checks if the instance is in the same minute as the current moment next minute. + * @method bool isLastMinute() Checks if the instance is in the same minute as the current moment last minute. + * @method bool isSameSecond(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same second as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentSecond() Checks if the instance is in the same second as the current moment. + * @method bool isNextSecond() Checks if the instance is in the same second as the current moment next second. + * @method bool isLastSecond() Checks if the instance is in the same second as the current moment last second. + * @method bool isSameMicro(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same microsecond as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentMicro() Checks if the instance is in the same microsecond as the current moment. + * @method bool isNextMicro() Checks if the instance is in the same microsecond as the current moment next microsecond. + * @method bool isLastMicro() Checks if the instance is in the same microsecond as the current moment last microsecond. + * @method bool isSameMicrosecond(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same microsecond as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentMicrosecond() Checks if the instance is in the same microsecond as the current moment. + * @method bool isNextMicrosecond() Checks if the instance is in the same microsecond as the current moment next microsecond. + * @method bool isLastMicrosecond() Checks if the instance is in the same microsecond as the current moment last microsecond. + * @method bool isCurrentMonth() Checks if the instance is in the same month as the current moment. + * @method bool isNextMonth() Checks if the instance is in the same month as the current moment next month. + * @method bool isLastMonth() Checks if the instance is in the same month as the current moment last month. + * @method bool isCurrentQuarter() Checks if the instance is in the same quarter as the current moment. + * @method bool isNextQuarter() Checks if the instance is in the same quarter as the current moment next quarter. + * @method bool isLastQuarter() Checks if the instance is in the same quarter as the current moment last quarter. + * @method bool isSameDecade(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same decade as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentDecade() Checks if the instance is in the same decade as the current moment. + * @method bool isNextDecade() Checks if the instance is in the same decade as the current moment next decade. + * @method bool isLastDecade() Checks if the instance is in the same decade as the current moment last decade. + * @method bool isSameCentury(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same century as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentCentury() Checks if the instance is in the same century as the current moment. + * @method bool isNextCentury() Checks if the instance is in the same century as the current moment next century. + * @method bool isLastCentury() Checks if the instance is in the same century as the current moment last century. + * @method bool isSameMillennium(\Carbon\Carbon|\DateTimeInterface|string|null $date = null) Checks if the given date is in the same millennium as the instance. If null passed, compare to now (with the same timezone). + * @method bool isCurrentMillennium() Checks if the instance is in the same millennium as the current moment. + * @method bool isNextMillennium() Checks if the instance is in the same millennium as the current moment next millennium. + * @method bool isLastMillennium() Checks if the instance is in the same millennium as the current moment last millennium. + * @method Carbon years(int $value) Set current instance year to the given value. + * @method Carbon year(int $value) Set current instance year to the given value. + * @method Carbon setYears(int $value) Set current instance year to the given value. + * @method Carbon setYear(int $value) Set current instance year to the given value. + * @method Carbon months(int $value) Set current instance month to the given value. + * @method Carbon month(int $value) Set current instance month to the given value. + * @method Carbon setMonths(int $value) Set current instance month to the given value. + * @method Carbon setMonth(int $value) Set current instance month to the given value. + * @method Carbon days(int $value) Set current instance day to the given value. + * @method Carbon day(int $value) Set current instance day to the given value. + * @method Carbon setDays(int $value) Set current instance day to the given value. + * @method Carbon setDay(int $value) Set current instance day to the given value. + * @method Carbon hours(int $value) Set current instance hour to the given value. + * @method Carbon hour(int $value) Set current instance hour to the given value. + * @method Carbon setHours(int $value) Set current instance hour to the given value. + * @method Carbon setHour(int $value) Set current instance hour to the given value. + * @method Carbon minutes(int $value) Set current instance minute to the given value. + * @method Carbon minute(int $value) Set current instance minute to the given value. + * @method Carbon setMinutes(int $value) Set current instance minute to the given value. + * @method Carbon setMinute(int $value) Set current instance minute to the given value. + * @method Carbon seconds(int $value) Set current instance second to the given value. + * @method Carbon second(int $value) Set current instance second to the given value. + * @method Carbon setSeconds(int $value) Set current instance second to the given value. + * @method Carbon setSecond(int $value) Set current instance second to the given value. + * @method Carbon millis(int $value) Set current instance millisecond to the given value. + * @method Carbon milli(int $value) Set current instance millisecond to the given value. + * @method Carbon setMillis(int $value) Set current instance millisecond to the given value. + * @method Carbon setMilli(int $value) Set current instance millisecond to the given value. + * @method Carbon milliseconds(int $value) Set current instance millisecond to the given value. + * @method Carbon millisecond(int $value) Set current instance millisecond to the given value. + * @method Carbon setMilliseconds(int $value) Set current instance millisecond to the given value. + * @method Carbon setMillisecond(int $value) Set current instance millisecond to the given value. + * @method Carbon micros(int $value) Set current instance microsecond to the given value. + * @method Carbon micro(int $value) Set current instance microsecond to the given value. + * @method Carbon setMicros(int $value) Set current instance microsecond to the given value. + * @method Carbon setMicro(int $value) Set current instance microsecond to the given value. + * @method Carbon microseconds(int $value) Set current instance microsecond to the given value. + * @method Carbon microsecond(int $value) Set current instance microsecond to the given value. + * @method Carbon setMicroseconds(int $value) Set current instance microsecond to the given value. + * @method Carbon setMicrosecond(int $value) Set current instance microsecond to the given value. + * @method Carbon addYears(int $value = 1) Add years (the $value count passed in) to the instance (using date interval). + * @method Carbon addYear() Add one year to the instance (using date interval). + * @method Carbon subYears(int $value = 1) Sub years (the $value count passed in) to the instance (using date interval). + * @method Carbon subYear() Sub one year to the instance (using date interval). + * @method Carbon addYearsWithOverflow(int $value = 1) Add years (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addYearWithOverflow() Add one year to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subYearsWithOverflow(int $value = 1) Sub years (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subYearWithOverflow() Sub one year to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addYearsWithoutOverflow(int $value = 1) Add years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addYearWithoutOverflow() Add one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearsWithoutOverflow(int $value = 1) Sub years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearWithoutOverflow() Sub one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addYearsWithNoOverflow(int $value = 1) Add years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addYearWithNoOverflow() Add one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearsWithNoOverflow(int $value = 1) Sub years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearWithNoOverflow() Sub one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addYearsNoOverflow(int $value = 1) Add years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addYearNoOverflow() Add one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearsNoOverflow(int $value = 1) Sub years (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subYearNoOverflow() Sub one year to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonths(int $value = 1) Add months (the $value count passed in) to the instance (using date interval). + * @method Carbon addMonth() Add one month to the instance (using date interval). + * @method Carbon subMonths(int $value = 1) Sub months (the $value count passed in) to the instance (using date interval). + * @method Carbon subMonth() Sub one month to the instance (using date interval). + * @method Carbon addMonthsWithOverflow(int $value = 1) Add months (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addMonthWithOverflow() Add one month to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subMonthsWithOverflow(int $value = 1) Sub months (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subMonthWithOverflow() Sub one month to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addMonthsWithoutOverflow(int $value = 1) Add months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonthWithoutOverflow() Add one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthsWithoutOverflow(int $value = 1) Sub months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthWithoutOverflow() Sub one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonthsWithNoOverflow(int $value = 1) Add months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonthWithNoOverflow() Add one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthsWithNoOverflow(int $value = 1) Sub months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthWithNoOverflow() Sub one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonthsNoOverflow(int $value = 1) Add months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMonthNoOverflow() Add one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthsNoOverflow(int $value = 1) Sub months (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMonthNoOverflow() Sub one month to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDays(int $value = 1) Add days (the $value count passed in) to the instance (using date interval). + * @method Carbon addDay() Add one day to the instance (using date interval). + * @method Carbon subDays(int $value = 1) Sub days (the $value count passed in) to the instance (using date interval). + * @method Carbon subDay() Sub one day to the instance (using date interval). + * @method Carbon addHours(int $value = 1) Add hours (the $value count passed in) to the instance (using date interval). + * @method Carbon addHour() Add one hour to the instance (using date interval). + * @method Carbon subHours(int $value = 1) Sub hours (the $value count passed in) to the instance (using date interval). + * @method Carbon subHour() Sub one hour to the instance (using date interval). + * @method Carbon addMinutes(int $value = 1) Add minutes (the $value count passed in) to the instance (using date interval). + * @method Carbon addMinute() Add one minute to the instance (using date interval). + * @method Carbon subMinutes(int $value = 1) Sub minutes (the $value count passed in) to the instance (using date interval). + * @method Carbon subMinute() Sub one minute to the instance (using date interval). + * @method Carbon addSeconds(int $value = 1) Add seconds (the $value count passed in) to the instance (using date interval). + * @method Carbon addSecond() Add one second to the instance (using date interval). + * @method Carbon subSeconds(int $value = 1) Sub seconds (the $value count passed in) to the instance (using date interval). + * @method Carbon subSecond() Sub one second to the instance (using date interval). + * @method Carbon addMillis(int $value = 1) Add milliseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon addMilli() Add one millisecond to the instance (using date interval). + * @method Carbon subMillis(int $value = 1) Sub milliseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon subMilli() Sub one millisecond to the instance (using date interval). + * @method Carbon addMilliseconds(int $value = 1) Add milliseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon addMillisecond() Add one millisecond to the instance (using date interval). + * @method Carbon subMilliseconds(int $value = 1) Sub milliseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon subMillisecond() Sub one millisecond to the instance (using date interval). + * @method Carbon addMicros(int $value = 1) Add microseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon addMicro() Add one microsecond to the instance (using date interval). + * @method Carbon subMicros(int $value = 1) Sub microseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon subMicro() Sub one microsecond to the instance (using date interval). + * @method Carbon addMicroseconds(int $value = 1) Add microseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon addMicrosecond() Add one microsecond to the instance (using date interval). + * @method Carbon subMicroseconds(int $value = 1) Sub microseconds (the $value count passed in) to the instance (using date interval). + * @method Carbon subMicrosecond() Sub one microsecond to the instance (using date interval). + * @method Carbon addMillennia(int $value = 1) Add millennia (the $value count passed in) to the instance (using date interval). + * @method Carbon addMillennium() Add one millennium to the instance (using date interval). + * @method Carbon subMillennia(int $value = 1) Sub millennia (the $value count passed in) to the instance (using date interval). + * @method Carbon subMillennium() Sub one millennium to the instance (using date interval). + * @method Carbon addMillenniaWithOverflow(int $value = 1) Add millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addMillenniumWithOverflow() Add one millennium to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subMillenniaWithOverflow(int $value = 1) Sub millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subMillenniumWithOverflow() Sub one millennium to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addMillenniaWithoutOverflow(int $value = 1) Add millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMillenniumWithoutOverflow() Add one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniaWithoutOverflow(int $value = 1) Sub millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniumWithoutOverflow() Sub one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMillenniaWithNoOverflow(int $value = 1) Add millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMillenniumWithNoOverflow() Add one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniaWithNoOverflow(int $value = 1) Sub millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniumWithNoOverflow() Sub one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMillenniaNoOverflow(int $value = 1) Add millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addMillenniumNoOverflow() Add one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniaNoOverflow(int $value = 1) Sub millennia (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subMillenniumNoOverflow() Sub one millennium to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturies(int $value = 1) Add centuries (the $value count passed in) to the instance (using date interval). + * @method Carbon addCentury() Add one century to the instance (using date interval). + * @method Carbon subCenturies(int $value = 1) Sub centuries (the $value count passed in) to the instance (using date interval). + * @method Carbon subCentury() Sub one century to the instance (using date interval). + * @method Carbon addCenturiesWithOverflow(int $value = 1) Add centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addCenturyWithOverflow() Add one century to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subCenturiesWithOverflow(int $value = 1) Sub centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subCenturyWithOverflow() Sub one century to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addCenturiesWithoutOverflow(int $value = 1) Add centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturyWithoutOverflow() Add one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturiesWithoutOverflow(int $value = 1) Sub centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturyWithoutOverflow() Sub one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturiesWithNoOverflow(int $value = 1) Add centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturyWithNoOverflow() Add one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturiesWithNoOverflow(int $value = 1) Sub centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturyWithNoOverflow() Sub one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturiesNoOverflow(int $value = 1) Add centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addCenturyNoOverflow() Add one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturiesNoOverflow(int $value = 1) Sub centuries (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subCenturyNoOverflow() Sub one century to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecades(int $value = 1) Add decades (the $value count passed in) to the instance (using date interval). + * @method Carbon addDecade() Add one decade to the instance (using date interval). + * @method Carbon subDecades(int $value = 1) Sub decades (the $value count passed in) to the instance (using date interval). + * @method Carbon subDecade() Sub one decade to the instance (using date interval). + * @method Carbon addDecadesWithOverflow(int $value = 1) Add decades (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addDecadeWithOverflow() Add one decade to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subDecadesWithOverflow(int $value = 1) Sub decades (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subDecadeWithOverflow() Sub one decade to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addDecadesWithoutOverflow(int $value = 1) Add decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecadeWithoutOverflow() Add one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadesWithoutOverflow(int $value = 1) Sub decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadeWithoutOverflow() Sub one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecadesWithNoOverflow(int $value = 1) Add decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecadeWithNoOverflow() Add one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadesWithNoOverflow(int $value = 1) Sub decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadeWithNoOverflow() Sub one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecadesNoOverflow(int $value = 1) Add decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addDecadeNoOverflow() Add one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadesNoOverflow(int $value = 1) Sub decades (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subDecadeNoOverflow() Sub one decade to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuarters(int $value = 1) Add quarters (the $value count passed in) to the instance (using date interval). + * @method Carbon addQuarter() Add one quarter to the instance (using date interval). + * @method Carbon subQuarters(int $value = 1) Sub quarters (the $value count passed in) to the instance (using date interval). + * @method Carbon subQuarter() Sub one quarter to the instance (using date interval). + * @method Carbon addQuartersWithOverflow(int $value = 1) Add quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addQuarterWithOverflow() Add one quarter to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subQuartersWithOverflow(int $value = 1) Sub quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon subQuarterWithOverflow() Sub one quarter to the instance (using date interval) with overflow explicitly allowed. + * @method Carbon addQuartersWithoutOverflow(int $value = 1) Add quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuarterWithoutOverflow() Add one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuartersWithoutOverflow(int $value = 1) Sub quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuarterWithoutOverflow() Sub one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuartersWithNoOverflow(int $value = 1) Add quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuarterWithNoOverflow() Add one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuartersWithNoOverflow(int $value = 1) Sub quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuarterWithNoOverflow() Sub one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuartersNoOverflow(int $value = 1) Add quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addQuarterNoOverflow() Add one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuartersNoOverflow(int $value = 1) Sub quarters (the $value count passed in) to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon subQuarterNoOverflow() Sub one quarter to the instance (using date interval) with overflow explicitly forbidden. + * @method Carbon addWeeks(int $value = 1) Add weeks (the $value count passed in) to the instance (using date interval). + * @method Carbon addWeek() Add one week to the instance (using date interval). + * @method Carbon subWeeks(int $value = 1) Sub weeks (the $value count passed in) to the instance (using date interval). + * @method Carbon subWeek() Sub one week to the instance (using date interval). + * @method Carbon addWeekdays(int $value = 1) Add weekdays (the $value count passed in) to the instance (using date interval). + * @method Carbon addWeekday() Add one weekday to the instance (using date interval). + * @method Carbon subWeekdays(int $value = 1) Sub weekdays (the $value count passed in) to the instance (using date interval). + * @method Carbon subWeekday() Sub one weekday to the instance (using date interval). + * @method Carbon addRealMicros(int $value = 1) Add microseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMicro() Add one microsecond to the instance (using timestamp). + * @method Carbon subRealMicros(int $value = 1) Sub microseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMicro() Sub one microsecond to the instance (using timestamp). + * @method CarbonPeriod microsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each microsecond or every X microseconds if a factor is given. + * @method Carbon addRealMicroseconds(int $value = 1) Add microseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMicrosecond() Add one microsecond to the instance (using timestamp). + * @method Carbon subRealMicroseconds(int $value = 1) Sub microseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMicrosecond() Sub one microsecond to the instance (using timestamp). + * @method CarbonPeriod microsecondsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each microsecond or every X microseconds if a factor is given. + * @method Carbon addRealMillis(int $value = 1) Add milliseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMilli() Add one millisecond to the instance (using timestamp). + * @method Carbon subRealMillis(int $value = 1) Sub milliseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMilli() Sub one millisecond to the instance (using timestamp). + * @method CarbonPeriod millisUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each millisecond or every X milliseconds if a factor is given. + * @method Carbon addRealMilliseconds(int $value = 1) Add milliseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMillisecond() Add one millisecond to the instance (using timestamp). + * @method Carbon subRealMilliseconds(int $value = 1) Sub milliseconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMillisecond() Sub one millisecond to the instance (using timestamp). + * @method CarbonPeriod millisecondsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each millisecond or every X milliseconds if a factor is given. + * @method Carbon addRealSeconds(int $value = 1) Add seconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealSecond() Add one second to the instance (using timestamp). + * @method Carbon subRealSeconds(int $value = 1) Sub seconds (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealSecond() Sub one second to the instance (using timestamp). + * @method CarbonPeriod secondsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each second or every X seconds if a factor is given. + * @method Carbon addRealMinutes(int $value = 1) Add minutes (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMinute() Add one minute to the instance (using timestamp). + * @method Carbon subRealMinutes(int $value = 1) Sub minutes (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMinute() Sub one minute to the instance (using timestamp). + * @method CarbonPeriod minutesUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each minute or every X minutes if a factor is given. + * @method Carbon addRealHours(int $value = 1) Add hours (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealHour() Add one hour to the instance (using timestamp). + * @method Carbon subRealHours(int $value = 1) Sub hours (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealHour() Sub one hour to the instance (using timestamp). + * @method CarbonPeriod hoursUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each hour or every X hours if a factor is given. + * @method Carbon addRealDays(int $value = 1) Add days (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealDay() Add one day to the instance (using timestamp). + * @method Carbon subRealDays(int $value = 1) Sub days (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealDay() Sub one day to the instance (using timestamp). + * @method CarbonPeriod daysUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each day or every X days if a factor is given. + * @method Carbon addRealWeeks(int $value = 1) Add weeks (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealWeek() Add one week to the instance (using timestamp). + * @method Carbon subRealWeeks(int $value = 1) Sub weeks (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealWeek() Sub one week to the instance (using timestamp). + * @method CarbonPeriod weeksUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each week or every X weeks if a factor is given. + * @method Carbon addRealMonths(int $value = 1) Add months (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMonth() Add one month to the instance (using timestamp). + * @method Carbon subRealMonths(int $value = 1) Sub months (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMonth() Sub one month to the instance (using timestamp). + * @method CarbonPeriod monthsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each month or every X months if a factor is given. + * @method Carbon addRealQuarters(int $value = 1) Add quarters (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealQuarter() Add one quarter to the instance (using timestamp). + * @method Carbon subRealQuarters(int $value = 1) Sub quarters (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealQuarter() Sub one quarter to the instance (using timestamp). + * @method CarbonPeriod quartersUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each quarter or every X quarters if a factor is given. + * @method Carbon addRealYears(int $value = 1) Add years (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealYear() Add one year to the instance (using timestamp). + * @method Carbon subRealYears(int $value = 1) Sub years (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealYear() Sub one year to the instance (using timestamp). + * @method CarbonPeriod yearsUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each year or every X years if a factor is given. + * @method Carbon addRealDecades(int $value = 1) Add decades (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealDecade() Add one decade to the instance (using timestamp). + * @method Carbon subRealDecades(int $value = 1) Sub decades (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealDecade() Sub one decade to the instance (using timestamp). + * @method CarbonPeriod decadesUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each decade or every X decades if a factor is given. + * @method Carbon addRealCenturies(int $value = 1) Add centuries (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealCentury() Add one century to the instance (using timestamp). + * @method Carbon subRealCenturies(int $value = 1) Sub centuries (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealCentury() Sub one century to the instance (using timestamp). + * @method CarbonPeriod centuriesUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each century or every X centuries if a factor is given. + * @method Carbon addRealMillennia(int $value = 1) Add millennia (the $value count passed in) to the instance (using timestamp). + * @method Carbon addRealMillennium() Add one millennium to the instance (using timestamp). + * @method Carbon subRealMillennia(int $value = 1) Sub millennia (the $value count passed in) to the instance (using timestamp). + * @method Carbon subRealMillennium() Sub one millennium to the instance (using timestamp). + * @method CarbonPeriod millenniaUntil($endDate = null, int $factor = 1) Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each millennium or every X millennia if a factor is given. + * @method Carbon roundYear(float $precision = 1, string $function = "round") Round the current instance year with given precision using the given function. + * @method Carbon roundYears(float $precision = 1, string $function = "round") Round the current instance year with given precision using the given function. + * @method Carbon floorYear(float $precision = 1) Truncate the current instance year with given precision. + * @method Carbon floorYears(float $precision = 1) Truncate the current instance year with given precision. + * @method Carbon ceilYear(float $precision = 1) Ceil the current instance year with given precision. + * @method Carbon ceilYears(float $precision = 1) Ceil the current instance year with given precision. + * @method Carbon roundMonth(float $precision = 1, string $function = "round") Round the current instance month with given precision using the given function. + * @method Carbon roundMonths(float $precision = 1, string $function = "round") Round the current instance month with given precision using the given function. + * @method Carbon floorMonth(float $precision = 1) Truncate the current instance month with given precision. + * @method Carbon floorMonths(float $precision = 1) Truncate the current instance month with given precision. + * @method Carbon ceilMonth(float $precision = 1) Ceil the current instance month with given precision. + * @method Carbon ceilMonths(float $precision = 1) Ceil the current instance month with given precision. + * @method Carbon roundDay(float $precision = 1, string $function = "round") Round the current instance day with given precision using the given function. + * @method Carbon roundDays(float $precision = 1, string $function = "round") Round the current instance day with given precision using the given function. + * @method Carbon floorDay(float $precision = 1) Truncate the current instance day with given precision. + * @method Carbon floorDays(float $precision = 1) Truncate the current instance day with given precision. + * @method Carbon ceilDay(float $precision = 1) Ceil the current instance day with given precision. + * @method Carbon ceilDays(float $precision = 1) Ceil the current instance day with given precision. + * @method Carbon roundHour(float $precision = 1, string $function = "round") Round the current instance hour with given precision using the given function. + * @method Carbon roundHours(float $precision = 1, string $function = "round") Round the current instance hour with given precision using the given function. + * @method Carbon floorHour(float $precision = 1) Truncate the current instance hour with given precision. + * @method Carbon floorHours(float $precision = 1) Truncate the current instance hour with given precision. + * @method Carbon ceilHour(float $precision = 1) Ceil the current instance hour with given precision. + * @method Carbon ceilHours(float $precision = 1) Ceil the current instance hour with given precision. + * @method Carbon roundMinute(float $precision = 1, string $function = "round") Round the current instance minute with given precision using the given function. + * @method Carbon roundMinutes(float $precision = 1, string $function = "round") Round the current instance minute with given precision using the given function. + * @method Carbon floorMinute(float $precision = 1) Truncate the current instance minute with given precision. + * @method Carbon floorMinutes(float $precision = 1) Truncate the current instance minute with given precision. + * @method Carbon ceilMinute(float $precision = 1) Ceil the current instance minute with given precision. + * @method Carbon ceilMinutes(float $precision = 1) Ceil the current instance minute with given precision. + * @method Carbon roundSecond(float $precision = 1, string $function = "round") Round the current instance second with given precision using the given function. + * @method Carbon roundSeconds(float $precision = 1, string $function = "round") Round the current instance second with given precision using the given function. + * @method Carbon floorSecond(float $precision = 1) Truncate the current instance second with given precision. + * @method Carbon floorSeconds(float $precision = 1) Truncate the current instance second with given precision. + * @method Carbon ceilSecond(float $precision = 1) Ceil the current instance second with given precision. + * @method Carbon ceilSeconds(float $precision = 1) Ceil the current instance second with given precision. + * @method Carbon roundMillennium(float $precision = 1, string $function = "round") Round the current instance millennium with given precision using the given function. + * @method Carbon roundMillennia(float $precision = 1, string $function = "round") Round the current instance millennium with given precision using the given function. + * @method Carbon floorMillennium(float $precision = 1) Truncate the current instance millennium with given precision. + * @method Carbon floorMillennia(float $precision = 1) Truncate the current instance millennium with given precision. + * @method Carbon ceilMillennium(float $precision = 1) Ceil the current instance millennium with given precision. + * @method Carbon ceilMillennia(float $precision = 1) Ceil the current instance millennium with given precision. + * @method Carbon roundCentury(float $precision = 1, string $function = "round") Round the current instance century with given precision using the given function. + * @method Carbon roundCenturies(float $precision = 1, string $function = "round") Round the current instance century with given precision using the given function. + * @method Carbon floorCentury(float $precision = 1) Truncate the current instance century with given precision. + * @method Carbon floorCenturies(float $precision = 1) Truncate the current instance century with given precision. + * @method Carbon ceilCentury(float $precision = 1) Ceil the current instance century with given precision. + * @method Carbon ceilCenturies(float $precision = 1) Ceil the current instance century with given precision. + * @method Carbon roundDecade(float $precision = 1, string $function = "round") Round the current instance decade with given precision using the given function. + * @method Carbon roundDecades(float $precision = 1, string $function = "round") Round the current instance decade with given precision using the given function. + * @method Carbon floorDecade(float $precision = 1) Truncate the current instance decade with given precision. + * @method Carbon floorDecades(float $precision = 1) Truncate the current instance decade with given precision. + * @method Carbon ceilDecade(float $precision = 1) Ceil the current instance decade with given precision. + * @method Carbon ceilDecades(float $precision = 1) Ceil the current instance decade with given precision. + * @method Carbon roundQuarter(float $precision = 1, string $function = "round") Round the current instance quarter with given precision using the given function. + * @method Carbon roundQuarters(float $precision = 1, string $function = "round") Round the current instance quarter with given precision using the given function. + * @method Carbon floorQuarter(float $precision = 1) Truncate the current instance quarter with given precision. + * @method Carbon floorQuarters(float $precision = 1) Truncate the current instance quarter with given precision. + * @method Carbon ceilQuarter(float $precision = 1) Ceil the current instance quarter with given precision. + * @method Carbon ceilQuarters(float $precision = 1) Ceil the current instance quarter with given precision. + * @method Carbon roundMillisecond(float $precision = 1, string $function = "round") Round the current instance millisecond with given precision using the given function. + * @method Carbon roundMilliseconds(float $precision = 1, string $function = "round") Round the current instance millisecond with given precision using the given function. + * @method Carbon floorMillisecond(float $precision = 1) Truncate the current instance millisecond with given precision. + * @method Carbon floorMilliseconds(float $precision = 1) Truncate the current instance millisecond with given precision. + * @method Carbon ceilMillisecond(float $precision = 1) Ceil the current instance millisecond with given precision. + * @method Carbon ceilMilliseconds(float $precision = 1) Ceil the current instance millisecond with given precision. + * @method Carbon roundMicrosecond(float $precision = 1, string $function = "round") Round the current instance microsecond with given precision using the given function. + * @method Carbon roundMicroseconds(float $precision = 1, string $function = "round") Round the current instance microsecond with given precision using the given function. + * @method Carbon floorMicrosecond(float $precision = 1) Truncate the current instance microsecond with given precision. + * @method Carbon floorMicroseconds(float $precision = 1) Truncate the current instance microsecond with given precision. + * @method Carbon ceilMicrosecond(float $precision = 1) Ceil the current instance microsecond with given precision. + * @method Carbon ceilMicroseconds(float $precision = 1) Ceil the current instance microsecond with given precision. + * @method string shortAbsoluteDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (short format, 'Absolute' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string longAbsoluteDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (long format, 'Absolute' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string shortRelativeDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (short format, 'Relative' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string longRelativeDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (long format, 'Relative' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string shortRelativeToNowDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (short format, 'RelativeToNow' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string longRelativeToNowDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (long format, 'RelativeToNow' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string shortRelativeToOtherDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (short format, 'RelativeToOther' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method string longRelativeToOtherDiffForHumans(\DateTimeInterface $other = null, int $parts = 1) Get the difference (long format, 'RelativeToOther' mode) in a human readable format in the current locale. ($other and $parts parameters can be swapped.) + * @method static Carbon createFromImmutable(\DateTimeImmutable $dateTime) Create a new Carbon object from an immutable date. + * @method static Carbon createFromFormat(string $format, string $time, string|\DateTimeZone $timezone = null) Parse a string into a new Carbon object according to the specified format. + * @method static Carbon __set_state(array $array) https://php.net/manual/en/datetime.set-state.php + * + * */ class Carbon { @@ -17926,156 +17170,235 @@ namespace App\Services { namespace Maatwebsite\Excel\Facades { /** - * LaravelExcel Facade + * * - * @category Laravel Excel - * @version 1.0.0 - * @package maatwebsite/excel - * @copyright Copyright (c) 2013 - 2014 Maatwebsite (http://www.maatwebsite.nl) - * @author Maatwebsite - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL */ class Excel { /** - * Create a new file + * * - * @param $filename - * @param callable|null $callback - * @return \Maatwebsite\Excel\LaravelExcelWriter + * @param object $export + * @param string|null $fileName + * @param string $writerType + * @param array $headers + * @throws \PhpOffice\PhpSpreadsheet\Exception + * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception + * @return \Maatwebsite\Excel\BinaryFileResponse * @static */ - public static function create($filename, $callback = null) + public static function download($export, $fileName, $writerType = null, $headers = []) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->create($filename, $callback); + return $instance->download($export, $fileName, $writerType, $headers); } /** - * Load an existing file + * * - * @param string $file The file we want to load - * @param callback|null $callback - * @param string|null $encoding - * @param bool $noBasePath - * @param callback|null $callbackConfigReader - * @return \Maatwebsite\Excel\LaravelExcelReader + * @param object $export + * @param string $filePath + * @param string|null $disk + * @param string $writerType + * @param mixed $diskOptions + * @throws \PhpOffice\PhpSpreadsheet\Exception + * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception + * @return bool * @static */ - public static function load($file, $callback = null, $encoding = null, $noBasePath = false, $callbackConfigReader = null) + public static function store($export, $filePath, $diskName = null, $writerType = null, $diskOptions = []) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->load($file, $callback, $encoding, $noBasePath, $callbackConfigReader); + return $instance->store($export, $filePath, $diskName, $writerType, $diskOptions); } /** - * Set select sheets + * * - * @param $sheets - * @return \Maatwebsite\Excel\LaravelExcelReader + * @param object $export + * @param string $filePath + * @param string|null $disk + * @param string $writerType + * @param mixed $diskOptions + * @return \Maatwebsite\Excel\PendingDispatch * @static */ - public static function selectSheets($sheets = []) + public static function queue($export, $filePath, $disk = null, $writerType = null, $diskOptions = []) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->selectSheets($sheets); + return $instance->queue($export, $filePath, $disk, $writerType, $diskOptions); } /** - * Select sheets by index + * * - * @param array $sheets - * @return \Maatwebsite\Excel\Excel + * @param object $export + * @param string $writerType + * @return string * @static */ - public static function selectSheetsByIndex($sheets = []) + public static function raw($export, $writerType) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->selectSheetsByIndex($sheets); + return $instance->raw($export, $writerType); } /** - * Batch import + * * - * @param $files - * @param callback $callback - * @return \PHPExcel + * @param object $import + * @param string|\Maatwebsite\Excel\UploadedFile $filePath + * @param string|null $disk + * @param string|null $readerType + * @return \Maatwebsite\Excel\Reader|\Maatwebsite\Excel\PendingDispatch * @static */ - public static function batch($files, $callback) + public static function import($import, $filePath, $disk = null, $readerType = null) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->batch($files, $callback); + return $instance->import($import, $filePath, $disk, $readerType); } /** - * Create a new file and share a view + * * - * @param string $view - * @param array $data - * @param array $mergeData - * @return \Maatwebsite\Excel\LaravelExcelWriter - * @static - */ - public static function shareView($view, $data = [], $mergeData = []) - { - /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->shareView($view, $data, $mergeData); - } - - /** - * Create a new file and load a view - * - * @param string $view - * @param array $data - * @param array $mergeData - * @return \Maatwebsite\Excel\LaravelExcelWriter - * @static - */ - public static function loadView($view, $data = [], $mergeData = []) - { - /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->loadView($view, $data, $mergeData); - } - - /** - * Set filters - * - * @param array $filters - * @return \Excel - * @static - */ - public static function registerFilters($filters = []) - { - /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->registerFilters($filters); - } - - /** - * Enable certain filters - * - * @param string|array $filter - * @param bool|false|string $class - * @return \Excel - * @static - */ - public static function filter($filter, $class = false) - { - /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->filter($filter, $class); - } - - /** - * Get register, enabled (or both) filters - * - * @param string|boolean $key [description] + * @param object $import + * @param string|\Maatwebsite\Excel\UploadedFile $filePath + * @param string|null $disk + * @param string|null $readerType * @return array * @static */ - public static function getFilters($key = false) + public static function toArray($import, $filePath, $disk = null, $readerType = null) { /** @var \Maatwebsite\Excel\Excel $instance */ - return $instance->getFilters($key); + return $instance->toArray($import, $filePath, $disk, $readerType); + } + + /** + * + * + * @param object $import + * @param string|\Maatwebsite\Excel\UploadedFile $filePath + * @param string|null $disk + * @param string|null $readerType + * @return \Maatwebsite\Excel\Collection + * @static + */ + public static function toCollection($import, $filePath, $disk = null, $readerType = null) + { + /** @var \Maatwebsite\Excel\Excel $instance */ + return $instance->toCollection($import, $filePath, $disk, $readerType); + } + + /** + * + * + * @param \Maatwebsite\Excel\ShouldQueue $import + * @param string|\Maatwebsite\Excel\UploadedFile $filePath + * @param string|null $disk + * @param string $readerType + * @return \Maatwebsite\Excel\PendingDispatch + * @static + */ + public static function queueImport($import, $filePath, $disk = null, $readerType = null) + { + /** @var \Maatwebsite\Excel\Excel $instance */ + return $instance->queueImport($import, $filePath, $disk, $readerType); + } + + /** + * + * + * @param string $concern + * @param callable $handler + * @param string $event + * @static + */ + public static function extend($concern, $handler, $event = 'Maatwebsite\\Excel\\Events\\BeforeWriting') + { + return \Maatwebsite\Excel\Excel::extend($concern, $handler, $event); + } + + /** + * When asserting downloaded, stored, queued or imported, use regular expression + * to look for a matching file path. + * + * @return void + * @static + */ + public static function matchByRegex() + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + $instance->matchByRegex(); + } + + /** + * When asserting downloaded, stored, queued or imported, use regular string + * comparison for matching file path. + * + * @return void + * @static + */ + public static function doNotMatchByRegex() + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + $instance->doNotMatchByRegex(); + } + + /** + * + * + * @param string $fileName + * @param callable|null $callback + * @static + */ + public static function assertDownloaded($fileName, $callback = null) + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + return $instance->assertDownloaded($fileName, $callback); + } + + /** + * + * + * @param string $filePath + * @param string|callable|null $disk + * @param callable|null $callback + * @static + */ + public static function assertStored($filePath, $disk = null, $callback = null) + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + return $instance->assertStored($filePath, $disk, $callback); + } + + /** + * + * + * @param string $filePath + * @param string|callable|null $disk + * @param callable|null $callback + * @static + */ + public static function assertQueued($filePath, $disk = null, $callback = null) + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + return $instance->assertQueued($filePath, $disk, $callback); + } + + /** + * + * + * @param string $filePath + * @param string|callable|null $disk + * @param callable|null $callback + * @static + */ + public static function assertImported($filePath, $disk = null, $callback = null) + { + /** @var \Maatwebsite\Excel\Fakes\ExcelFake $instance */ + return $instance->assertImported($filePath, $disk, $callback); } } @@ -18240,13 +17563,14 @@ namespace Yajra\DataTables\Facades { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Yajra\DataTables\DataTables::mixin($mixin); + \Yajra\DataTables\DataTables::mixin($mixin, $replace); } /** @@ -18494,7 +17818,7 @@ namespace App\Services\Facade { * Set the current cart instance. * * @param string|null $instance - * @return \Gloudemans\Shoppingcart\Cart + * @return \Cart * @static */ public static function instance($instance = null) @@ -18535,6 +17859,38 @@ namespace App\Services\Facade { return $instance->add($id, $name, $qty, $price, $options); } + /** + * Sets/adds an additional cost on the cart. + * + * @param string $name + * @param float $price + * @todo add in session + * @static + */ + public static function addCost($name, $price) + { + //Method inherited from \Gloudemans\Shoppingcart\Cart + /** @var \App\Services\Yard $instance */ + return $instance->addCost($name, $price); + } + + /** + * Gets an additional cost by name + * + * @param $name + * @param int|null $decimals + * @param string|null $decimalPoint + * @param string|null $thousandSeparator + * @return string + * @static + */ + public static function getCost($name, $decimals = null, $decimalPoint = null, $thousandSeparator = null) + { + //Method inherited from \Gloudemans\Shoppingcart\Cart + /** @var \App\Services\Yard $instance */ + return $instance->getCost($name, $decimals, $decimalPoint, $thousandSeparator); + } + /** * Update the cart item with the given rowId. * @@ -18581,7 +17937,7 @@ namespace App\Services\Facade { /** * Get the content of the cart. * - * @return \Illuminate\Support\Collection + * @return \Gloudemans\Shoppingcart\Collection * @static */ public static function content() @@ -18608,7 +17964,7 @@ namespace App\Services\Facade { * Search the cart content for a cart item matching the given search closure. * * @param \Closure $search - * @return \Illuminate\Support\Collection + * @return \Gloudemans\Shoppingcart\Collection * @static */ public static function search($search) @@ -18680,242 +18036,788 @@ namespace App\Services\Facade { } -namespace Gloudemans\Shoppingcart\Facades { +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 Barryvdh\DomPDF { /** * * */ - class Cart { + class Facade { /** - * Set the current cart instance. + * Get the DomPDF instance * - * @param string|null $instance - * @return \Gloudemans\Shoppingcart\Cart + * @return \Barryvdh\DomPDF\Dompdf * @static */ - public static function instance($instance = null) + public static function getDomPDF() { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->instance($instance); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->getDomPDF(); } /** - * Get the current cart instance. + * Set the paper size (default A4) * - * @return string + * @param string $paper + * @param string $orientation + * @return \Barryvdh\DomPDF\PDF * @static */ - public static function currentInstance() + public static function setPaper($paper, $orientation = 'portrait') { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->currentInstance(); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->setPaper($paper, $orientation); } /** - * Add an item to the cart. + * Show or hide warnings + * + * @param bool $warnings + * @return \Barryvdh\DomPDF\PDF + * @static + */ + public static function setWarnings($warnings) + { + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->setWarnings($warnings); + } + + /** + * Load a HTML string + * + * @param string $string + * @param string $encoding Not used yet + * @return static + * @static + */ + public static function loadHTML($string, $encoding = null) + { + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->loadHTML($string, $encoding); + } + + /** + * Load a HTML file + * + * @param string $file + * @return static + * @static + */ + public static function loadFile($file) + { + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->loadFile($file); + } + + /** + * Add metadata info + * + * @param array $info + * @return static + * @static + */ + public static function addInfo($info) + { + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->addInfo($info); + } + + /** + * Load a View and convert to HTML + * + * @param string $view + * @param array $data + * @param array $mergeData + * @param string $encoding Not used yet + * @return static + * @static + */ + public static function loadView($view, $data = [], $mergeData = [], $encoding = null) + { + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->loadView($view, $data, $mergeData, $encoding); + } + + /** + * Set/Change an option in DomPdf * - * @param mixed $id - * @param mixed $name - * @param int|float $qty - * @param float $price * @param array $options - * @return \Gloudemans\Shoppingcart\CartItem + * @return static * @static */ - public static function add($id, $name = null, $qty = null, $price = null, $options = []) + public static function setOptions($options) { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->add($id, $name, $qty, $price, $options); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->setOptions($options); } /** - * Update the cart item with the given rowId. + * Output the PDF as a string. * - * @param string $rowId - * @param mixed $qty - * @return \Gloudemans\Shoppingcart\CartItem + * @return string The rendered PDF as string * @static */ - public static function update($rowId, $qty) + public static function output() { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->update($rowId, $qty); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->output(); } /** - * Remove the cart item with the given rowId from the cart. + * Save the PDF to a file * - * @param string $rowId - * @return void + * @param $filename + * @return static * @static */ - public static function remove($rowId) + public static function save($filename) { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->remove($rowId); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->save($filename); } /** - * Get a cart item from the cart by its rowId. + * Make the PDF downloadable by the user * - * @param string $rowId - * @return \Gloudemans\Shoppingcart\CartItem + * @param string $filename + * @return \Illuminate\Http\Response * @static */ - public static function get($rowId) + public static function download($filename = 'document.pdf') { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->get($rowId); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->download($filename); } /** - * Destroy the current cart instance. + * Return a response with the PDF to show in the browser * - * @return void + * @param string $filename + * @return \Illuminate\Http\Response * @static */ - public static function destroy() + public static function stream($filename = 'document.pdf') { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->destroy(); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->stream($filename); } /** - * Get the content of the cart. + * * - * @return \Illuminate\Support\Collection * @static */ - public static function content() + public static function setEncryption($password) { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->content(); - } - - /** - * Get the number of items in the cart. - * - * @return int|float - * @static - */ - public static function count() - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->count(); - } - - /** - * Get the total price of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return string - * @static - */ - public static function total($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->total($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * Get the total tax of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return float - * @static - */ - public static function tax($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->tax($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * Get the subtotal (total - tax) of the items in the cart. - * - * @param int $decimals - * @param string $decimalPoint - * @param string $thousandSeperator - * @return float - * @static - */ - public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->subtotal($decimals, $decimalPoint, $thousandSeperator); - } - - /** - * Search the cart content for a cart item matching the given search closure. - * - * @param \Closure $search - * @return \Illuminate\Support\Collection - * @static - */ - public static function search($search) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - return $instance->search($search); - } - - /** - * Associate the cart item with the given rowId with the given model. - * - * @param string $rowId - * @param mixed $model - * @return void - * @static - */ - public static function associate($rowId, $model) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->associate($rowId, $model); - } - - /** - * Set the tax rate for the cart item with the given rowId. - * - * @param string $rowId - * @param int|float $taxRate - * @return void - * @static - */ - public static function setTax($rowId, $taxRate) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->setTax($rowId, $taxRate); - } - - /** - * Store an the current instance of the cart. - * - * @param mixed $identifier - * @return void - * @static - */ - public static function store($identifier) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->store($identifier); - } - - /** - * Restore the cart with the given identifier. - * - * @param mixed $identifier - * @return void - * @static - */ - public static function restore($identifier) - { - /** @var \Gloudemans\Shoppingcart\Cart $instance */ - $instance->restore($identifier); + /** @var \Barryvdh\DomPDF\PDF $instance */ + return $instance->setEncryption($password); } } @@ -19033,6 +18935,317 @@ namespace Laracasts\Flash { /** @var \Laracasts\Flash\FlashNotifier $instance */ return $instance->clear(); } + + /** + * Register a custom macro. + * + * @param string $name + * @param object|callable $macro + * @return void + * @static + */ + public static function macro($name, $macro) + { + \Laracasts\Flash\FlashNotifier::macro($name, $macro); + } + + /** + * Mix another object into the class. + * + * @param object $mixin + * @param bool $replace + * @return void + * @throws \ReflectionException + * @static + */ + public static function mixin($mixin, $replace = true) + { + \Laracasts\Flash\FlashNotifier::mixin($mixin, $replace); + } + + /** + * Checks if macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + return \Laracasts\Flash\FlashNotifier::hasMacro($name); + } + + } + +} + +namespace Gloudemans\Shoppingcart\Facades { + + /** + * + * + */ + class Cart { + + /** + * Set the current cart instance. + * + * @param string|null $instance + * @return \Cart + * @static + */ + public static function instance($instance = null) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->instance($instance); + } + + /** + * Get the current cart instance. + * + * @return string + * @static + */ + public static function currentInstance() + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->currentInstance(); + } + + /** + * Add an item to the cart. + * + * @param mixed $id + * @param mixed $name + * @param int|float $qty + * @param float $price + * @param array $options + * @return \Gloudemans\Shoppingcart\CartItem + * @static + */ + public static function add($id, $name = null, $qty = null, $price = null, $options = []) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->add($id, $name, $qty, $price, $options); + } + + /** + * Sets/adds an additional cost on the cart. + * + * @param string $name + * @param float $price + * @todo add in session + * @static + */ + public static function addCost($name, $price) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->addCost($name, $price); + } + + /** + * Gets an additional cost by name + * + * @param $name + * @param int|null $decimals + * @param string|null $decimalPoint + * @param string|null $thousandSeparator + * @return string + * @static + */ + public static function getCost($name, $decimals = null, $decimalPoint = null, $thousandSeparator = null) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->getCost($name, $decimals, $decimalPoint, $thousandSeparator); + } + + /** + * Update the cart item with the given rowId. + * + * @param string $rowId + * @param mixed $qty + * @return \Gloudemans\Shoppingcart\CartItem + * @static + */ + public static function update($rowId, $qty) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->update($rowId, $qty); + } + + /** + * Remove the cart item with the given rowId from the cart. + * + * @param string $rowId + * @return void + * @static + */ + public static function remove($rowId) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->remove($rowId); + } + + /** + * Get a cart item from the cart by its rowId. + * + * @param string $rowId + * @return \Gloudemans\Shoppingcart\CartItem + * @static + */ + public static function get($rowId) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->get($rowId); + } + + /** + * Destroy the current cart instance. + * + * @return void + * @static + */ + public static function destroy() + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->destroy(); + } + + /** + * Get the content of the cart. + * + * @return \Gloudemans\Shoppingcart\Collection + * @static + */ + public static function content() + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->content(); + } + + /** + * Get the number of items in the cart. + * + * @return int|float + * @static + */ + public static function count() + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->count(); + } + + /** + * Get the total price of the items in the cart. + * + * @param int $decimals + * @param string $decimalPoint + * @param string $thousandSeparator + * @return string + * @static + */ + public static function total($decimals = null, $decimalPoint = null, $thousandSeparator = null) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->total($decimals, $decimalPoint, $thousandSeparator); + } + + /** + * Get the total tax of the items in the cart. + * + * @param int $decimals + * @param string $decimalPoint + * @param string $thousandSeparator + * @return float + * @static + */ + public static function tax($decimals = null, $decimalPoint = null, $thousandSeparator = null) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->tax($decimals, $decimalPoint, $thousandSeparator); + } + + /** + * Get the subtotal (total - tax) of the items in the cart. + * + * @param int $decimals + * @param string $decimalPoint + * @param string $thousandSeparator + * @return float + * @static + */ + public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeparator = null) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->subtotal($decimals, $decimalPoint, $thousandSeparator); + } + + /** + * Search the cart content for a cart item matching the given search closure. + * + * @param \Closure $search + * @return \Gloudemans\Shoppingcart\Collection + * @static + */ + public static function search($search) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + return $instance->search($search); + } + + /** + * Associate the cart item with the given rowId with the given model. + * + * @param string $rowId + * @param mixed $model + * @return void + * @static + */ + public static function associate($rowId, $model) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->associate($rowId, $model); + } + + /** + * Set the tax rate for the cart item with the given rowId. + * + * @param string $rowId + * @param int|float $taxRate + * @return void + * @static + */ + public static function setTax($rowId, $taxRate) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->setTax($rowId, $taxRate); + } + + /** + * Store an the current instance of the cart. + * + * @param mixed $identifier + * @return void + * @static + */ + public static function store($identifier) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->store($identifier); + } + + /** + * Restore the cart with the given identifier. + * + * @param mixed $identifier + * @return void + * @static + */ + public static function restore($identifier) + { + /** @var \Gloudemans\Shoppingcart\Cart $instance */ + $instance->restore($identifier); + } } @@ -19068,7 +19281,7 @@ namespace { * Create and return an un-saved model instance. * * @param array $attributes - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function make($attributes = []) @@ -19158,7 +19371,7 @@ namespace { /** * Add a basic where clause to the query. * - * @param string|array|\Closure $column + * @param \Closure|string|array $column * @param mixed $operator * @param mixed $value * @param string $boolean @@ -19171,6 +19384,22 @@ namespace { return $instance->where($column, $operator, $value, $boolean); } + /** + * Add a basic where clause to the query, and return the first result. + * + * @param \Closure|string|array $column + * @param mixed $operator + * @param mixed $value + * @param string $boolean + * @return \Illuminate\Database\Eloquent\Model|static + * @static + */ + public static function firstWhere($column, $operator = null, $value = null, $boolean = 'and') + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->firstWhere($column, $operator, $value, $boolean); + } + /** * Add an "or where" clause to the query. * @@ -19186,6 +19415,32 @@ namespace { return $instance->orWhere($column, $operator, $value); } + /** + * Add an "order by" clause for a timestamp to the query. + * + * @param string $column + * @return \Illuminate\Database\Eloquent\Builder + * @static + */ + public static function latest($column = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->latest($column); + } + + /** + * Add an "order by" clause for a timestamp to the query. + * + * @param string $column + * @return \Illuminate\Database\Eloquent\Builder + * @static + */ + public static function oldest($column = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->oldest($column); + } + /** * Create a collection of models from plain arrays. * @@ -19261,7 +19516,7 @@ namespace { * * @param mixed $id * @param array $columns - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function findOrNew($id, $columns = []) @@ -19275,7 +19530,7 @@ namespace { * * @param array $attributes * @param array $values - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function firstOrNew($attributes, $values = []) @@ -19289,7 +19544,7 @@ namespace { * * @param array $attributes * @param array $values - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function firstOrCreate($attributes, $values = []) @@ -19303,7 +19558,7 @@ namespace { * * @param array $attributes * @param array $values - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function updateOrCreate($attributes, $values = []) @@ -19356,7 +19611,7 @@ namespace { /** * Execute the query as a "select" statement. * - * @param array $columns + * @param array|string $columns * @return \Illuminate\Database\Eloquent\Collection|static[] * @static */ @@ -19369,8 +19624,8 @@ namespace { /** * Get the hydrated models without eager loading. * - * @param array $columns - * @return \Illuminate\Database\Eloquent\Model[] + * @param array|string $columns + * @return \Illuminate\Database\Eloquent\Model[]|static[] * @static */ public static function getModels($columns = []) @@ -19393,9 +19648,9 @@ namespace { } /** - * Get a generator for the given query. + * Get a lazy collection for the given query. * - * @return \Generator + * @return \Illuminate\Support\LazyCollection * @static */ public static function cursor() @@ -19404,22 +19659,6 @@ namespace { return $instance->cursor(); } - /** - * Chunk the results of a query by comparing numeric IDs. - * - * @param int $count - * @param callable $callback - * @param string|null $column - * @param string|null $alias - * @return bool - * @static - */ - public static function chunkById($count, $callback, $column = null, $alias = null) - { - /** @var \Illuminate\Database\Eloquent\Builder $instance */ - return $instance->chunkById($count, $callback, $column, $alias); - } - /** * Get an array with the values of a given column. * @@ -19437,7 +19676,7 @@ namespace { /** * Paginate the given query. * - * @param int $perPage + * @param int|null $perPage * @param array $columns * @param string $pageName * @param int|null $page @@ -19454,7 +19693,7 @@ namespace { /** * Paginate the given query into a simple paginator. * - * @param int $perPage + * @param int|null $perPage * @param array $columns * @param string $pageName * @param int|null $page @@ -19509,8 +19748,8 @@ namespace { /** * Call the given local model scopes. * - * @param array $scopes - * @return mixed + * @param array|string $scopes + * @return static|mixed * @static */ public static function scopes($scopes) @@ -19522,7 +19761,7 @@ namespace { /** * Apply the scopes to the Eloquent builder instance and return it. * - * @return \Illuminate\Database\Eloquent\Builder|static + * @return static * @static */ public static function applyScopes() @@ -19548,7 +19787,7 @@ namespace { * Create a new instance of the model being queried. * * @param array $attributes - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function newModelInstance($attributes = []) @@ -19622,7 +19861,7 @@ namespace { /** * Get the model instance being queried. * - * @return \Illuminate\Database\Eloquent\Model + * @return \Illuminate\Database\Eloquent\Model|static * @static */ public static function getModel() @@ -19657,6 +19896,43 @@ namespace { return $instance->getMacro($name); } + /** + * Checks if a macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasMacro($name) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->hasMacro($name); + } + + /** + * Get the given global macro by name. + * + * @param string $name + * @return \Closure + * @static + */ + public static function getGlobalMacro($name) + { + return \Illuminate\Database\Eloquent\Builder::getGlobalMacro($name); + } + + /** + * Checks if a global macro is registered. + * + * @param string $name + * @return bool + * @static + */ + public static function hasGlobalMacro($name) + { + return \Illuminate\Database\Eloquent\Builder::hasGlobalMacro($name); + } + /** * Chunk the results of the query. * @@ -19685,10 +19961,42 @@ namespace { return $instance->each($callback, $count); } + /** + * Chunk the results of a query by comparing IDs. + * + * @param int $count + * @param callable $callback + * @param string|null $column + * @param string|null $alias + * @return bool + * @static + */ + public static function chunkById($count, $callback, $column = null, $alias = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->chunkById($count, $callback, $column, $alias); + } + + /** + * Execute a callback over each item while chunking by id. + * + * @param callable $callback + * @param int $count + * @param string|null $column + * @param string|null $alias + * @return bool + * @static + */ + public static function eachById($callback, $count = 1000, $column = null, $alias = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->eachById($callback, $count, $column, $alias); + } + /** * Execute the query and get the first result. * - * @param array $columns + * @param array|string $columns * @return \Illuminate\Database\Eloquent\Model|object|static|null * @static */ @@ -19703,7 +20011,7 @@ namespace { * * @param mixed $value * @param callable $callback - * @param callable $default + * @param callable|null $default * @return mixed|$this * @static */ @@ -19716,7 +20024,7 @@ namespace { /** * Pass the query to a given callback. * - * @param \Closure $callback + * @param callable $callback * @return \Illuminate\Database\Query\Builder * @static */ @@ -19731,7 +20039,7 @@ namespace { * * @param mixed $value * @param callable $callback - * @param callable $default + * @param callable|null $default * @return mixed|$this * @static */ @@ -19744,12 +20052,13 @@ namespace { /** * Add a relationship count / exists condition to the query. * - * @param string $relation + * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param string $operator * @param int $count * @param string $boolean * @param \Closure|null $callback * @return \Illuminate\Database\Eloquent\Builder|static + * @throws \RuntimeException * @static */ public static function has($relation, $operator = '>=', $count = 1, $boolean = 'and', $callback = null) @@ -19861,6 +20170,134 @@ namespace { return $instance->orWhereDoesntHave($relation, $callback); } + /** + * Add a polymorphic relationship count / exists condition to the query. + * + * @param string $relation + * @param string|array $types + * @param string $operator + * @param int $count + * @param string $boolean + * @param \Closure|null $callback + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function hasMorph($relation, $types, $operator = '>=', $count = 1, $boolean = 'and', $callback = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->hasMorph($relation, $types, $operator, $count, $boolean, $callback); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with an "or". + * + * @param string $relation + * @param string|array $types + * @param string $operator + * @param int $count + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function orHasMorph($relation, $types, $operator = '>=', $count = 1) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->orHasMorph($relation, $types, $operator, $count); + } + + /** + * Add a polymorphic relationship count / exists condition to the query. + * + * @param string $relation + * @param string|array $types + * @param string $boolean + * @param \Closure|null $callback + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function doesntHaveMorph($relation, $types, $boolean = 'and', $callback = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->doesntHaveMorph($relation, $types, $boolean, $callback); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with an "or". + * + * @param string $relation + * @param string|array $types + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function orDoesntHaveMorph($relation, $types) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->orDoesntHaveMorph($relation, $types); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with where clauses. + * + * @param string $relation + * @param string|array $types + * @param \Closure|null $callback + * @param string $operator + * @param int $count + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function whereHasMorph($relation, $types, $callback = null, $operator = '>=', $count = 1) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->whereHasMorph($relation, $types, $callback, $operator, $count); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with where clauses and an "or". + * + * @param string $relation + * @param string|array $types + * @param \Closure $callback + * @param string $operator + * @param int $count + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function orWhereHasMorph($relation, $types, $callback = null, $operator = '>=', $count = 1) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->orWhereHasMorph($relation, $types, $callback, $operator, $count); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with where clauses. + * + * @param string $relation + * @param string|array $types + * @param \Closure|null $callback + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function whereDoesntHaveMorph($relation, $types, $callback = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->whereDoesntHaveMorph($relation, $types, $callback); + } + + /** + * Add a polymorphic relationship count / exists condition to the query with where clauses and an "or". + * + * @param string $relation + * @param string|array $types + * @param \Closure $callback + * @return \Illuminate\Database\Eloquent\Builder|static + * @static + */ + public static function orWhereDoesntHaveMorph($relation, $types, $callback = null) + { + /** @var \Illuminate\Database\Eloquent\Builder $instance */ + return $instance->orWhereDoesntHaveMorph($relation, $types, $callback); + } + /** * Add subselect queries to count the relations. * @@ -19986,21 +20423,22 @@ namespace { /** * Set the table which the query is targeting. * - * @param string $table + * @param \Closure|\Illuminate\Database\Query\Builder|string $table + * @param string|null $as * @return \Illuminate\Database\Query\Builder * @static */ - public static function from($table) + public static function from($table, $as = null) { /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->from($table); + return $instance->from($table, $as); } /** * Add a join clause to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @param string $type @@ -20018,7 +20456,7 @@ namespace { * Add a "join where" clause to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string $operator * @param string $second * @param string $type @@ -20036,7 +20474,7 @@ namespace { * * @param \Closure|\Illuminate\Database\Query\Builder|string $query * @param string $as - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @param string $type @@ -20055,7 +20493,7 @@ namespace { * Add a left join to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @return \Illuminate\Database\Query\Builder|static @@ -20071,7 +20509,7 @@ namespace { * Add a "join where" clause to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string $operator * @param string $second * @return \Illuminate\Database\Query\Builder|static @@ -20088,7 +20526,7 @@ namespace { * * @param \Closure|\Illuminate\Database\Query\Builder|string $query * @param string $as - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @return \Illuminate\Database\Query\Builder|static @@ -20104,7 +20542,7 @@ namespace { * Add a right join to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @return \Illuminate\Database\Query\Builder|static @@ -20120,7 +20558,7 @@ namespace { * Add a "right join where" clause to the query. * * @param string $table - * @param string $first + * @param \Closure|string $first * @param string $operator * @param string $second * @return \Illuminate\Database\Query\Builder|static @@ -20137,7 +20575,7 @@ namespace { * * @param \Closure|\Illuminate\Database\Query\Builder|string $query * @param string $as - * @param string $first + * @param \Closure|string $first * @param string|null $operator * @param string|null $second * @return \Illuminate\Database\Query\Builder|static @@ -20153,7 +20591,7 @@ namespace { * Add a "cross join" clause to the query. * * @param string $table - * @param string|null $first + * @param \Closure|string|null $first * @param string|null $operator * @param string|null $second * @return \Illuminate\Database\Query\Builder|static @@ -20315,18 +20753,49 @@ namespace { } /** - * Add a "where null" clause to the query. + * Add a "where in raw" clause for integer values to the query. * * @param string $column + * @param \Illuminate\Contracts\Support\Arrayable|array $values * @param string $boolean * @param bool $not * @return \Illuminate\Database\Query\Builder * @static */ - public static function whereNull($column, $boolean = 'and', $not = false) + public static function whereIntegerInRaw($column, $values, $boolean = 'and', $not = false) { /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->whereNull($column, $boolean, $not); + return $instance->whereIntegerInRaw($column, $values, $boolean, $not); + } + + /** + * Add a "where not in raw" clause for integer values to the query. + * + * @param string $column + * @param \Illuminate\Contracts\Support\Arrayable|array $values + * @param string $boolean + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function whereIntegerNotInRaw($column, $values, $boolean = 'and') + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->whereIntegerNotInRaw($column, $values, $boolean); + } + + /** + * Add a "where null" clause to the query. + * + * @param string|array $columns + * @param string $boolean + * @param bool $not + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function whereNull($columns, $boolean = 'and', $not = false) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->whereNull($columns, $boolean, $not); } /** @@ -20345,15 +20814,15 @@ namespace { /** * Add a "where not null" clause to the query. * - * @param string $column + * @param string|array $columns * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static */ - public static function whereNotNull($column, $boolean = 'and') + public static function whereNotNull($columns, $boolean = 'and') { /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->whereNotNull($column, $boolean); + return $instance->whereNotNull($columns, $boolean); } /** @@ -20433,7 +20902,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static @@ -20449,7 +20918,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @return \Illuminate\Database\Query\Builder|static * @static */ @@ -20464,7 +20933,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static @@ -20480,7 +20949,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @return \Illuminate\Database\Query\Builder|static * @static */ @@ -20495,7 +20964,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static @@ -20511,7 +20980,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @return \Illuminate\Database\Query\Builder|static * @static */ @@ -20526,7 +20995,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static @@ -20542,7 +21011,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|null $value * @return \Illuminate\Database\Query\Builder|static * @static */ @@ -20557,7 +21026,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|int|null $value * @param string $boolean * @return \Illuminate\Database\Query\Builder|static * @static @@ -20573,7 +21042,7 @@ namespace { * * @param string $column * @param string $operator - * @param mixed $value + * @param \DateTimeInterface|string|int|null $value * @return \Illuminate\Database\Query\Builder|static * @static */ @@ -20702,6 +21171,7 @@ namespace { * @param array $values * @param string $boolean * @return \Illuminate\Database\Query\Builder + * @throws \InvalidArgumentException * @static */ public static function whereRowValues($columns, $operator, $values, $boolean = 'and') @@ -20784,11 +21254,42 @@ namespace { return $instance->orWhereJsonDoesntContain($column, $value); } + /** + * Add a "where JSON length" clause to the query. + * + * @param string $column + * @param mixed $operator + * @param mixed $value + * @param string $boolean + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function whereJsonLength($column, $operator, $value = null, $boolean = 'and') + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->whereJsonLength($column, $operator, $value, $boolean); + } + + /** + * Add a "or where JSON length" clause to the query. + * + * @param string $column + * @param mixed $operator + * @param mixed $value + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function orWhereJsonLength($column, $operator, $value = null) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->orWhereJsonLength($column, $operator, $value); + } + /** * Handles dynamic "where" clauses to the query. * * @param string $method - * @param string $parameters + * @param array $parameters * @return \Illuminate\Database\Query\Builder * @static */ @@ -20801,7 +21302,7 @@ namespace { /** * Add a "group by" clause to the query. * - * @param array $groups + * @param array|string $groups * @return \Illuminate\Database\Query\Builder * @static */ @@ -20811,6 +21312,20 @@ namespace { return $instance->groupBy(...$groups); } + /** + * Add a raw groupBy clause to the query. + * + * @param string $sql + * @param array $bindings + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function groupByRaw($sql, $bindings = []) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->groupByRaw($sql, $bindings); + } + /** * Add a "having" clause to the query. * @@ -20842,6 +21357,22 @@ namespace { return $instance->orHaving($column, $operator, $value); } + /** + * Add a "having between " clause to the query. + * + * @param string $column + * @param array $values + * @param string $boolean + * @param bool $not + * @return \Illuminate\Database\Query\Builder|static + * @static + */ + public static function havingBetween($column, $values, $boolean = 'and', $not = false) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->havingBetween($column, $values, $boolean, $not); + } + /** * Add a raw having clause to the query. * @@ -20874,9 +21405,10 @@ namespace { /** * Add an "order by" clause to the query. * - * @param string $column + * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string $column * @param string $direction * @return \Illuminate\Database\Query\Builder + * @throws \InvalidArgumentException * @static */ public static function orderBy($column, $direction = 'asc') @@ -20898,32 +21430,6 @@ namespace { return $instance->orderByDesc($column); } - /** - * Add an "order by" clause for a timestamp to the query. - * - * @param string $column - * @return \Illuminate\Database\Query\Builder|static - * @static - */ - public static function latest($column = 'created_at') - { - /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->latest($column); - } - - /** - * Add an "order by" clause for a timestamp to the query. - * - * @param string $column - * @return \Illuminate\Database\Query\Builder|static - * @static - */ - public static function oldest($column = 'created_at') - { - /** @var \Illuminate\Database\Query\Builder $instance */ - return $instance->oldest($column); - } - /** * Put the query's results in random order. * @@ -21017,6 +21523,21 @@ namespace { return $instance->forPage($page, $perPage); } + /** + * Constrain the query to the previous "page" of results before a given ID. + * + * @param int $perPage + * @param int|null $lastId + * @param string $column + * @return \Illuminate\Database\Query\Builder|static + * @static + */ + public static function forPageBeforeId($perPage = 15, $lastId = 0, $column = 'id') + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->forPageBeforeId($perPage, $lastId, $column); + } + /** * Constrain the query to the next "page" of results after a given ID. * @@ -21159,6 +21680,32 @@ namespace { return $instance->doesntExist(); } + /** + * Execute the given callback if no rows exist for the current query. + * + * @param \Closure $callback + * @return mixed + * @static + */ + public static function existsOr($callback) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->existsOr($callback); + } + + /** + * Execute the given callback if rows exist for the current query. + * + * @param \Closure $callback + * @return mixed + * @static + */ + public static function doesntExistOr($callback) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->doesntExistOr($callback); + } + /** * Retrieve the "count" result of the query. * @@ -21278,6 +21825,19 @@ namespace { return $instance->insert($values); } + /** + * Insert a new record into the database while ignoring errors. + * + * @param array $values + * @return int + * @static + */ + public static function insertOrIgnore($values) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->insertOrIgnore($values); + } + /** * Insert a new record and get the value of the primary key. * @@ -21292,6 +21852,20 @@ namespace { return $instance->insertGetId($values, $sequence); } + /** + * Insert new records into the table using a subquery. + * + * @param array $columns + * @param \Closure|\Illuminate\Database\Query\Builder|string $query + * @return int + * @static + */ + public static function insertUsing($columns, $query) + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->insertUsing($columns, $query); + } + /** * Insert or update a record matching the attributes, and fill it with values. * @@ -21460,6 +22034,30 @@ namespace { return $instance->cloneWithoutBindings($except); } + /** + * Dump the current SQL and bindings. + * + * @return \Illuminate\Database\Query\Builder + * @static + */ + public static function dump() + { + /** @var \Illuminate\Database\Query\Builder $instance */ + return $instance->dump(); + } + + /** + * Die and dump the current SQL and bindings. + * + * @return void + * @static + */ + public static function dd() + { + /** @var \Illuminate\Database\Query\Builder $instance */ + $instance->dd(); + } + /** * Register a custom macro. * @@ -21477,25 +22075,14 @@ namespace { * Mix another object into the class. * * @param object $mixin + * @param bool $replace * @return void * @throws \ReflectionException * @static */ - public static function mixin($mixin) + public static function mixin($mixin, $replace = true) { - \Illuminate\Database\Query\Builder::mixin($mixin); - } - - /** - * Checks if macro is registered. - * - * @param string $name - * @return bool - * @static - */ - public static function hasMacro($name) - { - return \Illuminate\Database\Query\Builder::hasMacro($name); + \Illuminate\Database\Query\Builder::mixin($mixin, $replace); } /** @@ -21554,8 +22141,6 @@ namespace { class View extends \Illuminate\Support\Facades\View {} - class Input extends \Illuminate\Support\Facades\Input {} - class Form extends \Collective\Html\FormFacade {} class HTML extends \Collective\Html\HtmlFacade {} @@ -21576,11 +22161,15 @@ namespace { class Yard extends \App\Services\Facade\Yard {} - class Cart extends \Gloudemans\Shoppingcart\Facades\Cart {} + class Debugbar extends \Barryvdh\Debugbar\Facade {} + + class PDF extends \Barryvdh\DomPDF\Facade {} class Flash extends \Laracasts\Flash\Flash {} class Html extends \Collective\Html\HtmlFacade {} + + class Cart extends \Gloudemans\Shoppingcart\Facades\Cart {} } diff --git a/_ide_helper_models.php b/_ide_helper_models.php index 589b8b2..6178730 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -88,9 +88,31 @@ namespace App{ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMLevel($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMSponsor($value) * @property string|null $release_account + * @property int|null $payment_order_id + * @property int|null $abo_options * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\File[] $files * @property-read int|null $files_count + * @property-read \App\Models\Product|null $payment_order + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders + * @property-read int|null $shopping_orders_count + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAboOptions($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentOrderId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereReleaseAccount($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\UserHistory[] $user_histories + * @property-read int|null $user_histories_count + * @property int|null $test_mode + * @property array|null $settings + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $member_shopping_orders + * @property-read int|null $member_shopping_orders_count + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingUser[] $member_shopping_users + * @property-read int|null $member_shopping_users_count + * @property-read \App\Models\Product|null $payment_order_product + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereSettings($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTestMode($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Client[] $clients + * @property-read int|null $clients_count + * @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Token[] $tokens + * @property-read int|null $tokens_count */ class User extends \Eloquent {} } @@ -192,6 +214,13 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereUpdatedAt($value) * @mixin \Eloquent + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property string|null $user_deleted_at + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereUserDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrderItem withoutTrashed() */ class ShoppingOrderItem extends \Eloquent {} } @@ -252,6 +281,18 @@ namespace App\Models{ class ShippingPrice extends \Eloquent {} } +namespace App\Models{ +/** + * App\Models\Import + * + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Import query() + * @mixin \Eloquent + */ + class Import extends \Eloquent {} +} + namespace App\Models{ /** * App\Models\ShoppingUser @@ -322,6 +363,35 @@ namespace App\Models{ * @property-read \App\Models\ShoppingOrder $shopping_order * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value) + * @property int|null $abo_options + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereAboOptions($value) + * @property int|null $member_id + * @property int|null $number + * @property bool $is_like + * @property array|null $notice + * @property-read \App\User|null $auth_user + * @property-read \App\User|null $member + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereIsLike($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMemberId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNotice($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNumber($value) + * @property bool|null $has_buyed + * @property bool|null $subscribed + * @property int|null $wp_order_number + * @property string|null $wp_order_date + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereHasBuyed($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereSubscribed($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderDate($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderNumber($value) + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property string|null $user_deleted_at + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUserDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withoutTrashed() + * @property string|null $mode + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMode($value) */ class ShoppingUser extends \Eloquent {} } @@ -351,6 +421,8 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUserShopId($value) * @mixin \Eloquent + * @property int|null $payment + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance wherePayment($value) */ class ShoppingInstance extends \Eloquent {} } @@ -440,10 +512,60 @@ namespace App\Models{ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProductImage[] $imagesActive * @property-read int|null $images_active_count * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product wherePoints($value) + * @property string|null $identifier + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereIdentifier($value) + * @property int|null $upgrade_to_id + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUpgradeToId($value) + * @property int|null $contents_total + * @property int|null $unit + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereContentsTotal($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUnit($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices + * @property-read int|null $country_prices_count + * @property int|null $wp_number + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereWpNumber($value) */ class Product extends \Eloquent {} } +namespace App\Models{ +/** + * Class UserHistory + * + * @property int $id + * @property int $user_id + * @property int $shopping_order_id + * @property int $product_id + * @property string $action + * @property int $referenz + * @property int $status + * @property Carbon $created_at + * @property Carbon $updated_at + * @property Product $product + * @property ShoppingOrder $shopping_order + * @property User $user + * @package App\Models + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAction($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereProductId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereReferenz($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereShoppingOrderId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereStatus($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUserId($value) + * @mixin \Eloquent + * @property string|null $identifier + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereIdentifier($value) + * @property int|null $abo_options + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAboOptions($value) + */ + class UserHistory extends \Eloquent {} +} + namespace App\Models{ /** * App\Models\Shipping @@ -540,6 +662,21 @@ namespace App\Models{ * @property array|null $attr * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereAttr($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTransName($value) + * @property bool|null $switch + * @property bool|null $own_eur + * @property bool|null $currency + * @property string|null $currency_unit + * @property bool|null $currency_calc + * @property float|null $currency_faktor + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrency($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyCalc($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyFaktor($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereOwnEur($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereSwitch($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices + * @property-read int|null $country_prices_count + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyUnit($value) */ class Country extends \Eloquent {} } @@ -613,10 +750,53 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereSize($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUserId($value) + * @mixin \Eloquent */ class File extends \Eloquent {} } +namespace App\Models{ +/** + * Class UserMessage + * + * @property int $id + * @property int $user_id + * @property int $send_user_id + * @property string $email + * @property string $subject + * @property string $message + * @property bool $send + * @property bool $fail + * @property string $error + * @property Carbon $sent_at + * @property Carbon $scheduled_at + * @property Carbon $delivered_at + * @property Carbon $created_at + * @property Carbon $updated_at + * @property User $user + * @package App\Models + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereDeliveredAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereEmail($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereError($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereFail($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereMessage($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereScheduledAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSend($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSendUserId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSentAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSubject($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUserId($value) + * @mixin \Eloquent + */ + class UserMessage extends \Eloquent {} +} + namespace App\Models{ /** * App\Models\ShoppingPayment @@ -652,6 +832,8 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereWallettype($value) * @mixin \Eloquent + * @property string|null $mode + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereMode($value) */ class ShoppingPayment extends \Eloquent {} } @@ -693,6 +875,8 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUserid($value) * @mixin \Eloquent + * @property string|null $mode + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereMode($value) */ class PaymentTransaction extends \Eloquent {} } @@ -732,54 +916,36 @@ namespace App\Models{ namespace App\Models{ /** - * App\Models\ShoppingOrder + * Class CountryPrice * * @property int $id - * @property int $shopping_user_id - * @property int|null $auth_user_id * @property int $country_id - * @property int $user_shop_id - * @property float|null $total - * @property float|null $shipping - * @property float|null $subtotal - * @property float|null $tax_rate - * @property float|null $tax - * @property float|null $total_shipping - * @property int|null $weight - * @property int|null $paid - * @property string|null $txaction - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property-read \App\User|null $auth_user - * @property-read \App\Models\Country $country - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrderItem[] $shopping_order_items - * @property-read int|null $shopping_order_items_count - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingPayment[] $shopping_payments - * @property-read int|null $shopping_payments_count - * @property-read \App\Models\ShoppingUser $shopping_user - * @property-read \App\Models\UserShop $user_shop - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newModelQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newQuery() - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder query() - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereAuthUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereCountryId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereCreatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaid($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShipping($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShoppingUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereSubtotal($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTax($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTaxRate($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTotal($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTotalShipping($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTxaction($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUpdatedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserShopId($value) - * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereWeight($value) + * @property int $product_id + * @property float $c_price + * @property float $c_tax + * @property float $c_price_old + * @property float $c_currency + * @property Carbon $created_at + * @property Carbon $updated_at + * @property Country $country + * @property Product $product + * @package App\Models + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCOwnEur($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPrice($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCPriceOld($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCTax($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCountryId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereProductId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereUpdatedAt($value) * @mixin \Eloquent + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCCurrency($value) */ - class ShoppingOrder extends \Eloquent {} + class CountryPrice extends \Eloquent {} } namespace App\Models{ @@ -958,6 +1124,12 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMNotes($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMSalutation($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value) + * @property array|null $payment_data + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePaymentData($value) + * @property string|null $accepted_contract + * @property array|null $notice + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAcceptedContract($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereNotice($value) */ class UserAccount extends \Eloquent {} } diff --git a/app/Http/Controllers/AdminUserController.php b/app/Http/Controllers/AdminUserController.php index 54b91c3..9d29ea2 100755 --- a/app/Http/Controllers/AdminUserController.php +++ b/app/Http/Controllers/AdminUserController.php @@ -9,8 +9,7 @@ use App\Repositories\UserRepository; use App\User; use Auth; use Illuminate\Support\Facades\Mail; -use Input; -use Illuminate\Http\Request; +use Request; use Validator; @@ -59,7 +58,7 @@ class AdminUserController extends Controller */ public function store(Request $request) { - $data = Input::all(); + $data = Request::all(); $user = User::findOrFail($data['id']); if(isset($data['save-admin'])){ diff --git a/app/Http/Controllers/Api/AuthController.php b/app/Http/Controllers/Api/AuthController.php new file mode 100755 index 0000000..3a27d5f --- /dev/null +++ b/app/Http/Controllers/Api/AuthController.php @@ -0,0 +1,103 @@ +validate([ + 'email' => 'required|string|email', + 'password' => 'required|string', + 'remember_me' => 'boolean' + ]); + $credentials = request(['email', 'password']); + + if (!Auth::attempt($credentials)) + return response()->json([ + 'message' => 'Unauthorized' + ], 401); + $user = $request->user(); + + $tokenResult = $user->createToken('Personal Access Token'); + $token = $tokenResult->token; + + if ($request->remember_me){ + $token->expires_at = Carbon::now()->addWeeks(1); + }else{ + $token->expires_at = Carbon::now()->addDays(1); + } + + $token->save(); + return response()->json([ + 'access_token' => $tokenResult->accessToken, + 'token_type' => 'Bearer', + 'expires_at' => Carbon::parse( + $tokenResult->token->expires_at + )->toDateTimeString() + ]); + } + + + public function checked(Request $request) + { + return response()->json([ + 'message' => 'login' + ]); + } + + public function logout(Request $request) + { + $request->user()->token()->revoke(); + return response()->json([ + 'message' => 'Successfully logged out' + ]); + } + + /** + * Get the authenticated User + * + * @return [json] user object + */ + /* public function user(Request $request) + { + return response()->json($request->user()); + } + */ + + /*public function signup(Request $request) + { + $request->validate([ + 'name' => 'required|string', + 'email' => 'required|string|email|unique:users', + 'password' => 'required|string|confirmed' + ]); + $user = new User([ + 'name' => $request->name, + 'email' => $request->email, + 'password' => Hash::make($request->password), + ]); + $user->save(); + return response()->json([ + 'message' => 'Successfully created user!' + ], 201); + }*/ + +} \ No newline at end of file diff --git a/app/Http/Controllers/Api/KasController.php b/app/Http/Controllers/Api/KasController.php index 70112ce..fad930b 100755 --- a/app/Http/Controllers/Api/KasController.php +++ b/app/Http/Controllers/Api/KasController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; -use Input; use Session; use \SoapClient; diff --git a/app/Http/Controllers/Api/ShoppingUserController.php b/app/Http/Controllers/Api/ShoppingUserController.php new file mode 100755 index 0000000..89810cd --- /dev/null +++ b/app/Http/Controllers/Api/ShoppingUserController.php @@ -0,0 +1,526 @@ +member_id = auth()->user()->m_sponsor; + + $request->validate([ + 'wp_order_numbers' => 'required', + ]); + + $wp_order_numbers = json_decode($request->wp_order_numbers); + + + if(!$wp_order_numbers || !is_array($wp_order_numbers)){ + return response()->json([ + 'success' => false, + 'message' => 'wp_order_numbers need as json [1234, 1234] ', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + $status = []; + foreach ($wp_order_numbers as $wp_order_number){ + $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); + $status[] = [ + 'wp_order_number' => $wp_order_number, + 'user' => $shopping_user ? true : false, + 'order' => ($shopping_user && $shopping_user->shopping_order) ? true : false, + 'status' => 'open | sent | ...', + ]; + } + return response()->json([ + 'success' => true, + 'data' => $status, + 'time' => Carbon::now()->toDateTimeString() + ], 200); + + } + + /** + * @param Request $request + * wp_order_numbers [1234, 1234] + * @return \Illuminate\Http\JsonResponse + */ + public function show(Request $request) + { + //$this->member_id = auth()->user()->m_sponsor; + $request->validate([ + 'wp_order_numbers' => 'required', + ]); + + $wp_order_numbers = json_decode($request->wp_order_numbers); + + if(!$wp_order_numbers || !is_array($wp_order_numbers)){ + return response()->json([ + 'success' => false, + 'message' => 'wp_order_numbers need as json [1234, 1234] ', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + $data = []; + + foreach ($wp_order_numbers as $wp_order_number){ + $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); + $user = false; + $order = false; + if ($shopping_user) { + $user = $this->prepareForShow($shopping_user); + $order = $this->prepareForShowOrder($shopping_user->shopping_order); + } + $data[] = [ + 'wp_order_number' => $wp_order_number, + 'user' => $user, + 'order' => $order, + 'customer_number' => $shopping_user ? $shopping_user->number : false, + 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, + 'status' => 'open | sent | ...', + ]; + } + return response()->json([ + 'success' => true, + 'data' => $data, + 'time' => Carbon::now()->toDateTimeString() + ], 200); + + } + + /** + * @param Request $request + * @return \Illuminate\Http\JsonResponse + */ + public function store(Request $request) + { + $request->validate([ + 'billing_email' => 'required|string|email', + 'billing_firstname' => 'required|string', + 'billing_lastname' => 'required|string', + 'billing_address' => 'required|string', + 'billing_zipcode' => 'required|string', + 'billing_city' => 'required|string', + 'billing_country_code' => 'required|string', + 'wp_order_number' => 'required|int|unique:shopping_users,wp_order_number', + 'wp_order_date' => 'required|date', + ]); + + $this->member_id = auth()->user()->m_sponsor; + + $data = $this->prepareForStore($request->all()); + $data['member_id'] = $this->member_id ; + $data['number'] = ShoppingUser::max('number') + 1; + $data['mode'] = $request->mode ? $request->mode : 'live'; + + $shopping_user = ShoppingUser::create($data); + + //Kundenhoheit prüfen + $priority = CustomerPriority::checkOne($shopping_user, true, false); + \App\Services\Shop::newUserOrder($shopping_user->number); + //exists //like //update + $user = $this->prepareForShow($shopping_user); + return response()->json([ + 'success' => true, + 'data' => [ + 'wp_order_number' => $shopping_user->wp_order_number, + 'user' => $user, + 'customer_priority' => $priority, + 'customer_number' => $shopping_user->number, + 'member_email' => $shopping_user->member->email + ], + 'time' => Carbon::now()->toDateTimeString() + ], 200); + + } + + /** + * @param Request $request + * @return \Illuminate\Http\JsonResponse + */ + public function update(Request $request) + { + $request->validate([ + 'wp_order_number' => 'required|int', + ]); + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); + if (!$shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + + $data = $this->prepareForUpdate($request->all()); + //Kundenhoheit prüfen + $priority = CustomerPriority::checkChangeOne($shopping_user, $data, true); + $updated = $shopping_user->fill($data)->save(); + \App\Services\Shop::newUserOrder($shopping_user->number); + + if ($updated){ + $user = $this->prepareForShow($shopping_user); + $order = $this->prepareForShowOrder($shopping_user->shopping_order); + return response()->json([ + 'success' => true, + 'data' => [ + 'wp_order_number' => $shopping_user->wp_order_number, + 'user' => $user, + 'order' => $order, + 'customer_priority' => $priority, + 'customer_number' => $shopping_user ? $shopping_user->number : false, + 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, + 'status' => 'open | sent | ...', + ], + 'time' => Carbon::now()->toDateTimeString() + ], 200); + } + return response()->json([ + 'success' => false, + 'message' => 'Entry could not be updated' + ], 500); + } + + public function order(Request $request) + { + $request->validate([ + 'wp_order_number' => 'required|int', + 'wp_order' => 'required', + ]); + + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); + if (!$shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + + if($shopping_user->shopping_order){ + return response()->json([ + 'success' => false, + 'message' => 'Order with wp_order_number ' . $request->wp_order_number . ' exists', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + + $wp_order = json_decode($request->wp_order); + $wp_order = $this->prepareOrder($wp_order, $shopping_user); + if ($wp_order){ + $user = $this->prepareForShow($shopping_user); + $order = $this->prepareForShowOrder($shopping_user->shopping_order); + return response()->json([ + 'success' => true, + 'data' => [ + 'wp_order_number' => $shopping_user->wp_order_number, + 'wp_order' => $wp_order, + 'user' => $user, + 'order' => $order, + 'customer_number' => $shopping_user->number, + 'member_email' => $shopping_user->member->email, + ], + 'time' => Carbon::now()->toDateTimeString() + ], 200); + } + return response()->json([ + 'success' => false, + 'message' => 'Order could not be stored' + ], 500); + } + + public function delete(Request $request) + { + $request->validate([ + 'wp_order_number' => 'required|int', + ]); + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->where('mode', '=', 'dev')->first(); + if (!$shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found or mode != dev', + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + $shopping_order = $shopping_user->shopping_order; + if($shopping_order){ + foreach ($shopping_order->shopping_order_items as $shopping_order_item){ + $shopping_order_item->delete(); + } + $shopping_order->delete(); + } + if ($shopping_user->delete()) { + return response()->json([ + 'success' => true + ]); + } + return response()->json([ + 'success' => false, + 'message' => 'Entry could not be deleted' + ], 500); + } + + private function prepareForShow($shopping_user){ + + if(!$shopping_user){ + return false; + } + + $shopping_user_data = $shopping_user->toArray(); + $needs = ['wp_order_number', 'wp_order_date', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email', + 'same_as_billing', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone', + 'created_at', 'updated_at', 'user_deleted_at']; //'has_buyed', 'subscribed', + + //$salutation = array('mr' => 1, 'ms' => 2); + $ret = []; + foreach ($shopping_user_data as $key=>$value){ + + if($key === 'billing_country_id'){ + $ret['billing_country_code'] = $shopping_user->billing_country_id ? $shopping_user->billing_country->code : null; + } + if($key === 'shipping_country_id'){ + $ret['shipping_country_code'] = $shopping_user->shipping_country_id ? $shopping_user->shipping_country->code : null; + } + if($key === 'billing_salutation'){ + $ret['billing_salutation'] = $shopping_user->billing_salutation === 'ms' ? 2 : 1; + } + if($key === 'shipping_salutation'){ + $ret['shipping_salutation'] = $shopping_user->shipping_salutation === 'ms' ? 2 : 1; + } + + if(in_array($key, $needs)){ + $ret[$key] = $value; + } + } + return $ret; + } + + private function prepareForShowOrder($shopping_order){ + + if(!$shopping_order){ + return false; + } + $ret = [ + 'country' => isset($shopping_order->shipping_country->country->code) ? $shopping_order->shipping_country->country->code : '', + 'total' => ($shopping_order->total*100), + 'shipping' => ($shopping_order->shipping*100), + 'total_net' => ($shopping_order->subtotal*100), + 'tax_rate' => ($shopping_order->tax_rate*100), + 'tax' => ($shopping_order->tax*100), + 'total_with_shipping' => ($shopping_order->total_shipping*100), + 'weight' => $shopping_order->weight, + ]; + $ret['items'] = []; + foreach ($shopping_order->shopping_order_items as $item){ + $ret['items'][] = [ + 'article' => $item->product->wp_number, + 'name' => $item->product->name, + 'qty' => $item->qty, + 'price' => ($item->price * 100), + ]; + } + return $ret; + } + + private function prepareForUpdate($data){ + + //$salutation = array(1 => 'mr', 2 => 'ms', 3=>null); + $ret = []; + $needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email', + 'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone']; + + foreach ($data as $key=>$value){ + + if($key === 'billing_salutation') { + $ret['billing_salutation'] = $data['billing_salutation'] == 2 ? 'ms' : 'mr'; + } + if($key === 'shipping_salutation') { + $ret['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr'; + } + if($key === 'billing_country_code' && isset($data['billing_country_code'])) { + $ret['billing_country_id'] = Country::getCountryIdByCodeOrOne($data['billing_country_code']); + } + if($key === 'shipping_country_code' && isset($data['shipping_country_code']) ) { + $ret['shipping_country_id'] = Country::getCountryIdByCodeOrOne($data['shipping_country_code']); + } + if($key === 'billing_phone') { + $ret['billing_phone'] = strlen($data['billing_phone']) <= 3 ? '' : $data['billing_phone']; + } + if($key === 'shipping_phone') { + $ret['shipping_phone'] = strlen($data['shipping_phone']) <= 3 ? '' : $data['shipping_phone']; + } + if(in_array($key, $needs)){ + $ret[$key] = $value; + } + } + return $ret; + } + + private function prepareForStore($data){ + + //$salutation = array(1 => 'mr', 2 => 'ms', 3=>null); + $ret = []; + $needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_country_id', 'billing_phone', 'billing_email', + 'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_country_id', 'shipping_phone', + //'same_as_billing', 'has_buyed', 'subscribed', + 'wp_order_number', 'wp_order_date']; + + foreach ($needs as $need){ + + $ret[$need] = isset($data[$need]) ? $data[$need] : null; + + if ($need === 'billing_salutation' && $ret[$need] !== null) { + $ret['billing_salutation'] = $ret['billing_salutation'] == 2 ? 'ms' : 'mr'; + } + if ($need === 'shipping_salutation' && $ret[$need] !== null) { + $ret['shipping_salutation'] = $ret['shipping_salutation'] == 2 ? 'ms' : 'mr'; + } + if ($need === 'billing_country_id') { + $ret['billing_country_id'] = isset($data['billing_country_code']) ? Country::getCountryIdByCodeOrOne($data['billing_country_code']) : 1; + } + if ($need === 'shipping_country_id') { + $ret['shipping_country_id'] = isset($data['shipping_country_code']) ? Country::getCountryIdByCodeOrOne($data['shipping_country_code']) : $ret['billing_country_id']; + } + if ($need === 'billing_phone' && $ret[$need] !== null) { + $ret['billing_phone'] = strlen($data['billing_phone']) <= 3 ? '' : $data['billing_phone']; + } + if ($need === 'shipping_phone' && $ret[$need] !== null) { + $ret['shipping_phone'] = strlen($data['shipping_phone']) <= 3 ? '' : $data['shipping_phone']; + } + if ($need === 'wp_order_date') { + $ret['wp_order_date'] = Carbon::parse($ret['wp_order_date'])->toDateTimeString(); + } + + + } + $ret['same_as_billing'] = $ret['shipping_lastname'] !== null ? true : false; + $ret['has_buyed'] = true; + $ret['subscribed'] = false; + return $ret; + } + + private function prepareOrder($wp_shopping_order, $shopping_user){ + Yard::instance('shopping')->destroy(); + $ret = []; + + if(is_array($wp_shopping_order)){ + foreach ($wp_shopping_order as $order) { + $error = []; + if (!isset($order->article) || !isset($order->qty) || !isset($order->price)) { + $error[] = "article parameter is missing"; + } else { + + $product = Product::whereWpNumber($order->article)->first(); + if (!$product) { + $error[] = "article not found"; + } else { + if ($order->price != ($product->price * 100)) { + $error[] = "different price: " . ($product->price * 100); + } + Yard::instance('shopping')->add($product->id, $product->name, (int) $order->qty, $product->price, ['image' => [], 'slug' => $product->slug, 'weight' => $product->weight]); + } + } + $order->message = $error; + $ret[] = $order; + } + + $ShippingCountry = ShippingCountry::whereCountryId($shopping_user->shipping_country_id)->first(); + if($ShippingCountry){ + Yard::instance('shopping')->setShippingCountryWithPrice($ShippingCountry->id); + } + $shopping_order = $this->makeShoppingOrder($shopping_user); + $shopping_user->shopping_order = $shopping_order; + Yard::instance('shopping')->destroy(); + } + return $ret; + } + + private function makeShoppingOrder($shopping_user){ + + $data = [ + 'shopping_user_id' => $shopping_user->id, + 'auth_user_id' => $shopping_user->auth_user_id, + 'country_id' => Yard::instance('shopping')->getShippingCountryId(), + 'user_shop_id' => auth()->user()->user_sponsor->shop->id, + 'member_id' => $shopping_user->member_id, + 'total' => Yard::instance('shopping')->total(2, '.', ''), + 'shipping' => Yard::instance('shopping')->shipping(2, '.', ','), + 'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''), + 'tax_rate' => Yard::getTaxRate(), + 'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''), + 'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''), + 'weight' => Yard::instance('shopping')->weight(), + 'paid' => true, + 'txaction' => 'extern', + 'mode' => $shopping_user->mode, + ]; + $shopping_order = $shopping_user->shopping_order; + if($shopping_order){ + $shopping_order->fill($data); + $shopping_order->save(); + }else{ + $shopping_order= ShoppingOrder::create($data); + } + $items = Yard::instance('shopping')->content(); + + $shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order) { + foreach ($items as $item) { + if ($model->row_id === $item->rowId) { + $model->fill([ + 'shopping_order_id' => $shopping_order->id, + 'row_id' => $item->rowId, + 'product_id' => $item->id, + 'qty' => $item->qty, + 'price' => $item->price, + 'slug' => $item->options->slug, + ])->save(); + return false; + } + } + return $model->delete(); + }); + + + foreach ($items as $item) { + if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) + ShoppingOrderItem::create([ + 'shopping_order_id' => $shopping_order->id, + 'row_id' => $item->rowId, + 'product_id' => $item->id, + 'qty' => $item->qty, + 'price' => $item->price, + 'slug' => $item->options->slug + ]); + } + return $shopping_order; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/AttributeController.php b/app/Http/Controllers/AttributeController.php index c861ca9..64797b4 100755 --- a/app/Http/Controllers/AttributeController.php +++ b/app/Http/Controllers/AttributeController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Models\Attribute; use App\Models\ProductAttribute; -use Input; +use Request; class AttributeController extends Controller @@ -29,7 +29,7 @@ class AttributeController extends Controller public function store() { - $data = Input::all(); + $data = Request::all(); if($data['id'] == "new"){ $model = Attribute::create([ 'parent_id' => null, diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 5d0a69f..81cacd9 100755 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Models\Category; use App\Models\IqImage; use App\Models\ProductCategory; -use Input; +use\Request; class CategoryController extends Controller @@ -45,7 +45,7 @@ class CategoryController extends Controller public function store() { - $data = Input::all(); + $data = Request::all(); $data['active'] = isset($data['active']) ? true : false; $data['parent_id'] = isset($data['parent_id']) ? $data['parent_id'] : null; if($data['id'] == "new"){ @@ -105,7 +105,7 @@ class CategoryController extends Controller public function imageUpload(){ - $category_id = Input::get('category_id'); + $category_id = Request::get('category_id'); $category = Category::findOrFail($category_id); try { diff --git a/app/Http/Controllers/CountryController.php b/app/Http/Controllers/CountryController.php index 4368610..7629043 100755 --- a/app/Http/Controllers/CountryController.php +++ b/app/Http/Controllers/CountryController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Models\Country; -use Input; +use Request; class CountryController extends Controller @@ -48,7 +48,14 @@ class CountryController extends Controller public function store() { - $data = Input::all(); + $data = Request::all(); + + $data['active'] = isset($data['active']) ? true : false; + $data['switch'] = isset($data['switch']) ? true : false; + $data['own_eur'] = isset($data['own_eur']) ? true : false; + $data['currency'] = isset($data['currency']) ? true : false; + $data['currency_faktor'] = $data['currency_faktor'] == "" ? null : reFormatNumber($data['currency_faktor']); + if(!isset($data['attr'])){ $data['attr'] = []; } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 43a52e5..24c4448 100755 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -7,6 +7,7 @@ use App\Repositories\CustomerRepository; use App\Services\CustomerPriority; use App\Services\HTMLHelper; use Request; +use Validator; class CustomerController extends Controller @@ -35,6 +36,17 @@ class CustomerController extends Controller } + public function detail($id) + { + $shopping_user = ShoppingUser::findOrFail($id); + $data = [ + 'shopping_user' => $shopping_user, + 'isAdmin' => true, + 'isView' => 'customer', + ]; + return view('admin.customer.detail', $data); + } + public function edit($id) { if($id === "new"){ @@ -49,31 +61,75 @@ class CustomerController extends Controller 'isView' => 'customer', ]; - return view('admin.customer.detail', $data); + return view('admin.customer.edit', $data); } public function store($id) { $data = Request::all(); - $change_member_error = false; - if($data['action']==='shopping-user-change-member'){ - if(!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')){ - $change_member_error = "Das Passwort ist falsch."; - }else{ - //change - $shopping_user = ShoppingUser::findOrFail($data['id']); - CustomerPriority::newMemberForCustomer($shopping_user, $data['change_member_id'], $data['customer_set_member_for']); - \Session()->flash('alert-save', true); - return redirect(route('admin_customer_edit', [$shopping_user->id])); + + if ($data['action'] === 'shopping-user-change-member') { + if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { + $data = [ + 'change_member_error' => "Das Passwort ist falsch.", + 'shopping_user' => ShoppingUser::find($id), + 'isAdmin' => true, + 'isView' => 'customer', + ]; + return view('admin.customer.detail', $data); } + //change + $shopping_user = ShoppingUser::findOrFail($data['id']); + CustomerPriority::newMemberForCustomer($shopping_user, $data['change_member_id'], $data['customer_set_member_for']); + \Session()->flash('alert-save', true); + return redirect(route('admin_customer_detail', [$shopping_user->id])); } - $data = [ - 'change_member_error' => $change_member_error, - 'shopping_user' => ShoppingUser::find($id), - 'isAdmin' => true, - 'isView' => 'customer', - ]; - return view('admin.customer.detail', $data); + if ($data['action'] === 'shopping-user-store') { + $rules = array( + 'billing_salutation' => 'required', + 'billing_firstname'=>'required', + 'billing_lastname'=>'required', + 'billing_email'=>'required|email', + 'billing_address'=>'required', + 'billing_zipcode'=>'required', + 'billing_city' => 'required', + 'billing_country_id' => 'required' + ); + + if(!Request::get('same_as_billing')){ + $rules = array_merge($rules, [ + 'shipping_firstname'=>'required', + 'shipping_lastname'=>'required', + 'shipping_address'=>'required', + 'shipping_zipcode'=>'required', + 'shipping_city' => 'required', + 'shipping_salutation' => 'required', + 'shipping_country_id' => 'required' + ]); + } + $validator = Validator::make(Request::all(), $rules); + if ($validator->fails()) { + return back()->withErrors($validator)->withInput(Request::all()); + } + + $shopping_user = ShoppingUser::findOrFail($id); + $data['has_buyed'] = true; + $data['subscribed'] = true; + if($shopping_user->auth_user_id > 0){ + $data['has_buyed'] = true; + $data['subscribed'] = false; + } + $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; + $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id']; + CustomerPriority::checkChangeOne($shopping_user, $data, true); + $shopping_user->fill($data); + $shopping_user->save(); + \App\Services\Shop::newUserOrder($shopping_user->number); + + \Session()->flash('alert-save', true); + } + return redirect(route('admin_customer_detail', [$shopping_user->id])); + } public function getCustomers() @@ -95,7 +151,7 @@ class CustomerController extends Controller }*/ return \DataTables::eloquent($query) ->addColumn('id', function (ShoppingUser $ShoppingUser) { - return ''; + return ''; }) ->addColumn('billing_salutation', function (ShoppingUser $ShoppingUser) { return HTMLHelper::getSalutationLang($ShoppingUser->billing_salutation); @@ -104,7 +160,7 @@ class CustomerController extends Controller return $ShoppingUser->billing_country ? $ShoppingUser->billing_country->getLocated() : ''; }) ->addColumn('isMember', function (ShoppingUser $ShoppingUser) { - return $ShoppingUser->auth_user_id ? '' : ''; + return get_active_badge($ShoppingUser->auth_user_id).($ShoppingUser->mode==='dev' ? ' dev' : ''); }) ->addColumn('member_id', function (ShoppingUser $ShoppingUser) { if($ShoppingUser->member_id){ @@ -123,13 +179,17 @@ class CustomerController extends Controller ->addColumn('created_at', function (ShoppingUser $ShoppingUser) { return $ShoppingUser->created_at->format('d.m.Y'); }) + ->addColumn('subscribed', function (ShoppingUser $ShoppingUser) { + return get_active_badge($ShoppingUser->subscribed); + }) ->orderColumn('id', 'id $1') ->orderColumn('billing_country_id', 'billing_country_id $1') ->orderColumn('billing_salutation', 'billing_salutation $1') ->orderColumn('created_at', 'created_at $1') ->orderColumn('isMember', 'auth_user_id $1') ->orderColumn('member_id', 'member_id $1') - ->rawColumns(['id', 'isMember', 'member_id']) + ->orderColumn('subscribed', 'subscribed $1') + ->rawColumns(['id', 'subscribed', 'isMember', 'member_id']) ->make(true); } } \ No newline at end of file diff --git a/app/Http/Controllers/DataTableController.php b/app/Http/Controllers/DataTableController.php index 19a5385..d0db346 100644 --- a/app/Http/Controllers/DataTableController.php +++ b/app/Http/Controllers/DataTableController.php @@ -15,7 +15,7 @@ class DataTableController extends Controller public function getUsers() { - $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null); + $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4); return \DataTables::eloquent($query) ->addColumn('first_name', function (User $user) { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b4444b6..7c4b84a 100755 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -8,7 +8,6 @@ use Auth; use Carbon\Carbon; use Config; use Request; -use Input; use Util; class HomeController extends Controller @@ -48,8 +47,8 @@ class HomeController extends Controller public function loadingModal(){ - $data = Input::get('data'); - $target = Input::get('target'); + $data = Request::get('data'); + $target = Request::get('target'); $response = ""; if($data === "data_protection"){ @@ -203,7 +202,7 @@ class HomeController extends Controller */ public function checkMail(){ - $data = Input::all(); + $data = Request::all(); if($data['user_id'] === "new"){ if(User::where('email', $data['email'])->count()){ return json_encode(false); diff --git a/app/Http/Controllers/ImportProductController.php b/app/Http/Controllers/ImportProductController.php index 3e81c8d..0c6f75f 100755 --- a/app/Http/Controllers/ImportProductController.php +++ b/app/Http/Controllers/ImportProductController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Models\Product; use App\Models\ProductImage; use App\Repositories\ProductRepository; -use Input; +use Request; use Validator; diff --git a/app/Http/Controllers/LeadController.php b/app/Http/Controllers/LeadController.php index 7954aa9..36d3838 100755 --- a/app/Http/Controllers/LeadController.php +++ b/app/Http/Controllers/LeadController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; - - use App\Mail\MailCustomMessage; use App\Mail\MailVerifyAccount; use App\Mail\MailVerifyContact; @@ -15,12 +13,9 @@ use App\Repositories\UserRepository; use App\Services\UserService; use App\User; use Illuminate\Support\Facades\Mail; -use Input; -use Illuminate\Http\Request; +use Request; use Validator; - - class LeadController extends Controller { protected $userRepo; @@ -64,7 +59,7 @@ class LeadController extends Controller } } $data = [ - 'show' => Input::get('show'), + 'show' => Request::get('show'), 'user' => $user, 'can_change_mail' => true, 'm_data_load' => false, @@ -120,8 +115,8 @@ class LeadController extends Controller public function store(Request $request) { - $data = Input::all(); - $show = Input::get('show'); + $data = Request::all(); + $show = Request::get('show'); if ($data['user_id'] === "new" || $data['user_id'] == 0) { $rules = array( @@ -142,7 +137,7 @@ class LeadController extends Controller 'email' => 'required|string|email|max:255|exists:users,email', 'email-confirm' => 'required|same:email', ); - if(!Input::get('same_as_billing')){ + if(!Request::get('same_as_billing')){ $rules = array_merge($rules, [ 'shipping_firstname'=>'required', 'shipping_lastname'=>'required', @@ -161,7 +156,7 @@ class LeadController extends Controller } - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { if ($data['user_id'] === "new" || $data['user_id'] == 0) { @@ -170,7 +165,7 @@ class LeadController extends Controller $user = User::findOrFail($data['user_id']); $user_id = $user->id; } - return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withInput(Input::all()); + return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withRequest(Request::all()); } if ($data['user_id'] === "new" || $data['user_id'] == 0) { @@ -224,7 +219,7 @@ class LeadController extends Controller $user = User::findOrFail($id); if($action === 'completed'){ - $validator = Validator::make(Input::all(), []); + $validator = Validator::make(Request::all(), []); if(!$user->m_sponsor){ $validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.')); } @@ -238,7 +233,7 @@ class LeadController extends Controller $validator->errors()->add('m_account', __('Berater hat keine Account ID')); } if ($validator->errors()->count()) { - return back()->withErrors($validator)->withInput(Input::all()); + return back()->withErrors($validator)->withRequest(Request::all()); } //create PDF @@ -276,7 +271,7 @@ class LeadController extends Controller $user->release_account = null; $user->save(); - $input = Input::all(); + $input = Request::all(); $data = [ 'subject' => $input['account_incomplete_subject'], 'message' => $input['account_incomplete_message'], @@ -340,7 +335,7 @@ class LeadController extends Controller public function getLeads() { - $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null); + $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4); return \DataTables::eloquent($query) ->addColumn('first_name', function (User $user) { diff --git a/app/Http/Controllers/MembershipController.php b/app/Http/Controllers/MembershipController.php index c10de4e..f52d6d7 100755 --- a/app/Http/Controllers/MembershipController.php +++ b/app/Http/Controllers/MembershipController.php @@ -12,7 +12,6 @@ use Carbon; use Config; use Illuminate\Validation\Rules\In; use Request; -use Input; use Util; use Yard; use Illuminate\Support\Facades\Mail; @@ -62,11 +61,11 @@ class MembershipController extends Controller public function storePayment($action){ - $data = Input::all(); + $data = Request::all(); //#### remove_abo if($action === "remove_abo"){ - if(Input::get('abo_options_remove')){ + if(Request::get('abo_options_remove')){ $user = User::find(Auth::user()->id); $user->abo_options = false; $user->save(); @@ -82,12 +81,12 @@ class MembershipController extends Controller //#### payment order //#### shop upgrade if($action === "upgrade_order" || $action === "payment_order"){ - if(Input::get('switchers-package-wizard')){ + if(Request::get('switchers-package-wizard')){ $user = User::find(Auth::user()->id); Yard::instance('shopping')->destroy(); - $product = Product::find(Input::get('switchers-package-wizard')); + $product = Product::find(Request::get('switchers-package-wizard')); $showAboOptions = false; - if(Input::get('abo_options')){ + if(Request::get('abo_options')){ $showAboOptions = true; $user->abo_options = true; $user->save(); @@ -97,7 +96,7 @@ class MembershipController extends Controller if($product->images->count()){ $image = $product->images->first()->slug; } - $qty = Input::get('qty') ? Input::get('qty') : 1; + $qty = Request::get('qty') ? Request::get('qty') : 1; Yard::instance('shopping')->add($product->id, $product->getLang('name'), $qty, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]); do { @@ -124,9 +123,9 @@ class MembershipController extends Controller } if($action === "change_order"){ - if(Input::get('switchers-package-wizard')){ + if(Request::get('switchers-package-wizard')){ $user = User::find(Auth::user()->id); - $product = Product::find(Input::get('switchers-package-wizard')); + $product = Product::find(Request::get('switchers-package-wizard')); if($user->payment_order_id == $product->id){ \Session()->flash('alert-success', "keine Änderung vorgenommen."); return back(); @@ -142,7 +141,7 @@ class MembershipController extends Controller } } if($action === "delete_membership"){ - if(Input::get('delete_membership_mivita')){ + if(Request::get('delete_membership_mivita')){ //TODO $user = User::find(Auth::user()->id); if($user->isTestMode()){ diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index fe70a41..0f67aef 100755 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use App\Models\Country; use App\Models\Product; use App\Models\ProductImage; use App\Repositories\ProductRepository; -use Input; use Request; use Validator; @@ -47,8 +47,11 @@ class ProductController extends Controller }else{ $model = Product::findOrFail($id); } + + $country_for_prices = Country::where('own_eur', '=', true)->orWhere('currency', '=', true)->get(); $data = [ 'product' => $model, + 'country_for_prices' => $country_for_prices, ]; return view('admin.product.edit', $data); } @@ -56,12 +59,12 @@ class ProductController extends Controller public function store() { - $data = Input::all(); + $data = Request::all(); $rules = array( 'name' => 'required', ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if($data['id'] == "new"){ $model = new Product(); @@ -77,7 +80,7 @@ class ProductController extends Controller return view('admin.product.edit', $data)->withErrors($validator); } else { - $product = $this->productRepo->update(Input::all()); + $product = $this->productRepo->update(Request::all()); \Session()->flash('alert-save', true); return redirect(route('admin_product_edit', [$product->id])); } @@ -111,7 +114,7 @@ class ProductController extends Controller public function imageUpload(){ - $product_id = Input::get('product_id'); + $product_id = Request::get('product_id'); $product = Product::findOrFail($product_id); try { diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php index 6e11f43..dc26e9b 100755 --- a/app/Http/Controllers/SalesController.php +++ b/app/Http/Controllers/SalesController.php @@ -2,14 +2,11 @@ namespace App\Http\Controllers; -use App\Models\Country; use App\Models\ShoppingOrder; use App\Models\ShoppingUser; use App\Models\UserShop; use App\Services\CustomerPriority; use App\Services\Payment; -use App\User; -use Input; use Request; class SalesController extends Controller @@ -140,8 +137,9 @@ class SalesController extends Controller $shopping_user = ShoppingUser::findOrFail($data['id']); $set_like_shopping_user = ShoppingUser::findOrFail($data['is_like_shopping_user_id']); $send_member_mail = isset($data['send_member_mail']) ? true : false; + $change_shopping_user = isset($data['change_shopping_user']) ? true : false; //Mail send in setIsLike - CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail); + CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user); \Session()->flash('alert-save', true); return redirect($data['back']); } diff --git a/app/Http/Controllers/ShippingController.php b/app/Http/Controllers/ShippingController.php index 342ac86..83af29a 100755 --- a/app/Http/Controllers/ShippingController.php +++ b/app/Http/Controllers/ShippingController.php @@ -8,8 +8,7 @@ namespace App\Http\Controllers; use App\Models\Shipping; use App\Models\ShippingCountry; use App\Models\ShippingPrice; -use Input; -use Illuminate\Http\Request; +use Request; use Validator; @@ -58,7 +57,7 @@ class ShippingController extends Controller public function store(Request $request) { $shipping = false; - $data = Input::all(); + $data = Request::all(); if($data['action'] == 'shipping'){ if ($data['id'] == "new") { @@ -69,11 +68,11 @@ class ShippingController extends Controller $rules = array('name' => 'required'); } $ret = ['value' => $shipping]; - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { return view('admin.shipping.edit', $ret)->withErrors($validator); } - $data = Input::all(); + $data = Request::all(); $shipping->name = $data['name']; $shipping->free = $data['free']; $shipping->active = isset($data['active']) ? true : false; @@ -84,7 +83,7 @@ class ShippingController extends Controller $shipping = Shipping::findOrFail($data['shipping_id']); $rules = array('price' => 'required'); $ret = ['value' => $shipping]; - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { return view('admin.shipping.edit', $ret)->withErrors($validator); } diff --git a/app/Http/Controllers/SitesController.php b/app/Http/Controllers/SitesController.php index 1dbd6d0..0270d38 100755 --- a/app/Http/Controllers/SitesController.php +++ b/app/Http/Controllers/SitesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Models\IqImage; use App\Models\IqSite; -use Input; +use Request; class SitesController extends Controller @@ -31,7 +31,7 @@ class SitesController extends Controller public function store($site) { - $data = Input::all(); + $data = Request::all(); $data['products'] = isset($data['products']) ? $data['products'] : null; $data['set_products'] = isset($data['set_products']) ? $data['set_products'] : null; diff --git a/app/Http/Controllers/Sys/AdminToolsController.php b/app/Http/Controllers/Sys/AdminToolsController.php index f8feb03..be66395 100755 --- a/app/Http/Controllers/Sys/AdminToolsController.php +++ b/app/Http/Controllers/Sys/AdminToolsController.php @@ -1,7 +1,6 @@ where('auth_user_id', '=', NULL)->get(); $data = [ 'values' => $shopping_users, 'text' => '', @@ -47,10 +45,20 @@ class AdminToolsController extends Controller return view('sys.admin.customers', $data); } + + public function customerStore() { - $data = Input::all(); - \Session()->flash('alert-save', true); + $data = Request::all(); + if($data['action'] === 'checkForAll'){ + $shopping_users = CustomerPriority::checkForAll(); + } + if(strpos($data['action'], 'checkOne_') !== false){ + $id = (int) str_replace('checkOne_', '', $data['action']); + $shopping_user = ShoppingUser::findOrFail($id); + $ret = CustomerPriority::checkOne($shopping_user); + } + \Session()->flash('alert-success', $ret); return back(); } @@ -73,7 +81,7 @@ class AdminToolsController extends Controller } public function cronjobsStore() { - $data = Input::all(); + $data = Request::all(); \Session()->flash('alert-save', true); return back(); } @@ -114,7 +122,7 @@ class AdminToolsController extends Controller } public function domainSSLStore() { - $data = Input::all(); + $data = Request::all(); \Session()->flash('alert-save', true); return back(); } @@ -132,7 +140,7 @@ class AdminToolsController extends Controller public function shoppingOrdersStore() { //first run - $data = Input::all(); + $data = Request::all(); if($data['action'] === 'first_run'){ $shopping_users = ShoppingUser::whereHas('shopping_order', function($q) { diff --git a/app/Http/Controllers/Sys/ImportController.php b/app/Http/Controllers/Sys/ImportController.php new file mode 100755 index 0000000..325d935 --- /dev/null +++ b/app/Http/Controllers/Sys/ImportController.php @@ -0,0 +1,54 @@ +middleware('sysadmin'); + $this->import = $import; + + } + + + public function import() + { + $data = [ + ]; + return view('sys.admin.import', $data); + } + + + public function importStore() + { + $input = Request::all(); + return $this->import->upload($input); + } + + public function importShow($type, $file, $skip = 0, $limit = 4000) + { + $import = $this->import->read($type, $file, $skip, $limit); + $data = [ + 'limit' => $limit, + 'type' => $type, + 'file' => $file, + 'import' => $import, + 'skip' => $skip, + ]; + return view('sys.admin.import-show', $data); + + } + + + +} \ No newline at end of file diff --git a/app/Http/Controllers/TranslationController.php b/app/Http/Controllers/TranslationController.php index 36246aa..43af757 100755 --- a/app/Http/Controllers/TranslationController.php +++ b/app/Http/Controllers/TranslationController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App; use File; -use Input; +use Request; class TranslationController extends Controller { @@ -65,7 +65,7 @@ class TranslationController extends Controller $path = $this->resourcePath($this->languagesPath); $file = $path.$language.".json"; - $data = Input::all(); + $data = Request::all(); $this->backup($path, $language.".json"); unset($data['_token']); diff --git a/app/Http/Controllers/TranslationFileController.php b/app/Http/Controllers/TranslationFileController.php index 5a6be75..5e03150 100755 --- a/app/Http/Controllers/TranslationFileController.php +++ b/app/Http/Controllers/TranslationFileController.php @@ -1,9 +1,5 @@ middleware('active.account'); + $this->customerRepository = $customerRepository; + + } + + public function index() + { + if(Request::get('reset') === 'filter'){ + // set_user_attr('filter_member_id', null); + // set_user_attr('filter_customer_member', null); + return redirect(route('admin_customers')); + } + $data = [ + + ]; + return view('user.customer.index', $data); + } + + + public function detail($id) + { + $shopping_user = ShoppingUser::findOrFail($id); + if($shopping_user->member_id != \Auth::user()->id){ + abort(404); + } + $data = [ + 'shopping_user' => $shopping_user, + 'isAdmin' => false, + 'isView' => 'customer', + + ]; + return view('user.customer.detail', $data); + } + + public function edit($id) + { + $shopping_user = ShoppingUser::findOrFail($id); + if($shopping_user->member_id != \Auth::user()->id){ + abort(404); + } + $data = [ + 'shopping_user' => $shopping_user, + 'isAdmin' => false, + 'isView' => 'customer', + + ]; + return view('user.customer.edit', $data); + } + + public function add($id, $step=0) + { + if($id === "new"){ + $shopping_user = new ShoppingUser(); + $shopping_user->id = "new"; + }else{ + $shopping_user = ShoppingUser::findOrFail($id); + if($shopping_user->member_id != \Auth::user()->id){ + abort(404); + } + } + if(old('email') || old('billing_email')){ + $step = 1; + $shopping_user->same_as_billing = true; + } + $data = [ + 'shopping_user' => $shopping_user, + 'isAdmin' => false, + 'isView' => $step === 0 ? 'customer' : 'customer-add', + 'step' => $step, + 'billing_email' => old('email'), + + ]; + return view('user.customer.add', $data); + } + + public function store($id) + { + $data = Request::all(); + + if($id === 'new' && $data['action'] === 'add_customer_step_email'){ + $rules = array( + 'email' => 'required|string|email|max:255|unique:shopping_users,billing_email', + ); + $messages = [ + 'unique' => __('validation.custom.unique_email_client'), + ]; + $validator = Validator::make(Request::all(), $rules, $messages); + if ($validator->fails()) { + return back()->withErrors($validator)->withInput(Request::all()); + } + //okay, go to step 1 + return back()->withInput(Request::all()); + + } + + if($data['action'] === 'shopping-user-store-new' || $data['action']==='shopping-user-store'){ + $rules = array( + 'billing_salutation' => 'required', + 'billing_firstname'=>'required', + 'billing_lastname'=>'required', + 'billing_email'=>'required|email', + 'billing_address'=>'required', + 'billing_zipcode'=>'required', + 'billing_city' => 'required', + 'billing_country_id' => 'required', + ); + + if(!Request::get('same_as_billing')){ + $rules = array_merge($rules, [ + 'shipping_firstname'=>'required', + 'shipping_lastname'=>'required', + 'shipping_address'=>'required', + 'shipping_zipcode'=>'required', + 'shipping_city' => 'required', + 'shipping_salutation' => 'required', + 'shipping_country_id' => 'required' + ]); + } + $validator = Validator::make(Request::all(), $rules); + if ($validator->fails()) { + return back()->withErrors($validator)->withInput(Request::all()); + } + } + + $data['has_buyed'] = isset($data['has_buyed']) ? true : false; + $data['subscribed'] = isset($data['subscribed']) ? true : false; + //subscribed can only true when has_buyed ist active + $data['subscribed'] = $data['has_buyed'] ? $data['subscribed'] : false; + + $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; + $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id']; + + if($id > 0 && $data['action'] === 'shopping-user-store'){ + $shopping_user = ShoppingUser::findOrFail($id); + if($shopping_user->member_id != \Auth::user()->id){ + abort(404); + } + CustomerPriority::checkChangeOne($shopping_user, $data, true); + $shopping_user->fill($data); + $shopping_user->save(); + } + + if($id === 'new' && $data['action'] === 'shopping-user-store-new') { + $shopping_user = ShoppingUser::create($data); + $shopping_user->member_id = \Auth::user()->id; + $shopping_user->save(); + CustomerPriority::checkNewOne($shopping_user, true); + } + \App\Services\Shop::newUserOrder($shopping_user->number); + + \Session()->flash('alert-save', true); + return redirect(route('user_customer_detail', [$shopping_user->id])); + } + + public function getCustomers() + { + $user = User::find(\Auth::user()->id); + + $query = ShoppingUser::select(['id', 'billing_company', 'billing_salutation', 'billing_firstname', 'billing_lastname', 'billing_email', 'billing_zipcode', 'billing_city', 'billing_country_id', 'orders', 'subscribed', 'created_at', 'number', 'mode', 'wp_order_number']) + ->where('shopping_users.member_id', '=', $user->id); + //->groupBy('shopping_users.number'); + + /*set_user_attr('filter_member_id', Request::get('filter_member_id')); + if(Request::get('filter_member_id') != ""){ + $query->where('member_id', '=', Request::get('filter_member_id')); + }*/ + return \DataTables::eloquent($query) + + ->addColumn('id', function (ShoppingUser $ShoppingUser) { + return ''; + }) + ->addColumn('billing_salutation', function (ShoppingUser $ShoppingUser) { + return HTMLHelper::getSalutationLang($ShoppingUser->billing_salutation); + }) + ->addColumn('billing_country_id', function (ShoppingUser $ShoppingUser) { + return $ShoppingUser->billing_country ? $ShoppingUser->billing_country->getLocated() : ''; + }) + ->addColumn('first_created_at', function (ShoppingUser $ShoppingUser) { + return $ShoppingUser->firstEntryByNumber()->created_at->format('d.m.Y'); + }) + ->addColumn('orders', function (ShoppingUser $ShoppingUser) { + return $ShoppingUser->lastEntryByNumber()->orders; + }) + ->addColumn('subscribed', function (ShoppingUser $ShoppingUser) { + return get_active_badge($ShoppingUser->subscribed); + }) + ->addColumn('extras', function (ShoppingUser $ShoppingUser) { + return $ShoppingUser->wp_order_number.($ShoppingUser->mode==='dev' ? ' dev' : ''); + }) + ->orderColumn('id', 'id $1') + ->orderColumn('billing_country_id', 'billing_country_id $1') + ->orderColumn('billing_salutation', 'billing_salutation $1') + ->orderColumn('first_created_at', 'created_at $1') + ->orderColumn('orders', 'orders $1') + ->orderColumn('subscribed', 'subscribed $1') + ->rawColumns(['id', 'subscribed', 'extras']) + ->make(true); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/User/ShopSalesController.php b/app/Http/Controllers/User/ShopSalesController.php index 59b4326..2166766 100755 --- a/app/Http/Controllers/User/ShopSalesController.php +++ b/app/Http/Controllers/User/ShopSalesController.php @@ -26,11 +26,8 @@ class ShopSalesController extends Controller public function orderDetail($id) { $user = User::find(\Auth::user()->id); - $shopping_order = ShoppingOrder::find($id); - if(!$shopping_order){ - abort(404); - } - if($shopping_order->user_shop_id !== $user->shop->id){ + $shopping_order = ShoppingOrder::findOrFail($id); + if($shopping_order->member_id !== $user->id){ abort(404); } $data = [ @@ -43,7 +40,7 @@ class ShopSalesController extends Controller public function ordersDatatable(){ $user = User::find(\Auth::user()->id); - $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('user_shop_id', $user->shop->id); + $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('member_id', $user->id); return \DataTables::eloquent($query) ->addColumn('id', function (ShoppingOrder $ShoppingOrder) { diff --git a/app/Http/Controllers/UserDataController.php b/app/Http/Controllers/UserDataController.php index 696ea79..3357bba 100755 --- a/app/Http/Controllers/UserDataController.php +++ b/app/Http/Controllers/UserDataController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Repositories\UserRepository; use App\User; use Auth; -use Input; +use Request; use Validator; @@ -55,7 +55,7 @@ class UserDataController extends Controller 'email' => 'required|string|email|max:255|exists:users,email', 'email-confirm' => 'required|same:email', ); - if(!Input::get('same_as_billing')){ + if(!Request::get('same_as_billing')){ $rules = array_merge($rules, [ 'shipping_firstname'=>'required', 'shipping_lastname'=>'required', @@ -69,14 +69,14 @@ class UserDataController extends Controller $data = [ 'user' => $user, ]; - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { return view('user.edit', $data)->withErrors($validator); } else { - $this->userRepo->update(Input::all()); + $this->userRepo->update(Request::all()); \Session()->flash('alert-save', true); return redirect('/user/edit'); } @@ -103,7 +103,7 @@ class UserDataController extends Controller $rules['accepted_active'] = 'required'; } - if(Input::get('company') == 1){ + if(Request::get('company') == 1){ $rules['company_name'] = 'required|max:255'; $rules['company_country_id'] = 'required|integer|min:1'; } @@ -112,7 +112,7 @@ class UserDataController extends Controller 'user' => $user, ]; - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { @@ -122,7 +122,7 @@ class UserDataController extends Controller return view('user.edit', $data)->withErrors($validator); } else { - $this->userRepo->update(Input::all()); + $this->userRepo->update(Request::all()); if($user->active == 0) { $account = $user->account; @@ -134,7 +134,7 @@ class UserDataController extends Controller $user->save(); } - if(Input::get('accepted_active') == "on"){ + if(Request::get('accepted_active') == "on"){ $user->agreement = now(); }else{ $user->agreement = null; @@ -152,7 +152,7 @@ class UserDataController extends Controller public function userDataAcceptedForm(){ $user = Auth::user(); - if(Input::get('accepted_active') == "on"){ + if(Request::get('accepted_active') == "on"){ $user->agreement = now(); }else { $user->agreement = null; @@ -189,7 +189,7 @@ class UserDataController extends Controller $data = [ 'user' => $user, ]; - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { // get the error messages from the validator @@ -201,7 +201,7 @@ class UserDataController extends Controller $account->data_protection = now(); $account->save(); - if(Input::get('accepted_active') == "on"){ + if(Request::get('accepted_active') == "on"){ $user->agreement = now(); }else{ $user->agreement = null; diff --git a/app/Http/Controllers/UserDeleteController.php b/app/Http/Controllers/UserDeleteController.php index ea519fb..39eb5e4 100755 --- a/app/Http/Controllers/UserDeleteController.php +++ b/app/Http/Controllers/UserDeleteController.php @@ -5,8 +5,7 @@ namespace App\Http\Controllers; use Auth; use Validator; -use Input; -use Illuminate\Http\Request; +use Request; use Illuminate\Support\Facades\Hash; use App\Repositories\UserRepository; @@ -53,7 +52,7 @@ class UserDeleteController extends Controller }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { diff --git a/app/Http/Controllers/UserLevelController.php b/app/Http/Controllers/UserLevelController.php index bea822b..f18381d 100755 --- a/app/Http/Controllers/UserLevelController.php +++ b/app/Http/Controllers/UserLevelController.php @@ -6,7 +6,7 @@ namespace App\Http\Controllers; use App\Models\Attribute; use App\Models\ProductAttribute; use App\Models\UserLevel; -use Input; +use Request; class UserLevelController extends Controller @@ -30,7 +30,7 @@ class UserLevelController extends Controller public function store() { - $data = Input::all(); + $data = Request::all(); if($data['id'] == "new"){ $model = UserLevel::create([ 'name' => $data['name'], diff --git a/app/Http/Controllers/UserShopController.php b/app/Http/Controllers/UserShopController.php index 4ecfd75..569ee04 100755 --- a/app/Http/Controllers/UserShopController.php +++ b/app/Http/Controllers/UserShopController.php @@ -9,7 +9,7 @@ use App\Models\UserShopOnSite; use App\Repositories\UserRepository; use Auth; use Cviebrock\EloquentSluggable\Services\SlugService; -use Input; +use Request; use Response; use Validator; @@ -51,7 +51,7 @@ class UserShopController extends Controller public function store() { $user = Auth::user(); - $data = Input::all(); + $data = Request::all(); if (!$user->shop) { abort(404); @@ -182,7 +182,7 @@ class UserShopController extends Controller public function uploadOnSiteImage(){ $user = Auth::user(); - $user_shop_id = Input::get('user_shop_id'); + $user_shop_id = Request::get('user_shop_id'); if(!$user->shop || $user->shop->id != $user_shop_id){ abort(404); @@ -268,7 +268,7 @@ class UserShopController extends Controller public function userShopRegisterForm(){ - if(Input::get('shop_submit') == 'check'){ + if(Request::get('shop_submit') == 'check'){ $rules = array( 'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|full_word_check', ); @@ -278,17 +278,17 @@ class UserShopController extends Controller } return true; }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { \Session()->flash('shop-name-error', 'error'); - return redirect()->back()->withErrors($validator)->withInput(); + return redirect()->back()->withErrors($validator)->withRequest(); } \Session()->flash('shop-name-error', 'check'); - return redirect(route('user_shop'))->withInput(); + return redirect(route('user_shop'))->withRequest(); } - if(Input::get('shop_submit') == 'action') { + if(Request::get('shop_submit') == 'action') { $rules = array( 'user_shop_name' => ' required|alpha_dash|profanity|unique:user_shops,name|min:4|max:20|full_word_check', @@ -299,7 +299,7 @@ class UserShopController extends Controller } return true; }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { \Session()->flash('shop-name-error', 'error'); @@ -311,14 +311,14 @@ class UserShopController extends Controller $rules = array( 'user_shop_active' => 'accepted', ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - return redirect()->back()->withErrors($validator)->withInput(); + return redirect()->back()->withErrors($validator)->withRequest(); } //all is right - save $user = Auth::user(); - $data = Input::all(); + $data = Request::all(); $user_shop = UserShop::create([ 'user_id' => $user->id, @@ -387,7 +387,7 @@ class UserShopController extends Controller return true; }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { //$messages = $validator->messages(); @@ -397,7 +397,7 @@ class UserShopController extends Controller )); } - $slug = SlugService::createSlug(UserShop::class, 'slug', Input::get('user_shop_name')); + $slug = SlugService::createSlug(UserShop::class, 'slug', Request::get('user_shop_name')); return Response::json(array( 'success' => true, diff --git a/app/Http/Controllers/UserUpdateEmailController.php b/app/Http/Controllers/UserUpdateEmailController.php index fa829a0..1a0996e 100755 --- a/app/Http/Controllers/UserUpdateEmailController.php +++ b/app/Http/Controllers/UserUpdateEmailController.php @@ -6,11 +6,9 @@ namespace App\Http\Controllers; use App\User; use Auth; use Validator; -use Input; +use Request; use Carbon\Carbon; use Illuminate\Database\Connection; -use Illuminate\Http\Request; -use App\Http\Controllers\Controller; use App\Mail\MailActivateUser; use Illuminate\Support\Facades\Mail; @@ -52,7 +50,7 @@ class UserUpdateEmailController extends Controller return true; }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { // redirect our user back to the form with the errors from the validator $messages = $validator->messages(); @@ -61,8 +59,7 @@ class UserUpdateEmailController extends Controller }else{ - - $this->sendActivationMail($user, $request->all()); + $this->sendActivationMail($user, Request::all()); \Session()->flash('alert-success', __('We sent you an activation code. Check your email!')); return redirect(route('user_update_email')); } @@ -104,7 +101,7 @@ class UserUpdateEmailController extends Controller return true; }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { // redirect our user back to the form with the errors from the validator $messages = $validator->messages(); @@ -114,7 +111,7 @@ class UserUpdateEmailController extends Controller }else{ - $this->sendActivationMail($user, $request->all()); + $this->sendActivationMail($user, Request::all()); \Session()->flash('alert-success', __('An activation code was sent to the account by e-mail!')); return redirect(route('admin_lead_edit', [$user->id])); } diff --git a/app/Http/Controllers/UserUpdatePasswordController.php b/app/Http/Controllers/UserUpdatePasswordController.php index a2cf591..c5acc3f 100755 --- a/app/Http/Controllers/UserUpdatePasswordController.php +++ b/app/Http/Controllers/UserUpdatePasswordController.php @@ -6,8 +6,7 @@ namespace App\Http\Controllers; use Auth; use Illuminate\Support\Facades\Hash; use Validator; -use Input; -use Illuminate\Http\Request; +use Request; class UserUpdatePasswordController extends Controller @@ -45,7 +44,7 @@ class UserUpdatePasswordController extends Controller }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { @@ -87,7 +86,7 @@ class UserUpdatePasswordController extends Controller ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { diff --git a/app/Http/Controllers/Web/CardController.php b/app/Http/Controllers/Web/CardController.php index c73723d..84218b7 100755 --- a/app/Http/Controllers/Web/CardController.php +++ b/app/Http/Controllers/Web/CardController.php @@ -6,10 +6,9 @@ namespace App\Http\Controllers\Web; use App\Http\Controllers\Controller; use App\Models\Product; use App\Models\ShoppingInstance; -use Validator; use App\Services\Util; use Yard; -use Input; +use Request; class CardController extends Controller { @@ -53,7 +52,7 @@ class CardController extends Controller if($product->images->count()){ $image = $product->images->first()->slug; } - $quantity = Input::get('quantity') ? Input::get('quantity') : 1; + $quantity = Request::get('quantity') ? Request::get('quantity') : 1; Yard::instance('shopping')->add($product->id, $product->getLang('name'), $quantity, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]); Yard::instance('shopping')->reCalculateShippingPrice(); @@ -66,8 +65,8 @@ class CardController extends Controller public function showCard(){ - if(Input::get('selected_country')){ - Yard::instance('shopping')->setShippingCountryWithPrice(Input::get('selected_country')); + if(Request::get('selected_country')){ + Yard::instance('shopping')->setShippingCountryWithPrice(Request::get('selected_country')); }else{ Yard::instance('shopping')->reCalculateShippingPrice(); } @@ -79,7 +78,7 @@ class CardController extends Controller public function updateCard(){ - $data = Input::all(); + $data = Request::all(); if(isset($data['quantity'])){ foreach ($data['quantity'] as $rowId => $qty){ Yard::instance('shopping')->update($rowId, $qty); diff --git a/app/Http/Controllers/Web/CheckoutController.php b/app/Http/Controllers/Web/CheckoutController.php index 4bcf8c3..49f15cd 100755 --- a/app/Http/Controllers/Web/CheckoutController.php +++ b/app/Http/Controllers/Web/CheckoutController.php @@ -17,7 +17,7 @@ use Illuminate\Support\Collection; use Validator; use App\Services\Util; use Yard; -use Input; +use Request; class CheckoutController extends Controller { @@ -39,8 +39,8 @@ class CheckoutController extends Controller // $user_shop = Util::getUserShop(); - if(Input::get('selected_country')){ - Yard::instance('shopping')->setShippingCountryWithPrice(Input::get('selected_country')); + if(Request::get('selected_country')){ + Yard::instance('shopping')->setShippingCountryWithPrice(Request::get('selected_country')); }else{ // $ShippingCountry = ShippingCountry::where('country_id', 1)->first(); // $selected_country = $ShippingCountry->id; @@ -107,7 +107,7 @@ class CheckoutController extends Controller 'accepted_data_checkbox' => 'accepted', ); - if(!Input::get('same_as_billing')){ + if(!Request::get('same_as_billing')){ $rules = array_merge($rules, [ 'shipping_firstname'=>'required', 'shipping_lastname'=>'required', @@ -118,24 +118,26 @@ class CheckoutController extends Controller ]); } - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all()); + return back()->withErrors($validator)->withInput(Request::all()); } - $data = Input::all(); + $data = Request::all(); //make User $shopping_user = $this->makeShoppingUser($data); //make Order and Items $shopping_order = $this->makeShoppingOrder($shopping_user); + //CustomerPriority + CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true); Util::setUserHistoryValue(['status'=>2, 'shopping_order_id'=>$shopping_order->id]); //check credit Card - if(Input::get('payment_method')){ + if(Request::get('payment_method')){ $ret = []; //need precheck the card - if(Input::get('payment_method') === 'cc'){ + if(Request::get('payment_method') === 'cc'){ $pay = new PayoneController(); $pay->init($shopping_user, $shopping_order); $ret['cc'] = $pay->checkCreditCard($data); @@ -151,7 +153,7 @@ class CheckoutController extends Controller \Session::flash('cc-error', 1); \Session::flash('errormessage', $ret['cc']['errormessage']); \Session::flash('customermessage', $ret['cc']['customermessage']); - return redirect(route('checkout.checkout_card'))->withInput(Input::all()); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } if($ret['cc']['status'] === 'VALID'){ /* @@ -163,10 +165,10 @@ class CheckoutController extends Controller } //need precheck the card - if(Input::get('payment_method') === 'elv' && is_null(Input::get('mandate_identification'))){ + if(Request::get('payment_method') === 'elv' && is_null(Request::get('mandate_identification'))){ $pay = new PayoneController(); $pay->init($shopping_user, $shopping_order); - $amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', ',') *100; + $amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', '') *100; $ret['elv'] = $pay->checkBankAccount($data, $amount, 'EUR', $shopping_user); if($ret['elv']['status'] === 'ERROR' || $ret['elv']['status'] === 'INVALID'){ @@ -181,14 +183,14 @@ class CheckoutController extends Controller \Session::flash('elv-error', 1); \Session::flash('errormessage', $ret['elv']['errormessage']); \Session::flash('customermessage', $ret['elv']['customermessage']); - return redirect(route('checkout.checkout_card'))->withInput(Input::all()); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } if($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== "active"){ \Session::flash('elv-managemandate', 1); \Session::flash('elv-mandate_identification', $ret['elv']['mandate_identification']); \Session::flash('elv-mandate_text', $ret['elv']['mandate_text']); \Session::flash('elv-creditor_identifier', $ret['elv']['creditor_identifier']); - return redirect(route('checkout.checkout_card'))->withInput(Input::all()); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); /* * array(4) { ["status"]=> string(5) "VALID" ["pseudocardpan"]=> string(19) "9410010000169020567" ["cardtype"]=> string(1) "V" ["truncatedcardpan"]=> string(16) "411111XXXXXX1111" } @@ -199,9 +201,9 @@ class CheckoutController extends Controller $ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder']; } - if(Input::get('payment_method') === 'elv' && Input::get('mandate_identification')) { - $ret['elv']['mandate_identification'] = Input::get('mandate_identification'); - $ret['elv']['creditor_identifier'] = Input::get('creditor_identifier'); + if(Request::get('payment_method') === 'elv' && Request::get('mandate_identification')) { + $ret['elv']['mandate_identification'] = Request::get('mandate_identification'); + $ret['elv']['creditor_identifier'] = Request::get('creditor_identifier'); $ret['elv']['iban'] = $data['elv_iban']; $ret['elv']['bic'] = $data['elv_bic']; $ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder']; @@ -212,8 +214,8 @@ class CheckoutController extends Controller //other $pay = new PayoneController(); $pay->init($shopping_user, $shopping_order); - $amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', ',') *100; - $reference = $pay->setPrePayment(Input::get('payment_method'), $amount, 'EUR', $ret); + $amount = (int) (float) Yard::instance('shopping')->totalWithShipping(2, '.', '') * 100; + $reference = $pay->setPrePayment(Request::get('payment_method'), $amount, 'EUR', $ret); $this->putPayments('payment_reference', $reference); $pay->setPersonalData(); return $pay->ResponseData(); @@ -297,6 +299,8 @@ class CheckoutController extends Controller private function makeShoppingUser($data){ + $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; + $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; $data['accepted_data_checkbox'] = isset($data['accepted_data_checkbox']) ? true : false; @@ -311,8 +315,6 @@ class CheckoutController extends Controller if(!$shopping_user){ $shopping_user = ShoppingUser::create($data); } - //CustomerPriority - CustomerPriority::checkOne($shopping_user, true); $this->putPayments('shopping_user_id', $shopping_user->id); return $shopping_user; @@ -328,12 +330,12 @@ class CheckoutController extends Controller 'country_id' => Yard::instance('shopping')->getShippingCountryId(), 'user_shop_id' => $user_shop->id, 'payment_for' => Util::getUserPaymentFor(), - 'total' => Yard::instance('shopping')->total(2, '.', ','), + 'total' => Yard::instance('shopping')->total(2, '.', ''), 'shipping' => Yard::instance('shopping')->shipping(2, '.', ','), - 'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ','), + 'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''), 'tax_rate' => Yard::getTaxRate(), - 'tax' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ','), - 'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ','), + 'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''), + 'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''), 'weight' => Yard::instance('shopping')->weight(), 'mode' => Util::getUserShoppingMode(), ]; @@ -353,7 +355,6 @@ class CheckoutController extends Controller $items = Yard::instance('shopping')->content(); - $shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order) { foreach ($items as $item) { if ($model->row_id === $item->rowId) { diff --git a/app/Http/Controllers/Web/ContactController.php b/app/Http/Controllers/Web/ContactController.php index 70dcfd2..d5e1424 100755 --- a/app/Http/Controllers/Web/ContactController.php +++ b/app/Http/Controllers/Web/ContactController.php @@ -6,7 +6,7 @@ namespace App\Http\Controllers\Web; use App\Http\Controllers\Controller; use App\Mail\MailContact; use GuzzleHttp\Client; -use Input; +use Request; use Illuminate\Support\Facades\Mail; use App\Services\Util; use Validator; @@ -54,19 +54,19 @@ class ContactController extends Controller return $this->reCaptcha_validate($attribute, $value, $parameters, $validator); }); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all()); + return back()->withErrors($validator)->withInput(Request::all()); } $contact = []; - $contact['first_name'] = Input::get('first_name'); - $contact['last_name'] = Input::get('last_name'); - $contact['email'] = Input::get('email'); - $contact['phone'] = Input::get('phone'); - $contact['subject'] = Input::get('subject'); - $contact['message'] = Input::get('message'); + $contact['first_name'] = Request::get('first_name'); + $contact['last_name'] = Request::get('last_name'); + $contact['email'] = Request::get('email'); + $contact['phone'] = Request::get('phone'); + $contact['subject'] = Request::get('subject'); + $contact['message'] = Request::get('message'); $checkout_mail = config('app.checkout_mail'); if($user_shop){ diff --git a/app/Http/Controllers/Web/RegisterController.php b/app/Http/Controllers/Web/RegisterController.php index 50a0ddd..b38bf01 100755 --- a/app/Http/Controllers/Web/RegisterController.php +++ b/app/Http/Controllers/Web/RegisterController.php @@ -10,7 +10,7 @@ use App\Repositories\UserRepository; use App\Services\UserService; use App\User; use GuzzleHttp\Client; -use Input; +use Request; use Illuminate\Support\Facades\Mail; use App\Services\Util; use Validator; @@ -82,14 +82,14 @@ class RegisterController extends Controller return $this->reCaptcha_validate($attribute, $value, $parameters, $validator); });*/ - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all()); + return back()->withErrors($validator)->withInput(Request::all()); } $user_shop = Util::getUserShop(); - $data = Input::all(); + $data = Request::all(); $user = $this->userRepo->create($data); $confirmation_code = UserService::createConfirmationCode(); diff --git a/app/Http/Controllers/Web/SiteController.php b/app/Http/Controllers/Web/SiteController.php index aba969a..0b9a2f1 100755 --- a/app/Http/Controllers/Web/SiteController.php +++ b/app/Http/Controllers/Web/SiteController.php @@ -7,7 +7,6 @@ use App\Http\Controllers\Controller; use App\Models\Category; use App\Models\IqSite; use App\Models\Product; -use Input; use App\Services\Util; class SiteController extends Controller diff --git a/app/Http/Controllers/WizardController.php b/app/Http/Controllers/WizardController.php index a14c0ba..f2c967e 100755 --- a/app/Http/Controllers/WizardController.php +++ b/app/Http/Controllers/WizardController.php @@ -14,7 +14,6 @@ use App\User; use Auth; use Hash; use Illuminate\Support\Facades\Mail; -use Input; use Request; use Validator; use Yard; @@ -154,7 +153,7 @@ class WizardController extends Controller 'accepted_active' => 'required', 'accepted_contract' => 'required' ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), @@ -196,7 +195,7 @@ class WizardController extends Controller 'birthday' => 'required', ); - if (!Input::get('same_as_billing')) { + if (!Request::get('same_as_billing')) { $rules = array_merge($rules, [ 'shipping_firstname' => 'required', 'shipping_lastname' => 'required', @@ -207,14 +206,14 @@ class WizardController extends Controller 'shipping_country_id' => 'required|integer|min:1', ]); } - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $user->wizard = 1; $user->save(); - return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Input::all()); + return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Request::all()); } - $data = Input::all(); - $data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1; + $data = Request::all(); + $data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1; $user->account->fill($data)->save(); $user->wizard = 2; $user->save(); @@ -222,13 +221,13 @@ class WizardController extends Controller } if ($step == 2) { - if(Input::get('submit') === 'do'){ + if(Request::get('submit') === 'do'){ if(File::whereUserId($user->id)->whereIdentifier('id_card')->count() == 0){ - $validator = Validator::make(Input::all(), []); + $validator = Validator::make(Request::all(), []); $validator->errors()->add('field', __('Kein Ausweis hinterlegt, bitte erst hochladen.')); $user->wizard = 2; $user->save(); - return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all()); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); } $user->wizard = 3; $user->save(); @@ -238,20 +237,20 @@ class WizardController extends Controller $this->fileRepo->_set('dir', '/'.$user->id.'/verification/'); $this->fileRepo->_set('user_id', $user->id); $this->fileRepo->_set('identifier', 'id_card'); - return $this->fileRepo->uploadFile(Input::all()); + return $this->fileRepo->uploadFile(Request::all()); } if ($step == 3) { - if(Input::get('submit') === 'do'){ + if(Request::get('submit') === 'do'){ $data = Request::all(); if($data['business_license_choose'] === "now"){ if(File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0){ - $validator = Validator::make(Input::all(), []); + $validator = Validator::make(Request::all(), []); $validator->errors()->add('field', __('Kein Gewerbeschein hinterlegt, bitte erst hochladen.')); $user->wizard = 3; $user->save(); - return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all()); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); } } if($data['business_license_choose'] === "later"){ @@ -259,11 +258,11 @@ class WizardController extends Controller } if($data['business_license_choose'] === "non"){ if(!$data['non_business_license_reason'] || $data['non_business_license_reason'] == ""){ - $validator = Validator::make(Input::all(), []); + $validator = Validator::make(Request::all(), []); $validator->errors()->add('field', __('Bitte gib eine Begründung ein, warum Du keinen Gewerbeschein benötigst.')); $user->wizard = 3; $user->save(); - return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all()); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); }else{ $user->account->setNotice('business_license_reason', $data['non_business_license_reason']); } @@ -279,7 +278,7 @@ class WizardController extends Controller $this->fileRepo->_set('dir', '/'.$user->id.'/verification/'); $this->fileRepo->_set('user_id', $user->id); $this->fileRepo->_set('identifier', 'business_license'); - return $this->fileRepo->uploadFile(Input::all()); + return $this->fileRepo->uploadFile(Request::all()); } if ($step == 4) { @@ -316,7 +315,7 @@ class WizardController extends Controller 'accepted_data_protection' => 'required', 'accepted_active' => 'required', ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), @@ -355,7 +354,7 @@ class WizardController extends Controller $rules = array( 'password' => 'required|string|min:6|confirmed', ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), @@ -367,7 +366,7 @@ class WizardController extends Controller } $user->fill([ - 'password' => Hash::make(Input::get('password')) + 'password' => Hash::make(Request::get('password')) ])->save(); $user->wizard = 12; @@ -388,7 +387,7 @@ class WizardController extends Controller 'birthday' => 'required', ); - if(!Input::get('same_as_billing')){ + if(!Request::get('same_as_billing')){ $rules = array_merge($rules, [ 'shipping_firstname'=>'required', 'shipping_lastname'=>'required', @@ -399,13 +398,13 @@ class WizardController extends Controller ]); } - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Input::all()); + return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Request::all()); } - $data = Input::all(); - $data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1; + $data = Request::all(); + $data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1; $user->account->fill($data)->save(); $user->wizard = 13; @@ -423,12 +422,12 @@ class WizardController extends Controller public function storePayment($step = 0){ - if(Input::get('switchers-package-wizard')){ + if(Request::get('switchers-package-wizard')){ $user = User::find(Auth::user()->id); Yard::instance('shopping')->destroy(); - $product = Product::find(Input::get('switchers-package-wizard')); + $product = Product::find(Request::get('switchers-package-wizard')); $showAboOptions = false; - if(Input::get('abo_options')){ + if(Request::get('abo_options')){ $showAboOptions = true; $user->abo_options = true; $user->save(); @@ -443,8 +442,8 @@ class WizardController extends Controller Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]); //set onboarding products - if(Input::get('products_on_board')){ - foreach (Input::get('products_on_board') as $product_on_board_id){ + if(Request::get('products_on_board')){ + foreach (Request::get('products_on_board') as $product_on_board_id){ $product_on_board = Product::find($product_on_board_id); $image = ""; if($product_on_board->images->count()){ diff --git a/app/Imports/ImportCollection.php b/app/Imports/ImportCollection.php new file mode 100644 index 0000000..5d7123b --- /dev/null +++ b/app/Imports/ImportCollection.php @@ -0,0 +1,21 @@ +subject = __('email.checkout_subject')." "; } - if($shopping_order->user_shop){ + /*if($shopping_order->user_shop){ $this->subject .= $shopping_order->user_shop->slug."."; - } + }*/ $this->subject .= "mivita.care"; } diff --git a/app/Mail/MailInfo.php b/app/Mail/MailInfo.php index 2722b1f..cf98a85 100644 --- a/app/Mail/MailInfo.php +++ b/app/Mail/MailInfo.php @@ -13,19 +13,26 @@ class MailInfo extends Mailable protected $user; protected $action; + protected $data; + public $subject; - public function __construct($user, $action) + public function __construct($user, $action, $data = []) { $this->user = $user; $this->action = $action; + $this->data = $data; + if($this->action === "delete_membership"){ $this->subject = 'Mitgliedschaft beenden - beantragt'; } if($this->action === "check_is_like_customer"){ $this->subject = 'Kunden überprüfen - Kundenhoheit'; } + if($this->action === "change_is_like_customer"){ + $this->subject = 'Kunden erneut überprüfen - Kundenhoheit'; + } } @@ -61,7 +68,30 @@ class MailInfo extends Mailable $copy1line = "Hier geht es zum Kunden:"."\n"; $button = "zum Kunden"; $title = "Ein Kunden muss überprüfen werden und einem Berater zugeordnet werden, da die Adresse nicht eindeutig ist."; - $url = route('admin_customer_edit', $this->user->id); + $url = route('admin_customer_detail', $this->user->id); + $content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : ''; + $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." "; + $content .= $this->user->billing_firstname." "; + $content .= $this->user->billing_lastname."\n"; + $content .= $this->user->billing_address; + $content .= $this->user->billing_address_2 ? '/ '.$this->user->billing_address_2."\n" : "\n"; + $content .= $this->user->billing_zipcode." "; + $content .= $this->user->billing_city."\n"; + $content .= $this->user->billing_email."\n"; + $content .= $this->user->billing_phone."\n"; + $content .= $this->user->billing_country->getLocated(); + } + + if($this->action === "change_is_like_customer"){ + $copy1line = "Hier geht es zum Kunden:"."\n"; + $button = "zum Kunden"; + $title = "Ein Kunden muss erneut überprüfen werden, da bei einer Änderung eine bestehende Kundenhoheit gefunden wurde."; + $url = route('admin_customer_detail', $this->user->id); + $content .= "Folgende Daten für die Kundenhoheit wurden geändert:"."\n"; + foreach ($this->data as $key=>$value){ + $content .= $this->user->{$key}." => ".$value."\n"; + } + $content .= "\n"."\n"."Rechnungsadresse des Kunden vor der Änderung:"."\n"; $content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : ''; $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." "; $content .= $this->user->billing_firstname." "; diff --git a/app/Models/Country.php b/app/Models/Country.php index 7b57e7b..f398114 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -42,17 +42,46 @@ use PHPUnit\Framework\Constraint\Count; * @property array|null $attr * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereAttr($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTransName($value) + * @property bool|null $switch + * @property bool|null $own_eur + * @property bool|null $currency + * @property string|null $currency_unit + * @property bool|null $currency_calc + * @property float|null $currency_faktor + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrency($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyCalc($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyFaktor($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyName($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereOwnEur($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereSwitch($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices + * @property-read int|null $country_prices_count + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCurrencyUnit($value) */ class Country extends Model { protected $table = 'countries'; - protected $casts = ['trans_name' => 'array', 'attr' => 'array']; + protected $casts = [ + 'switch' => 'bool', + 'own_eur' => 'bool', + 'currency' => 'bool', + 'currency_calc' => 'bool', + 'trans_name' => 'array', + 'attr' => 'array' + ]; protected $fillable = [ - 'code', 'phone', 'en', 'de', 'es', 'fr', 'it', 'ru', 'active', 'trans_name', 'attr' + 'code', 'phone', 'en', 'de', 'es', 'fr', 'it', 'ru', + 'switch', 'own_eur', 'currency', 'currency_unit', 'currency_calc', 'currency_faktor', + 'active', 'trans_name', 'attr', ]; + public function country_prices() + { + return $this->hasMany(CountryPrice::class, 'country_id'); + } + public function getLocated($lang = false){ if(!$lang){ @@ -115,6 +144,17 @@ class Country extends Model return null; } + public static function getCountryIdByCodeOrOne($code){ + if($code == null){ + return 1; + } + $r = Country::where('code', '=', $code)->first(); + if($r){ + return $r->id; + } + return 1; + } + public static function getCountryIdByPhone($phone){ if($phone == null){ return null; diff --git a/app/Models/CountryPrice.php b/app/Models/CountryPrice.php new file mode 100644 index 0000000..1354071 --- /dev/null +++ b/app/Models/CountryPrice.php @@ -0,0 +1,73 @@ + 'int', + 'product_id' => 'int', + 'c_price' => 'float', + 'c_tax' => 'float', + 'c_price_old' => 'float', + 'c_currency' => 'float' + ]; + + protected $fillable = [ + 'country_id', + 'product_id', + 'c_price', + 'c_tax', + 'c_price_old', + 'c_currency' + ]; + + public function country() + { + return $this->belongsTo(Country::class); + } + + public function product() + { + return $this->belongsTo(Product::class); + } +} diff --git a/app/Models/Import.php b/app/Models/Import.php new file mode 100644 index 0000000..d3a6f16 --- /dev/null +++ b/app/Models/Import.php @@ -0,0 +1,66 @@ + 'required|mimes:xls,xlsx' + ]; + + public static $messages = [ + 'file.mimes' => 'Datei ist kein Excel Format', + 'file.required' => 'Excel is required' + ]; + + protected static $row = []; + + public static function setRow($row){ + + // self::checkTime(); + self::$row[] = $row; + } + + + public static function checkTime(){ + + if(round((microtime(true) - self::$start), 2) > 29){ + echo 'Total execution time in seconds: ' . round((microtime(true) - self::$start), 2); + die(); + return true; + } + return false; + } + + public static function countRows(){ + return count(self::$row); + } + + + public static function break(){ + echo count(self::$row)."
"; + echo 'Total execution time in seconds: ' . round((microtime(true) - self::$start), 2); + die(); + + } + + + + +} diff --git a/app/Models/PaymentTransaction.php b/app/Models/PaymentTransaction.php index 61601ab..e0a0f87 100644 --- a/app/Models/PaymentTransaction.php +++ b/app/Models/PaymentTransaction.php @@ -40,6 +40,8 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUserid($value) * @mixin \Eloquent + * @property string|null $mode + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereMode($value) */ class PaymentTransaction extends Model { diff --git a/app/Models/Product.php b/app/Models/Product.php index 780bcce..a264ee1 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -95,6 +95,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereIdentifier($value) * @property int|null $upgrade_to_id * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUpgradeToId($value) + * @property int|null $contents_total + * @property int|null $unit + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereContentsTotal($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUnit($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CountryPrice[] $country_prices + * @property-read int|null $country_prices_count + * @property int|null $wp_number + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereWpNumber($value) */ class Product extends Model { @@ -115,7 +123,8 @@ class Product extends Model 'trans_description' => 'array', 'trans_usage' => 'array', 'trans_ingredients' => 'array', - 'action' => 'array' + 'action' => 'array', + 'wp_number' => 'int' ]; use Sluggable; @@ -137,6 +146,7 @@ class Product extends Model 'contents_total', 'unit', 'number', + 'wp_number', 'icons', 'description', 'usage', @@ -209,6 +219,10 @@ class Product extends Model return $this->hasMany('App\Models\ProductImage', 'product_id', 'id')->where('active', true)->orderBy('pos'); } + public function country_prices() + { + return $this->hasMany(CountryPrice::class, 'product_id'); + } public function getActionName($id = 0){ if(isset($this->actions[$id])){ @@ -330,4 +344,30 @@ class Product extends Model } return rtrim($ret, ', '); } + + public function getCountryPrice($country_id){ + return $this->country_prices->where('country_id', '=', $country_id)->first() ?: new CountryPrice(); + } + + public function getCPrice($country_id){ + return $this->getCountryPrice($country_id)->c_price; + } + public function getCTax($country_id){ + return $this->getCountryPrice($country_id)->c_tax; + } + public function getCPriceOld($country_id){ + return $this->getCountryPrice($country_id)->c_price_old; + } + public function getCCurrency($country_id){ + return $this->getCountryPrice($country_id)->c_currency; + } + + public function getRealPrice(Country $country){ + if($country->own_eur && $this->getCPrice($country->id)){ + return $this->getCPrice($country->id); + } + return $this->price; + } + + } diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php index 872d6dd..59889d4 100644 --- a/app/Models/ShoppingOrder.php +++ b/app/Models/ShoppingOrder.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\ShoppingOrder @@ -53,11 +54,27 @@ use Illuminate\Database\Eloquent\Model; * @mixin \Eloquent * @property int|null $payment_for * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaymentFor($value) + * @property int|null $member_id + * @property string|null $mode + * @property-read \App\User|null $member + * @property-read \App\Models\UserHistory|null $user_history + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMemberId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMode($value) + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property string|null $user_deleted_at + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withoutTrashed() */ class ShoppingOrder extends Model { protected $table = 'shopping_orders'; + use SoftDeletes; + protected $dates = ['deleted_at']; + protected $fillable = [ 'shopping_user_id', 'auth_user_id', @@ -71,6 +88,8 @@ class ShoppingOrder extends Model 'tax', 'total_shipping', 'weight', + 'paid', + 'txaction', 'mode', ]; @@ -82,7 +101,12 @@ class ShoppingOrder extends Model public function country() { - return $this->belongsTo('App\Models\Country','country_id'); + return $this->belongsTo('App\Models\Sh','country_id'); + } + + public function shipping_country() + { + return $this->belongsTo('App\Models\ShippingCountry','country_id'); } public function user_shop() diff --git a/app/Models/ShoppingOrderItem.php b/app/Models/ShoppingOrderItem.php index ad85ae7..4adc4e4 100644 --- a/app/Models/ShoppingOrderItem.php +++ b/app/Models/ShoppingOrderItem.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\ShoppingOrderItem @@ -36,6 +37,9 @@ class ShoppingOrderItem extends Model { protected $table = 'shopping_order_items'; + use SoftDeletes; + protected $dates = ['deleted_at']; + protected $fillable = [ 'shopping_order_id', 'row_id', diff --git a/app/Models/ShoppingPayment.php b/app/Models/ShoppingPayment.php index 2384248..1df1eef 100644 --- a/app/Models/ShoppingPayment.php +++ b/app/Models/ShoppingPayment.php @@ -39,6 +39,8 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereWallettype($value) * @mixin \Eloquent + * @property string|null $mode + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereMode($value) */ class ShoppingPayment extends Model { diff --git a/app/Models/ShoppingUser.php b/app/Models/ShoppingUser.php index d692325..e31182a 100644 --- a/app/Models/ShoppingUser.php +++ b/app/Models/ShoppingUser.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\ShoppingUser @@ -75,11 +76,39 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value) * @property int|null $abo_options * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereAboOptions($value) + * @property int|null $member_id + * @property int|null $number + * @property bool $is_like + * @property array|null $notice + * @property-read \App\User|null $auth_user + * @property-read \App\User|null $member + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereIsLike($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereMemberId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNotice($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereNumber($value) + * @property bool|null $has_buyed + * @property bool|null $subscribed + * @property int|null $wp_order_number + * @property string|null $wp_order_date + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereHasBuyed($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereSubscribed($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderDate($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereWpOrderNumber($value) + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property string|null $user_deleted_at + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUserDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withTrashed() + * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingUser withoutTrashed() */ class ShoppingUser extends Model { protected $table = 'shopping_users'; + use SoftDeletes; + protected $dates = ['deleted_at']; + protected $fillable = [ @@ -110,7 +139,12 @@ class ShoppingUser extends Model 'shipping_city', 'shipping_country_id', 'shipping_phone', + 'has_buyed', + 'subscribed', 'notice', + 'mode', + 'wp_order_number', + 'wp_order_date', ]; protected $casts = [ @@ -118,6 +152,9 @@ class ShoppingUser extends Model 'is_like' => 'bool', 'accepted_data_checkbox' => 'bool', 'same_as_billing' => 'bool', + 'has_buyed' => 'bool', + 'subscribed' => 'bool', + 'wp_order_number' => 'int', ]; //can null @@ -168,4 +205,23 @@ class ShoppingUser extends Model $this->notice = $notice; $this->save(); } + + public function firstEntryByNumber(){ + + if($this->number>0){ + if($shopping_user = ShoppingUser::where('number', $this->number)->orderBy('created_at', 'ASC')->first()){ + return $shopping_user; + } + } + return $this; + } + public function lastEntryByNumber(){ + + if($this->number>0){ + if($shopping_user = ShoppingUser::where('number', $this->number)->orderBy('created_at', 'DESC')->first()){ + return $shopping_user; + } + } + return $this; + } } \ No newline at end of file diff --git a/app/Models/UserAccount.php b/app/Models/UserAccount.php index 8d0bc08..3f688b6 100644 --- a/app/Models/UserAccount.php +++ b/app/Models/UserAccount.php @@ -115,6 +115,10 @@ use Carbon\Carbon; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value) * @property array|null $payment_data * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePaymentData($value) + * @property string|null $accepted_contract + * @property array|null $notice + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAcceptedContract($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereNotice($value) */ class UserAccount extends Model { diff --git a/app/Models/UserHistory.php b/app/Models/UserHistory.php index e85364f..6019ae8 100644 --- a/app/Models/UserHistory.php +++ b/app/Models/UserHistory.php @@ -41,6 +41,8 @@ use App\User; * @mixin \Eloquent * @property string|null $identifier * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereIdentifier($value) + * @property int|null $abo_options + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAboOptions($value) */ class UserHistory extends Model { diff --git a/app/Models/UserMessage.php b/app/Models/UserMessage.php index f23645d..f9f71c2 100644 --- a/app/Models/UserMessage.php +++ b/app/Models/UserMessage.php @@ -6,12 +6,13 @@ namespace App\Models; +use App\User; use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; /** * Class UserMessage - * + * * @property int $id * @property int $user_id * @property int $send_user_id @@ -26,10 +27,26 @@ use Illuminate\Database\Eloquent\Model; * @property Carbon $delivered_at * @property Carbon $created_at * @property Carbon $updated_at - * * @property User $user - * * @package App\Models + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage query() + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereDeliveredAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereEmail($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereError($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereFail($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereMessage($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereScheduledAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSend($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSendUserId($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSentAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereSubject($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserMessage whereUserId($value) + * @mixin \Eloquent */ class UserMessage extends Model { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 9784b1a..888f4cb 100755 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -4,6 +4,7 @@ namespace App\Providers; use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Laravel\Passport\Passport; class AuthServiceProvider extends ServiceProvider { @@ -24,6 +25,7 @@ class AuthServiceProvider extends ServiceProvider public function boot() { $this->registerPolicies(); + Passport::routes(); // } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 205dd59..9883ffb 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -23,8 +23,6 @@ class RouteServiceProvider extends ServiceProvider */ public function boot() { - // - parent::boot(); } diff --git a/app/Repositories/FileRepository.php b/app/Repositories/FileRepository.php index 399eac9..9ced418 100644 --- a/app/Repositories/FileRepository.php +++ b/app/Repositories/FileRepository.php @@ -38,12 +38,6 @@ class FileRepository extends BaseRepository { $this->{$name} = $value; } - /* public function load($id){ - $this->model = $id; - } - */ - - public function uploadFile( $form_data ) { @@ -106,7 +100,7 @@ class FileRepository extends BaseRepository { 'network_name' => 'required|max:255', 'input_file_now' => 'required|mimes:png,pdf,jpg,jpeg|max:30000' ); - $validator = Validator::make(Input::all(), $rules); + $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { // get the error messages from the validator diff --git a/app/Repositories/ImportRepository.php b/app/Repositories/ImportRepository.php new file mode 100644 index 0000000..097ab75 --- /dev/null +++ b/app/Repositories/ImportRepository.php @@ -0,0 +1,156 @@ +fails()) { + + return Response::json([ + 'error' => true, + 'message' => $validator->messages()->first(), + 'code' => 400 + ], 400); + + } + $file = $form_data['file']; + + $originalName = $file->getClientOriginalName(); + $extension = $file->getClientOriginalExtension(); + $originalNameWithoutExt = substr($originalName, 0, strlen($originalName) - strlen($extension) - 1); + + $filename = $this->sanitize($originalNameWithoutExt); + $allowed_filename = $filename.".".$extension; + + Storage::disk('import')->put($allowed_filename, file_get_contents($file->getRealPath())); + + + return Response::json([ + 'error' => false, + 'filename' => $allowed_filename, + 'filedata' => 'xls', + 'redirect' => url(route('sysadmin_import_show', ['xls', $allowed_filename])), + 'code' => 200 + ], 200); + } + + public function read($type, $file, $skip, $limit) + { + + if(!Storage::disk('import')->has($file)){ + return false; + } + return $this->import(storage_path("app/import/").$file, $file, $skip, $limit); + + + } + + protected function import($file_path, $file, $skip, $limit){ + + $salutation = array(1 => 'mr', 2 => 'ms', 3=>null); + + $ret = [ + 'count' => 0, + 'not' => 0, + 'imported' => [], + 'has_imported' => [], + ]; + /* + * wp_order_number + wp_order_date + billing_company + billing_salutation + billing_firstname + billing_lastname + billing_address + billing_address_2 + billing_zipcode + billing_city + billing_country_code + billing_country + billing_email + billing_phone + shipping_salutation + shipping_company + shipping_firstname + shipping_lastname + shipping_address + shipping_address_2 + shipping_zipcode + shipping_city + shipping_country_code + shipping_country + */ + + + $rows = Excel::toArray(new \App\Imports\ImportCollection(), $file_path); + + foreach ($rows[0] as $row){ + $ret['count']++; + if(isset($row['billing_email'])){ + if(ShoppingUser::where('billing_email', '=', $row['billing_email'])->count() > 0){ + $ssuser = ShoppingUser::where('billing_email', '=', $row['billing_email'])->first(); + if($ssuser->member_id){ + $ret['has_imported'][] = $row['billing_email']." - ".$ssuser->member->email; + continue; + } + } + $row['billing_salutation'] = $salutation[$row['billing_salutation']]; + $row['billing_country_id'] = Country::getCountryIdByCodeOrOne($row['billing_country_code']); + $row['billing_phone'] = strlen($row['billing_phone']) <= 3 ? '' : $row['billing_phone']; + $row['same_as_billing'] = true; + if(isset($row['shipping_salutation']) && $row['shipping_salutation'] > 0){ + $row['shipping_salutation'] = $salutation[$row['shipping_salutation']]; + $row['shipping_country_id'] = Country::getCountryIdByCodeOrOne($row['shipping_country_code']); + $row['same_as_billing'] = false; + } + $row['member_id'] = 3; + $row['number'] = ShoppingUser::max('number') + 1; + $row['has_buyed'] = true; + $row['subscribed'] = false; + $ret['imported'][] = $row['billing_email']; + + ShoppingUser::create($row); + }else{ + $ret['not']++; + } + + } + return $ret; + } + + public function sanitize($string, $force_lowercase = true, $anal = false) + { + $strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]", + "}", "\\", "|", ";", ":", "\"", "'", "‘", "’", "“", "”", "–", "—", + "—", "–", ",", "<", ".", ">", "/", "?"); + $clean = trim(str_replace($strip, "", strip_tags($string))); + $clean = preg_replace('/\s+/', "-", $clean); + $clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ; + + return ($force_lowercase) ? + (function_exists('mb_strtolower')) ? + mb_strtolower($clean, 'UTF-8') : + strtolower($clean) : + $clean; + } + +} \ No newline at end of file diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index 9aaf82b..bab0282 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -4,6 +4,7 @@ namespace App\Repositories; +use App\Models\CountryPrice; use App\Models\Product; use App\Models\ProductAttribute; use App\Models\ProductCategory; @@ -38,6 +39,8 @@ class ProductRepository extends BaseRepository { $this->updateCategories(isset($data['categories']) ? $data['categories'] : array()); $this->updateAttributes(isset($data['attributes']) ? $data['attributes'] : array()); + $this->updateCountryPrices($data); + return $this->model; } @@ -84,6 +87,30 @@ class ProductRepository extends BaseRepository { return true; } + public function updateCountryPrices($data) + { + if(!isset($data['country_prices']) || !is_array($data['country_prices'])){ + return false; + } + foreach ($data['country_prices'] as $k => $country_id) { + $cp = CountryPrice::updateOrCreate([ + 'country_id' => $country_id, + 'product_id' => $this->model->id, + ], + [ + 'c_price' => isset($data['c_price'][$country_id]) ? reFormatNumber($data['c_price'][$country_id]) : null, + 'c_tax' => isset($data['c_tax'][$country_id]) ? reFormatNumber($data['c_tax'][$country_id]) : null, + 'c_price_old' => isset($data['c_price_old'][$country_id]) ? reFormatNumber($data['c_price_old'][$country_id]) : null, + 'c_currency' => isset($data['c_currency'][$country_id]) ? reFormatNumber($data['c_currency'][$country_id]) : null, + ]); + + } + + + + return true; + } + public function copy($model) { diff --git a/app/Services/CustomerPriority.php b/app/Services/CustomerPriority.php index 4de4bce..d042a8e 100644 --- a/app/Services/CustomerPriority.php +++ b/app/Services/CustomerPriority.php @@ -29,7 +29,7 @@ class CustomerPriority return $shopping_users; } - public static function checkOne($shopping_user, $mail=false){ + public static function checkOne($shopping_user, $mail=false, $newCustomer = true){ //look for entry if(self::entryExists($shopping_user)){ return 'exists'; @@ -40,16 +40,23 @@ class CustomerPriority } return 'like'; } - self::newCustomer($shopping_user); - return 'update'; + if($newCustomer){ + self::newCustomer($shopping_user); + } + return 'new'; } - public static function setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail) + public static function setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user=false) { if ($shopping_user->id === $set_like_shopping_user->id) { //set new customer for shopping_user - self::newCustomer($shopping_user); + if($change_shopping_user){ + self::newCustomerNumber($shopping_user); + $send_member_mail = false; + }else{ + self::newCustomer($shopping_user); + } } else { //set existing customer for shopping_user self::existingCustomer($shopping_user, $set_like_shopping_user); @@ -104,6 +111,71 @@ class CustomerPriority } } + public static function checkChangeOne($shopping_user, $data, $mail=false){ + + $matches = []; + $change = []; + $ret = 'update'; + //email geändert + if(isset($data['billing_email']) && $shopping_user->billing_email != $data['billing_email']){ + $found = ShoppingUser::where('auth_user_id', '=', NULL) + ->where('number', '!=', NULL) //has number + ->where('id', '!=', $shopping_user->id) + ->where('billing_email', '=', $data['billing_email']) + ->get()->pluck('number', 'id')->unique()->toArray(); + if($found && count($found)){ + foreach ($found as $key=>$val){ + $matches[$key] = $val; + } + $ret = 'exists'; + $change['billing_email'] = $data['billing_email']; + } + } + //Anschrift geändert + if(isset($data['billing_lastname']) && isset($data['billing_zipcode']) && ($shopping_user->billing_lastname != $data['billing_lastname'] || $shopping_user->billing_zipcode != $data['billing_zipcode'])){ + $found = ShoppingUser::select('*') + ->where('auth_user_id', '=', NULL) + ->where('number', '!=', NULL) //has number + ->where('id', '!=', $shopping_user->id) + ->where('billing_lastname', '=', $data['billing_lastname']) + ->where('billing_zipcode', '=', $data['billing_zipcode']) + ->get()->pluck('number', 'id')->unique()->toArray(); + if($found && count($found)){ + foreach ($found as $key=>$val){ + $matches[$key] = $val; + } + $ret = 'like'; + $change['billing_lastname'] = $data['billing_lastname']; + $change['billing_zipcode'] = $data['billing_zipcode']; + } + } + if($matches){ + $shopping_user->is_like = true; + $shopping_user->setNotice(self::$user_notice_key, $matches); + $shopping_user->save(); + } + //look for entry + if($matches && $mail){ //send mail + Mail::to(config('app.info_mail'))->send(new MailInfo($shopping_user, 'change_is_like_customer', $change)); + } + + return $ret; + + } + + public static function checkNewOne($shopping_user, $mail=false){ + + if(self::entryLike($shopping_user)){ + if($mail){ //send mail + Mail::to(config('app.info_mail'))->send(new MailInfo($shopping_user, 'check_is_like_customer')); + } + //return 'like'; + } + $shopping_user->number = self::nextNumber(); + $shopping_user->save(); + return true; + } + private static function entryExists($shopping_user){ //check same email $matches = ShoppingUser::where('auth_user_id', '=', NULL) @@ -155,8 +227,16 @@ class CustomerPriority } } - private static function changeCustomer($shopping_user, $member_id, $number){ + private static function newCustomerNumber($shopping_user) + { + \App\Services\Shop::newUserOrder($shopping_user->number); + $shopping_user->number = self::nextNumber(); + $shopping_user->save(); + \App\Services\Shop::newUserOrder($shopping_user->number); + } + + private static function changeCustomer($shopping_user, $member_id, $number){ $old_number = $shopping_user->number; $shopping_user->member_id = $member_id; $shopping_user->number = $number; @@ -167,12 +247,10 @@ class CustomerPriority } \App\Services\Shop::newUserOrder($old_number); \App\Services\Shop::newUserOrder($number); - } private static function existingCustomer($shopping_user, $set_like_shopping_user){ $old_number = $shopping_user->number; - $shopping_user->member_id = $set_like_shopping_user->member_id; $shopping_user->number = $set_like_shopping_user->number; $shopping_user->save(); diff --git a/app/Services/Payment.php b/app/Services/Payment.php index 733db30..339cd4f 100644 --- a/app/Services/Payment.php +++ b/app/Services/Payment.php @@ -13,6 +13,7 @@ class Payment 'paid' => "bezahlt", 'appointed' => "offen", 'failed' => "abbruch", + 'extern' => "extern", 'NULL' => 'keine Zahlung', ]; @@ -20,6 +21,7 @@ class Payment 'paid' => "success", 'appointed' => "warning", 'failed' => "danger", + 'extern' => "success", ]; @@ -41,6 +43,9 @@ class Payment if($shopping_order->mode === 'test'){ return ''.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).''; } + if($shopping_order->mode === 'dev'){ + return ''.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).''; + } return ''.self::getFormattedTxaction($shopping_order->txaction).''; } diff --git a/app/Services/Shop.php b/app/Services/Shop.php index 579da65..7dac7d3 100644 --- a/app/Services/Shop.php +++ b/app/Services/Shop.php @@ -8,7 +8,7 @@ class Shop { public static function userOrders() { $shopping_users = ShoppingUser::whereHas('shopping_order', function($q) { - $q->where('txaction', 'paid')->OrWhere('txaction', 'appointed'); + $q->where('txaction', 'paid')->OrWhere('txaction', 'appointed')->OrWhere('txaction', 'extern'); })->where('orders', '=', NULL)->get(); foreach ($shopping_users as $shopping_user) { if ($shopping_user->number) { @@ -24,17 +24,19 @@ class Shop } public static function newUserOrder($number){ - $shopping_users = ShoppingUser::where('number', '=', $number)->get(); - $orders = 1; - foreach ($shopping_users as $shopping_user) { - if($shopping_user->shopping_order && ($shopping_user->shopping_order->txaction === 'paid' || $shopping_user->shopping_order->txaction === 'appointed')){ - $shopping_user->orders = $orders++; + if($number > 0){ + $shopping_users = ShoppingUser::where('number', '=', $number)->get(); + $orders = 1; + foreach ($shopping_users as $shopping_user) { + if($shopping_user->shopping_order && ($shopping_user->shopping_order->txaction === 'paid' || $shopping_user->shopping_order->txaction === 'appointed' || $shopping_user->shopping_order->txaction === 'extern')){ + $shopping_user->orders = $orders++; + + }else{ + $shopping_user->orders = NULL; + } + $shopping_user->save(); - }else{ - $shopping_user->orders = NULL; } - $shopping_user->save(); - } } } \ No newline at end of file diff --git a/app/Services/Util.php b/app/Services/Util.php index bd5ec59..2e2df87 100644 --- a/app/Services/Util.php +++ b/app/Services/Util.php @@ -37,11 +37,20 @@ class Util return 'd.m.Y - H:i'; } - public static function formatNumber($value){ + public static function _format_number($value){ + return preg_replace("/[^0-9,]/", "", $value); + + } + + public static function reFormatNumber($value){ + return (float) str_replace(',', '.', self::_format_number($value)); + } + + public static function formatNumber($value, $dec=2){ if(\App::getLocale() === "en"){ - return number_format($value, 2, '.', ','); + return number_format($value, $dec, '.', ','); } - return number_format($value, 2, ',', '.'); + return number_format($value, $dec, ',', '.'); } public static function utf8ize( $mixed ) { diff --git a/app/Services/Yard.php b/app/Services/Yard.php index 3beaaeb..7d71204 100644 --- a/app/Services/Yard.php +++ b/app/Services/Yard.php @@ -183,7 +183,7 @@ class Yard extends Cart public function subtotalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) { $taxRate =config('cart.tax'); - $total = floatval($this->total(2, '.', '')) + $this->shipping; + $total = (float) ($this->total(2, '.', '')) + $this->shipping; $totalTax = $total/ (100 + $taxRate) * $taxRate; return $this->numberFormat(($total - $totalTax), $decimals, $decimalPoint, $thousandSeperator); } @@ -192,7 +192,7 @@ class Yard extends Cart public function taxWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) { $taxRate =config('cart.tax'); - $total = floatval($this->total(2, '.', '')) + $this->shipping; + $total = (float) ($this->total(2, '.', '')) + $this->shipping; $totalTax = $total/ (100 + $taxRate) * $taxRate; return $this->numberFormat($totalTax, $decimals, $decimalPoint, $thousandSeperator); } @@ -200,7 +200,7 @@ class Yard extends Cart public function totalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null) { - $total = floatval($this->total(2, '.', '')) + $this->shipping; + $total = (float) ($this->total(2, '.', '')) + $this->shipping; return $this->numberFormat($total, $decimals, $decimalPoint, $thousandSeperator); } diff --git a/app/User.php b/app/User.php index c866b2d..cc17ec7 100755 --- a/app/User.php +++ b/app/User.php @@ -8,7 +8,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Support\Facades\Mail; use App\Mail\MailResetPassword; use Illuminate\Database\Eloquent\SoftDeletes; - +use Laravel\Passport\HasApiTokens; /** * App\User @@ -99,10 +99,23 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereReleaseAccount($value) * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\UserHistory[] $user_histories * @property-read int|null $user_histories_count + * @property int|null $test_mode + * @property array|null $settings + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $member_shopping_orders + * @property-read int|null $member_shopping_orders_count + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingUser[] $member_shopping_users + * @property-read int|null $member_shopping_users_count + * @property-read \App\Models\Product|null $payment_order_product + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereSettings($value) + * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTestMode($value) + * @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Client[] $clients + * @property-read int|null $clients_count + * @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Passport\Token[] $tokens + * @property-read int|null $tokens_count */ class User extends Authenticatable { - use Notifiable; + use Notifiable, HasApiTokens; use SoftDeletes; protected $dates = ['deleted_at']; @@ -242,6 +255,17 @@ class User extends Authenticatable return false; } + /** + * @return bool + */ + public function isApiUser() + { + if($this->admin >= 4){ + return true; + } + return false; + } + /** * @return bool */ diff --git a/app/helpers.php b/app/helpers.php index 0a0c6c2..1dfeead 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -41,4 +41,31 @@ if (! function_exists('set_user_attr')) { } return null; } -} \ No newline at end of file +} + +if (! function_exists('get_active_badge')) { + function get_active_badge($active, $tooltip = false, $pos = "top") + { + if($tooltip){ + $tooltip = 'data-toggle="tooltip" data-placement="top" data-original-title="'.$tooltip.'"'; + } + return $active ? '' : ''; + } +} + + +if (! function_exists('formatNumber')) { + function formatNumber($number, $dec=2) + { + return !$number ? $number : Util::formatNumber($number, $dec); + } +} + +if (! function_exists('reFormatNumber')) { + function reFormatNumber($number) + { + return !$number ? $number : Util::reFormatNumber($number); + } +} + + diff --git a/archiv.tar b/archiv.tar new file mode 100644 index 0000000..c64000a Binary files /dev/null and b/archiv.tar differ diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php old mode 100644 new mode 100755 index 8039db4..119a01d --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -6,6 +6,28 @@ 0 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider', ), ), + 'barryvdh/laravel-debugbar' => + array ( + 'providers' => + array ( + 0 => 'Barryvdh\\Debugbar\\ServiceProvider', + ), + 'aliases' => + array ( + 'Debugbar' => 'Barryvdh\\Debugbar\\Facade', + ), + ), + 'barryvdh/laravel-dompdf' => + array ( + 'providers' => + array ( + 0 => 'Barryvdh\\DomPDF\\ServiceProvider', + ), + 'aliases' => + array ( + 'PDF' => 'Barryvdh\\DomPDF\\Facade', + ), + ), 'barryvdh/laravel-ide-helper' => array ( 'providers' => @@ -27,17 +49,6 @@ 0 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', ), ), - 'gloudemans/shoppingcart' => - array ( - 'providers' => - array ( - 0 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', - ), - 'aliases' => - array ( - 'Cart' => 'Gloudemans\\Shoppingcart\\Facades\\Cart', - ), - ), 'intervention/image' => array ( 'providers' => @@ -71,6 +82,13 @@ 'Flash' => 'Laracasts\\Flash\\Flash', ), ), + 'laravel/passport' => + array ( + 'providers' => + array ( + 0 => 'Laravel\\Passport\\PassportServiceProvider', + ), + ), 'laravel/tinker' => array ( 'providers' => @@ -101,6 +119,13 @@ 'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel', ), ), + 'nesbot/carbon' => + array ( + 'providers' => + array ( + 0 => 'Carbon\\Laravel\\ServiceProvider', + ), + ), 'nunomaduro/collision' => array ( 'providers' => @@ -108,6 +133,17 @@ 0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', ), ), + 'olimortimer/laravelshoppingcart' => + array ( + 'providers' => + array ( + 0 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', + ), + 'aliases' => + array ( + 'Cart' => 'Gloudemans\\Shoppingcart\\Facades\\Cart', + ), + ), 'reliese/laravel' => array ( 'providers' => diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php old mode 100644 new mode 100755 index 840a234..ac0f657 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -24,32 +24,36 @@ 20 => 'Illuminate\\Validation\\ValidationServiceProvider', 21 => 'Illuminate\\View\\ViewServiceProvider', 22 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider', - 23 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 24 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', - 26 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', - 27 => 'Intervention\\Image\\ImageServiceProvider', - 28 => 'Jenssegers\\Date\\DateServiceProvider', - 29 => 'Laracasts\\Flash\\FlashServiceProvider', - 30 => 'Laravel\\Tinker\\TinkerServiceProvider', - 31 => 'Collective\\Html\\HtmlServiceProvider', - 32 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 33 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 34 => 'Reliese\\Coders\\CodersServiceProvider', - 35 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 36 => 'Reliese\\Coders\\CodersServiceProvider', - 37 => 'Laravel\\Tinker\\TinkerServiceProvider', - 38 => 'App\\Providers\\AppServiceProvider', - 39 => 'App\\Providers\\AuthServiceProvider', - 40 => 'App\\Providers\\EventServiceProvider', - 41 => 'App\\Providers\\RouteServiceProvider', - 42 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 43 => 'Jenssegers\\Date\\DateServiceProvider', - 44 => 'Collective\\Html\\HtmlServiceProvider', - 45 => 'Intervention\\Image\\ImageServiceProvider', - 46 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 47 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 48 => 'App\\Providers\\YardServiceProvider', + 23 => 'Barryvdh\\Debugbar\\ServiceProvider', + 24 => 'Barryvdh\\DomPDF\\ServiceProvider', + 25 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 26 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', + 27 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', + 28 => 'Intervention\\Image\\ImageServiceProvider', + 29 => 'Jenssegers\\Date\\DateServiceProvider', + 30 => 'Laracasts\\Flash\\FlashServiceProvider', + 31 => 'Laravel\\Passport\\PassportServiceProvider', + 32 => 'Laravel\\Tinker\\TinkerServiceProvider', + 33 => 'Collective\\Html\\HtmlServiceProvider', + 34 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 35 => 'Carbon\\Laravel\\ServiceProvider', + 36 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 37 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', + 38 => 'Reliese\\Coders\\CodersServiceProvider', + 39 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 40 => 'Reliese\\Coders\\CodersServiceProvider', + 41 => 'Laravel\\Tinker\\TinkerServiceProvider', + 42 => 'App\\Providers\\AppServiceProvider', + 43 => 'App\\Providers\\AuthServiceProvider', + 44 => 'App\\Providers\\EventServiceProvider', + 45 => 'App\\Providers\\RouteServiceProvider', + 46 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 47 => 'Jenssegers\\Date\\DateServiceProvider', + 48 => 'Collective\\Html\\HtmlServiceProvider', + 49 => 'Intervention\\Image\\ImageServiceProvider', + 50 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 51 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 52 => 'App\\Providers\\YardServiceProvider', ), 'eager' => array ( @@ -64,23 +68,32 @@ 8 => 'Illuminate\\Session\\SessionServiceProvider', 9 => 'Illuminate\\View\\ViewServiceProvider', 10 => 'Askedio\\Laravel5ProfanityFilter\\Providers\\ProfanityFilterServiceProvider', - 11 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', - 13 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', - 14 => 'Intervention\\Image\\ImageServiceProvider', - 15 => 'Jenssegers\\Date\\DateServiceProvider', - 16 => 'Laracasts\\Flash\\FlashServiceProvider', - 17 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 18 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 19 => 'App\\Providers\\AppServiceProvider', - 20 => 'App\\Providers\\AuthServiceProvider', - 21 => 'App\\Providers\\EventServiceProvider', - 22 => 'App\\Providers\\RouteServiceProvider', - 23 => 'Jenssegers\\Date\\DateServiceProvider', - 24 => 'Intervention\\Image\\ImageServiceProvider', - 25 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 26 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 27 => 'App\\Providers\\YardServiceProvider', + 11 => 'Barryvdh\\Debugbar\\ServiceProvider', + 12 => 'Barryvdh\\DomPDF\\ServiceProvider', + 13 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 14 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', + 15 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider', + 16 => 'Intervention\\Image\\ImageServiceProvider', + 17 => 'Jenssegers\\Date\\DateServiceProvider', + 18 => 'Laracasts\\Flash\\FlashServiceProvider', + 19 => 'Laravel\\Passport\\PassportServiceProvider', + 20 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 21 => 'Carbon\\Laravel\\ServiceProvider', + 22 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 23 => 'Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider', + 24 => 'Reliese\\Coders\\CodersServiceProvider', + 25 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 26 => 'Reliese\\Coders\\CodersServiceProvider', + 27 => 'App\\Providers\\AppServiceProvider', + 28 => 'App\\Providers\\AuthServiceProvider', + 29 => 'App\\Providers\\EventServiceProvider', + 30 => 'App\\Providers\\RouteServiceProvider', + 31 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 32 => 'Jenssegers\\Date\\DateServiceProvider', + 33 => 'Intervention\\Image\\ImageServiceProvider', + 34 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 35 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 36 => 'App\\Providers\\YardServiceProvider', ), 'deferred' => array ( @@ -92,6 +105,7 @@ 'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider', 'cache' => 'Illuminate\\Cache\\CacheServiceProvider', 'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider', + 'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider', 'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider', 'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', @@ -99,16 +113,15 @@ 'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.db.wipe' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.event.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.event.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.event.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.optimize.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.preset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', @@ -128,8 +141,6 @@ 'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.view.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.channel.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', @@ -142,7 +153,6 @@ 'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', - 'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', @@ -162,6 +172,14 @@ 'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', + 'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'hash' => 'Illuminate\\Hashing\\HashServiceProvider', 'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider', @@ -183,15 +201,11 @@ 'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider', 'validator' => 'Illuminate\\Validation\\ValidationServiceProvider', 'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider', - 'command.ide-helper.generate' => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 'command.ide-helper.models' => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', 'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider', 'html' => 'Collective\\Html\\HtmlServiceProvider', 'form' => 'Collective\\Html\\HtmlServiceProvider', 'Collective\\Html\\HtmlBuilder' => 'Collective\\Html\\HtmlServiceProvider', 'Collective\\Html\\FormBuilder' => 'Collective\\Html\\HtmlServiceProvider', - 'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 'Reliese\\Coders\\Model\\Factory' => 'Reliese\\Coders\\CodersServiceProvider', ), 'when' => array ( @@ -231,20 +245,11 @@ 'Illuminate\\Validation\\ValidationServiceProvider' => array ( ), - 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider' => - array ( - ), 'Laravel\\Tinker\\TinkerServiceProvider' => array ( ), 'Collective\\Html\\HtmlServiceProvider' => array ( ), - 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' => - array ( - ), - 'Reliese\\Coders\\CodersServiceProvider' => - array ( - ), ), ); \ No newline at end of file diff --git a/composer.json b/composer.json index 7a72337..a669584 100755 --- a/composer.json +++ b/composer.json @@ -5,32 +5,36 @@ "license": "MIT", "type": "project", "require": { - "php": "^7.1.3", - "askedio/laravel5-profanity-filter": "^1.10", - "cviebrock/eloquent-sluggable": "^4.5", - "doctrine/dbal": "^2.8", - "fideloper/proxy": "^4.0", - "gloudemans/shoppingcart": "^2.5", - "guzzlehttp/guzzle": "6.3.3", - "intervention/image": "2.4.2", - "jenssegers/date": "^3.4", - "laracasts/flash": "3.0.2", - "laravel/framework": "5.6.*", - "laravel/tinker": "^1.0", - "laravelcollective/html": "5.6.x-dev", - "maatwebsite/excel": "2.1.30", - "reliese/laravel": "^0.0.14", - "setasign/fpdf": "^1.8", + "php": "^7.2.5", + "askedio/laravel5-profanity-filter": "*", + "barryvdh/laravel-dompdf": "^0.8.5", + "cviebrock/eloquent-sluggable": "^6.0", + "doctrine/dbal": "*", + "fideloper/proxy": "*", + "guzzlehttp/guzzle": "*", + "intervention/image": "*", + "jenssegers/date": "*", + "laracasts/flash": "*", + "laravel/framework": "^6.0", + "laravel/helpers": "^1.1", + "laravel/passport": "*", + "laravel/tinker": "*", + "laravelcollective/html": "*", + "maatwebsite/excel": "^3.1", + "olimortimer/laravelshoppingcart": "*", + "reliese/laravel": "*", + "setasign/fpdf": "1.8.*", "setasign/fpdi": "^2.2", - "yajra/laravel-datatables-oracle": "^8.8" + "yajra/laravel-datatables-oracle": "*" }, "require-dev": { - "barryvdh/laravel-ide-helper": "^2.5", - "filp/whoops": "^2.0", - "fzaninotto/faker": "^1.4", - "mockery/mockery": "^1.0", - "nunomaduro/collision": "^2.0", - "phpunit/phpunit": "^7.0" + "barryvdh/laravel-debugbar": "^3.2", + "barryvdh/laravel-ide-helper": "*", + "filp/whoops": "*", + "fzaninotto/faker": "*", + "mockery/mockery": "*", + "nunomaduro/collision": "*", + "phpunit/phpunit": "*" }, "autoload": { "files": [ diff --git a/composer.lock b/composer.lock index a5642fb..8914b84 100755 --- 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": "444cbd5efb345823beb4d9e66df51114", + "content-hash": "48dac059e6362eb18309df8bde9f88ac", "packages": [ { "name": "askedio/laravel5-profanity-filter", @@ -53,38 +53,99 @@ "time": "2018-10-19T16:07:02+00:00" }, { - "name": "cocur/slugify", - "version": "v3.2", + "name": "barryvdh/laravel-dompdf", + "version": "v0.8.6", "source": { "type": "git", - "url": "https://github.com/cocur/slugify.git", - "reference": "d41701efe58ba2df9cae029c3d21e1518cc6780e" + "url": "https://github.com/barryvdh/laravel-dompdf.git", + "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/d41701efe58ba2df9cae029c3d21e1518cc6780e", - "reference": "d41701efe58ba2df9cae029c3d21e1518cc6780e", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/d7108f78cf5254a2d8c224542967f133e5a6d4e8", + "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8", + "shasum": "" + }, + "require": { + "dompdf/dompdf": "^0.8", + "illuminate/support": "^5.5|^6|^7", + "php": ">=7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.8-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\DomPDF\\ServiceProvider" + ], + "aliases": { + "PDF": "Barryvdh\\DomPDF\\Facade" + } + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\DomPDF\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "A DOMPDF Wrapper for Laravel", + "keywords": [ + "dompdf", + "laravel", + "pdf" + ], + "time": "2020-02-25T20:44:34+00:00" + }, + { + "name": "cocur/slugify", + "version": "v4.0.0", + "source": { + "type": "git", + "url": "https://github.com/cocur/slugify.git", + "reference": "3f1ffc300f164f23abe8b64ffb3f92d35cec8307" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cocur/slugify/zipball/3f1ffc300f164f23abe8b64ffb3f92d35cec8307", + "reference": "3f1ffc300f164f23abe8b64ffb3f92d35cec8307", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.5.9" + "php": ">=7.0" + }, + "conflict": { + "symfony/config": "<3.4 || >=4,<4.3", + "symfony/dependency-injection": "<3.4 || >=4,<4.3", + "symfony/http-kernel": "<3.4 || >=4,<4.3", + "twig/twig": "<2.12.1" }, "require-dev": { "laravel/framework": "~5.1", "latte/latte": "~2.2", "league/container": "^2.2.0", - "mikey179/vfsstream": "~1.6", - "mockery/mockery": "~0.9", - "nette/di": "~2.2", - "phpunit/phpunit": "~4.8.36|~5.2", + "mikey179/vfsstream": "~1.6.8", + "mockery/mockery": "^1.3", + "nette/di": "~2.4", + "phpunit/phpunit": "^5.7.27", "pimple/pimple": "~1.1", "plumphp/plum": "~0.1", - "silex/silex": "~1.3", - "symfony/config": "~2.4|~3.0|~4.0", - "symfony/dependency-injection": "~2.4|~3.0|~4.0", - "symfony/http-kernel": "~2.4|~3.0|~4.0", - "twig/twig": "~1.26|~2.0", + "symfony/config": "^3.4 || ^4.3 || ^5.0", + "symfony/dependency-injection": "^3.4 || ^4.3 || ^5.0", + "symfony/http-kernel": "^3.4 || ^4.3 || ^5.0", + "twig/twig": "^2.12.1 || ~3.0", "zendframework/zend-modulemanager": "~2.2", "zendframework/zend-servicemanager": "~2.2", "zendframework/zend-view": "~2.2" @@ -100,14 +161,14 @@ "MIT" ], "authors": [ - { - "name": "Ivo Bathke", - "email": "ivo.bathke@gmail.com" - }, { "name": "Florian Eckerstorfer", "email": "florian@eckerstorfer.co", "homepage": "https://florian.ec" + }, + { + "name": "Ivo Bathke", + "email": "ivo.bathke@gmail.com" } ], "description": "Converts a string into a slug.", @@ -115,35 +176,35 @@ "slug", "slugify" ], - "time": "2019-01-31T20:38:55+00:00" + "time": "2019-12-14T13:04:14+00:00" }, { "name": "cviebrock/eloquent-sluggable", - "version": "4.5.1", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/cviebrock/eloquent-sluggable.git", - "reference": "62ea99dbdd383697433add4f90a62a96a196578b" + "reference": "ebaefa01b810b93d0c33a0465eb6c53c38340388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/62ea99dbdd383697433add4f90a62a96a196578b", - "reference": "62ea99dbdd383697433add4f90a62a96a196578b", + "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/ebaefa01b810b93d0c33a0465eb6c53c38340388", + "reference": "ebaefa01b810b93d0c33a0465eb6c53c38340388", "shasum": "" }, "require": { - "cocur/slugify": "^3.1", - "illuminate/config": "~5.6.0", - "illuminate/database": "~5.6.0", - "illuminate/support": "~5.6.0", - "php": "^7.0" + "cocur/slugify": "^4.0", + "illuminate/config": "^6.0", + "illuminate/database": "^6.0", + "illuminate/support": "^6.0", + "php": "^7.2" }, "require-dev": { - "codedungeon/phpunit-result-printer": "^0.19.6", - "mockery/mockery": "^0.9.4", - "orchestra/database": "~3.6.0", - "orchestra/testbench": "~3.6.0", - "phpunit/phpunit": "~7.0" + "limedeck/phpunit-detailed-printer": "^5.0", + "mockery/mockery": "^1.2.3", + "orchestra/database": "4.*", + "orchestra/testbench": "4.*", + "phpunit/phpunit": "^8.0" }, "type": "library", "extra": { @@ -168,7 +229,7 @@ "email": "colin@viebrock.ca" } ], - "description": "Easy creation of slugs for your Eloquent models in Laravel 5.", + "description": "Easy creation of slugs for your Eloquent models in Laravel", "homepage": "https://github.com/cviebrock/eloquent-sluggable", "keywords": [ "eloquent", @@ -178,7 +239,70 @@ "slug", "sluggable" ], - "time": "2018-05-22T02:37:31+00:00" + "time": "2020-02-09T23:06:22+00:00" + }, + { + "name": "defuse/php-encryption", + "version": "v2.2.1", + "source": { + "type": "git", + "url": "https://github.com/defuse/php-encryption.git", + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0f407c43b953d571421e0020ba92082ed5fb7620", + "reference": "0f407c43b953d571421e0020ba92082ed5fb7620", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "paragonie/random_compat": ">= 2", + "php": ">=5.4.0" + }, + "require-dev": { + "nikic/php-parser": "^2.0|^3.0|^4.0", + "phpunit/phpunit": "^4|^5" + }, + "bin": [ + "bin/generate-defuse-key" + ], + "type": "library", + "autoload": { + "psr-4": { + "Defuse\\Crypto\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Hornby", + "email": "taylor@defuse.ca", + "homepage": "https://defuse.ca/" + }, + { + "name": "Scott Arciszewski", + "email": "info@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "Secure PHP Encryption Library", + "keywords": [ + "aes", + "authenticated encryption", + "cipher", + "crypto", + "cryptography", + "encrypt", + "encryption", + "openssl", + "security", + "symmetric key cryptography" + ], + "time": "2018-07-24T23:27:56+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -297,16 +421,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.10.1", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8" + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", - "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8", + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8", "shasum": "" }, "require": { @@ -318,9 +442,11 @@ "require-dev": { "doctrine/coding-standard": "^6.0", "jetbrains/phpstorm-stubs": "^2019.1", - "phpstan/phpstan": "^0.11.3", + "nikic/php-parser": "^4.4", + "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^8.4.1", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -385,7 +511,21 @@ "sqlserver", "sqlsrv" ], - "time": "2020-01-04T12:56:21+00:00" + "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" }, { "name": "doctrine/event-manager", @@ -465,33 +605,37 @@ }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", + "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^7.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -520,15 +664,35 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "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%2Finflector", + "type": "tidelift" + } + ], + "time": "2020-05-11T11:25:59+00:00" }, { "name": "doctrine/lexer", @@ -592,6 +756,72 @@ ], "time": "2019-10-30T14:39:59+00:00" }, + { + "name": "dompdf/dompdf", + "version": "v0.8.5", + "source": { + "type": "git", + "url": "https://github.com/dompdf/dompdf.git", + "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/6782abfc090b132134cd6cea0ec6d76f0fce2c56", + "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-mbstring": "*", + "phenx/php-font-lib": "^0.5.1", + "phenx/php-svg-lib": "^0.3.3", + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5", + "squizlabs/php_codesniffer": "^3.5" + }, + "suggest": { + "ext-gd": "Needed to process images", + "ext-gmagick": "Improves image processing performance", + "ext-imagick": "Improves image processing performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.7-dev" + } + }, + "autoload": { + "psr-4": { + "Dompdf\\": "src/" + }, + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + }, + { + "name": "Brian Sweeney", + "email": "eclecticgeek@gmail.com" + }, + { + "name": "Gabriel Bull", + "email": "me@gabrielbull.com" + } + ], + "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", + "homepage": "https://github.com/dompdf/dompdf", + "time": "2020-02-20T03:52:51+00:00" + }, { "name": "dragonmantank/cron-expression", "version": "v2.3.0", @@ -704,52 +934,6 @@ ], "time": "2020-02-13T22:36:52+00:00" }, - { - "name": "erusev/parsedown", - "version": "1.7.4", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", - "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ], - "time": "2019-12-30T22:54:17+00:00" - }, { "name": "fideloper/proxy", "version": "4.3.0", @@ -805,88 +989,80 @@ "time": "2020-02-22T01:51:47+00:00" }, { - "name": "gloudemans/shoppingcart", - "version": "2.6.0", + "name": "firebase/php-jwt", + "version": "v5.2.0", "source": { "type": "git", - "url": "https://github.com/Crinsane/LaravelShoppingcart.git", - "reference": "f460ab7312cce32cb428cf39a500a2d16600b1d6" + "url": "https://github.com/firebase/php-jwt.git", + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Crinsane/LaravelShoppingcart/zipball/f460ab7312cce32cb428cf39a500a2d16600b1d6", - "reference": "f460ab7312cce32cb428cf39a500a2d16600b1d6", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb", + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb", "shasum": "" }, "require": { - "illuminate/events": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*", - "illuminate/session": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*", - "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*" + "php": ">=5.3.0" }, "require-dev": { - "mockery/mockery": "~0.9.0", - "orchestra/testbench": "~3.1", - "phpunit/phpunit": "~5.0 || ~6.0 || ~7.0" - }, - "suggest": { - "gloudemans/notify": "Simple flash notifications for Laravel" + "phpunit/phpunit": ">=4.8 <=9" }, "type": "library", - "extra": { - "laravel": { - "providers": [ - "Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider" - ], - "aliases": { - "Cart": "Gloudemans\\Shoppingcart\\Facades\\Cart" - } - } - }, "autoload": { "psr-4": { - "Gloudemans\\Shoppingcart\\": "src/" + "Firebase\\JWT\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Rob Gloudemans", - "email": "info@robgloudemans.nl" + "name": "Neuman Vong", + "email": "neuman+pear@twilio.com", + "role": "Developer" + }, + { + "name": "Anant Narayanan", + "email": "anant@php.net", + "role": "Developer" } ], - "description": "Laravel Shoppingcart", + "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", + "homepage": "https://github.com/firebase/php-jwt", "keywords": [ - "laravel", - "shoppingcart" + "jwt", + "php" ], - "time": "2019-02-04T14:29:34+00:00" + "time": "2020-03-25T18:49:23+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.3.3", + "version": "6.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", + "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", "shasum": "" }, "require": { + "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", - "php": ">=5.5" + "guzzlehttp/psr7": "^1.6.1", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.11" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.0" + "psr/log": "^1.1" }, "suggest": { "psr/log": "Required for using the Log middleware" @@ -894,16 +1070,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "6.5-dev" } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\": "src/" - } + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -927,7 +1103,7 @@ "rest", "web service" ], - "time": "2018-04-22T15:46:56+00:00" + "time": "2020-04-18T10:38:46+00:00" }, { "name": "guzzlehttp/promises", @@ -1053,16 +1229,16 @@ }, { "name": "intervention/image", - "version": "2.4.2", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb" + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/e82d274f786e3d4b866a59b173f42e716f0783eb", - "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb", + "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", "shasum": "" }, "require": { @@ -1119,117 +1295,27 @@ "thumbnail", "watermark" ], - "time": "2018-05-29T14:19:03+00:00" - }, - { - "name": "jakub-onderka/php-console-color", - "version": "v0.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "1.0", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleColor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com" - } - ], - "time": "2018-09-29T17:23:10+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.4", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "jakub-onderka/php-console-color": "~0.2", - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~1.0", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleHighlighter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" - } - ], - "description": "Highlight PHP code in terminal", - "time": "2018-09-29T18:48:56+00:00" + "time": "2019-11-02T09:15:47+00:00" }, { "name": "jenssegers/date", - "version": "v3.5.0", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/jenssegers/date.git", - "reference": "58393b0544fc2525b3fcd02aa4c989857107e05a" + "reference": "506f86096e0b512f9ece6ad0ccae62b03c125771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jenssegers/date/zipball/58393b0544fc2525b3fcd02aa4c989857107e05a", - "reference": "58393b0544fc2525b3fcd02aa4c989857107e05a", + "url": "https://api.github.com/repos/jenssegers/date/zipball/506f86096e0b512f9ece6ad0ccae62b03c125771", + "reference": "506f86096e0b512f9ece6ad0ccae62b03c125771", "shasum": "" }, "require": { - "nesbot/carbon": "^1.0|^2.0", - "php": ">=5.6", - "symfony/translation": "^2.7|^3.0|^4.0" + "nesbot/carbon": "^2.16" }, "require-dev": { - "phpunit/phpunit": "^5.0|^6.0|^7.0", + "phpunit/phpunit": "^7.5", "satooshi/php-coveralls": "^2.0" }, "type": "library", @@ -1272,127 +1358,185 @@ "time", "translation" ], - "time": "2019-03-10T08:50:58+00:00" + "funding": [ + { + "url": "https://github.com/jenssegers", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/jenssegers/date", + "type": "tidelift" + } + ], + "time": "2020-04-28T06:35:54+00:00" }, { - "name": "jeremeamia/SuperClosure", - "version": "2.4.0", + "name": "laminas/laminas-diactoros", + "version": "2.3.0", "source": { "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9" + "url": "https://github.com/laminas/laminas-diactoros.git", + "reference": "5ab185dba63ec655a2380c97711b09adc7061f89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5ab185dba63ec655a2380c97711b09adc7061f89", + "reference": "5ab185dba63ec655a2380c97711b09adc7061f89", "shasum": "" }, "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.1", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0" + }, + "conflict": { + "phpspec/prophecy": "<1.9.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "replace": { + "zendframework/zend-diactoros": "^2.2.1" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" + "ext-curl": "*", + "ext-dom": "*", + "ext-libxml": "*", + "http-interop/http-factory-tests": "^0.5.0", + "laminas/laminas-coding-standard": "~1.0.0", + "php-http/psr7-integration-tests": "^1.0", + "phpunit/phpunit": "^7.5.18" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.3.x-dev", + "dev-develop": "2.4.x-dev" + }, + "laminas": { + "config-provider": "Laminas\\Diactoros\\ConfigProvider", + "module": "Laminas\\Diactoros" } }, "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php", + "src/functions/create_uploaded_file.legacy.php", + "src/functions/marshal_headers_from_sapi.legacy.php", + "src/functions/marshal_method_from_sapi.legacy.php", + "src/functions/marshal_protocol_version_from_sapi.legacy.php", + "src/functions/marshal_uri_from_sapi.legacy.php", + "src/functions/normalize_server.legacy.php", + "src/functions/normalize_uploaded_files.legacy.php", + "src/functions/parse_cookie_header.legacy.php" + ], "psr-4": { - "SuperClosure\\": "src/" + "Laminas\\Diactoros\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], - "authors": [ + "description": "PSR HTTP Message implementations", + "homepage": "https://laminas.dev", + "keywords": [ + "http", + "laminas", + "psr", + "psr-7" + ], + "funding": [ { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" } ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", - "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" - ], - "time": "2018-03-21T22:21:57+00:00" + "time": "2020-04-27T17:07:01+00:00" }, { - "name": "kylekatarnls/update-helper", - "version": "1.2.0", + "name": "laminas/laminas-zendframework-bridge", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/kylekatarnls/update-helper.git", - "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e" + "url": "https://github.com/laminas/laminas-zendframework-bridge.git", + "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e", - "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9", + "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0 || ^2.0.0", - "php": ">=5.3.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "codeclimate/php-test-reporter": "dev-master", - "composer/composer": "2.0.x-dev || ^2.0.0-dev", - "phpunit/phpunit": ">=4.8.35 <6.0" + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1", + "squizlabs/php_codesniffer": "^3.5" }, - "type": "composer-plugin", + "type": "library", "extra": { - "class": "UpdateHelper\\ComposerPlugin" + "branch-alias": { + "dev-master": "1.0.x-dev", + "dev-develop": "1.1.x-dev" + }, + "laminas": { + "module": "Laminas\\ZendFrameworkBridge" + } }, "autoload": { - "psr-0": { - "UpdateHelper\\": "src/" + "files": [ + "src/autoload.php" + ], + "psr-4": { + "Laminas\\ZendFrameworkBridge\\": "src//" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], - "authors": [ + "description": "Alias legacy ZF class names to Laminas Project equivalents.", + "keywords": [ + "ZendFramework", + "autoloading", + "laminas", + "zf" + ], + "funding": [ { - "name": "Kyle", - "email": "kylekatarnls@gmail.com" + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" } ], - "description": "Update helper", - "time": "2019-07-29T11:03:54+00:00" + "time": "2020-04-03T16:01:00+00:00" }, { "name": "laracasts/flash", - "version": "3.0.2", + "version": "3.1", "source": { "type": "git", "url": "https://github.com/laracasts/flash.git", - "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333" + "reference": "150d4348477db31b9a93ccd07f713e3d0513b3bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laracasts/flash/zipball/10cd420ab63fd0796bf5e1e5b99f87636d2f4333", - "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333", + "url": "https://api.github.com/repos/laracasts/flash/zipball/150d4348477db31b9a93ccd07f713e3d0513b3bf", + "reference": "150d4348477db31b9a93ccd07f713e3d0513b3bf", "shasum": "" }, "require": { - "illuminate/support": "~5.0", + "illuminate/support": "~5.0|^6.0|^7.0", "php": ">=5.4.0" }, "require-dev": { @@ -1429,46 +1573,49 @@ } ], "description": "Easy flash notifications", - "time": "2017-06-22T19:01:19+00:00" + "time": "2020-03-03T15:50:52+00:00" }, { "name": "laravel/framework", - "version": "v5.6.39", + "version": "v6.18.14", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "37bb306f516669ab4f888c16003f694313ab299e" + "reference": "503d1511d6792b0b8d0a4bfed47f7c2f29634e1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e", - "reference": "37bb306f516669ab4f888c16003f694313ab299e", + "url": "https://api.github.com/repos/laravel/framework/zipball/503d1511d6792b0b8d0a4bfed47f7c2f29634e1c", + "reference": "503d1511d6792b0b8d0a4bfed47f7c2f29634e1c", "shasum": "" }, "require": { - "doctrine/inflector": "~1.1", - "dragonmantank/cron-expression": "~2.0", - "erusev/parsedown": "~1.7", + "doctrine/inflector": "^1.4|^2.0", + "dragonmantank/cron-expression": "^2.0", + "egulias/email-validator": "^2.1.10", + "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", + "league/commonmark": "^1.3", "league/flysystem": "^1.0.8", - "monolog/monolog": "~1.12", - "nesbot/carbon": "1.25.*", - "php": "^7.1.3", - "psr/container": "~1.0", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", + "opis/closure": "^3.1", + "php": "^7.2", + "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", - "swiftmailer/swiftmailer": "~6.0", - "symfony/console": "~4.0", - "symfony/debug": "~4.0", - "symfony/finder": "~4.0", - "symfony/http-foundation": "~4.0", - "symfony/http-kernel": "~4.0", - "symfony/process": "~4.0", - "symfony/routing": "~4.0", - "symfony/var-dumper": "~4.0", + "swiftmailer/swiftmailer": "^6.0", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", - "vlucas/phpdotenv": "~2.2" + "vlucas/phpdotenv": "^3.3" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -1504,43 +1651,47 @@ "illuminate/view": "self.version" }, "require-dev": { - "aws/aws-sdk-php": "~3.0", - "doctrine/dbal": "~2.6", - "filp/whoops": "^2.1.4", - "league/flysystem-cached-adapter": "~1.0", - "mockery/mockery": "~1.0", + "aws/aws-sdk-php": "^3.0", + "doctrine/dbal": "^2.6", + "filp/whoops": "^2.4", + "guzzlehttp/guzzle": "^6.3|^7.0", + "league/flysystem-cached-adapter": "^1.0", + "mockery/mockery": "^1.3.1", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.6.*", - "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~7.0", + "orchestra/testbench-core": "^4.0", + "pda/pheanstalk": "^4.0", + "phpunit/phpunit": "^7.5.15|^8.4|^9.0", "predis/predis": "^1.1.1", - "symfony/css-selector": "~4.0", - "symfony/dom-crawler": "~4.0" + "symfony/cache": "^4.3.4" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", + "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", - "laravel/tinker": "Required to use the tinker console command (~1.0).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).", - "nexmo/client": "Required to use the Nexmo transport (~1.0).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", - "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." + "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", + "filp/whoops": "Required for friendly error pages in development (^2.4).", + "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).", + "laravel/tinker": "Required to use the tinker console command (^2.0).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", + "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", + "moontoast/math": "Required to use ordered UUIDs (^1.1).", + "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", + "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", + "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -1568,40 +1719,167 @@ "framework", "laravel" ], - "time": "2018-10-04T14:50:41+00:00" + "time": "2020-05-12T14:41:15+00:00" }, { - "name": "laravel/tinker", - "version": "v1.0.10", + "name": "laravel/helpers", + "version": "v1.2.0", "source": { "type": "git", - "url": "https://github.com/laravel/tinker.git", - "reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7" + "url": "https://github.com/laravel/helpers.git", + "reference": "1f978fc5dad9f7f906b18242c654252615201de4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/ad571aacbac1539c30d480908f9d0c9614eaf1a7", - "reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7", + "url": "https://api.github.com/repos/laravel/helpers/zipball/1f978fc5dad9f7f906b18242c654252615201de4", + "reference": "1f978fc5dad9f7f906b18242c654252615201de4", "shasum": "" }, "require": { - "illuminate/console": "~5.1|^6.0", - "illuminate/contracts": "~5.1|^6.0", - "illuminate/support": "~5.1|^6.0", - "php": ">=5.5.9", - "psy/psysh": "0.7.*|0.8.*|0.9.*", - "symfony/var-dumper": "~3.0|~4.0" + "illuminate/support": "~5.8.0|^6.0|^7.0", + "php": ">=7.1.3" }, "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "suggest": { - "illuminate/database": "The Illuminate Database package (~5.1)." + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Dries Vints", + "email": "dries.vints@gmail.com" + } + ], + "description": "Provides backwards compatibility for helpers in the latest Laravel release.", + "keywords": [ + "helpers", + "laravel" + ], + "time": "2020-03-03T13:52:16+00:00" + }, + { + "name": "laravel/passport", + "version": "v9.2.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/passport.git", + "reference": "9f4b88114e7517db58428cef0ba461f86a2e5f92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/passport/zipball/9f4b88114e7517db58428cef0ba461f86a2e5f92", + "reference": "9f4b88114e7517db58428cef0ba461f86a2e5f92", + "shasum": "" + }, + "require": { + "ext-json": "*", + "firebase/php-jwt": "^5.0", + "guzzlehttp/guzzle": "^6.0", + "illuminate/auth": "^6.0|^7.0", + "illuminate/console": "^6.0|^7.0", + "illuminate/container": "^6.0|^7.0", + "illuminate/contracts": "^6.0|^7.0", + "illuminate/cookie": "^6.0|^7.0", + "illuminate/database": "^6.0|^7.0", + "illuminate/encryption": "^6.0|^7.0", + "illuminate/http": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0", + "laminas/laminas-diactoros": "^2.2", + "league/oauth2-server": "^8.1", + "nyholm/psr7": "^1.0", + "php": "^7.2", + "phpseclib/phpseclib": "^2.0", + "symfony/psr-http-message-bridge": "^2.0" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "orchestra/testbench": "^4.4|^5.0", + "phpunit/phpunit": "^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Passport\\PassportServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Passport\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Laravel Passport provides OAuth2 server support to Laravel.", + "keywords": [ + "laravel", + "oauth", + "passport" + ], + "time": "2020-05-12T20:45:28+00:00" + }, + { + "name": "laravel/tinker", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/tinker.git", + "reference": "cde90a7335a2130a4488beb68f4b2141869241db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/tinker/zipball/cde90a7335a2130a4488beb68f4b2141869241db", + "reference": "cde90a7335a2130a4488beb68f4b2141869241db", + "shasum": "" + }, + "require": { + "illuminate/console": "^6.0|^7.0|^8.0", + "illuminate/contracts": "^6.0|^7.0|^8.0", + "illuminate/support": "^6.0|^7.0|^8.0", + "php": "^7.2", + "psy/psysh": "^0.10.3", + "symfony/var-dumper": "^4.3|^5.0" + }, + "require-dev": { + "mockery/mockery": "^1.3.1", + "phpunit/phpunit": "^8.4|^9.0" + }, + "suggest": { + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" }, "laravel": { "providers": [ @@ -1631,39 +1909,39 @@ "laravel", "psysh" ], - "time": "2019-08-07T15:10:45+00:00" + "time": "2020-04-07T15:01:31+00:00" }, { "name": "laravelcollective/html", - "version": "5.6.x-dev", + "version": "v6.1.0", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d" + "reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d", - "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64f2268bf41bf02b3a9dd3c30f102e934d721664", + "reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664", "shasum": "" }, "require": { - "illuminate/http": "5.6.*", - "illuminate/routing": "5.6.*", - "illuminate/session": "5.6.*", - "illuminate/support": "5.6.*", - "illuminate/view": "5.6.*", - "php": ">=7.1.3" + "illuminate/http": "^6.0|^7.0", + "illuminate/routing": "^6.0|^7.0", + "illuminate/session": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0", + "illuminate/view": "^6.0|^7.0", + "php": ">=7.2.5" }, "require-dev": { - "illuminate/database": "5.6.*", + "illuminate/database": "^6.0|^7.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "~7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "6.0-dev" }, "laravel": { "providers": [ @@ -1688,31 +1966,236 @@ "MIT" ], "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - }, { "name": "Adam Engebretson", "email": "adam@laravelcollective.com" + }, + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" } ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2018-06-18T15:04:16+00:00" + "time": "2020-03-02T16:41:28+00:00" }, { - "name": "league/flysystem", - "version": "1.0.64", + "name": "lcobucci/jwt", + "version": "3.3.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" + "url": "https://github.com/lcobucci/jwt.git", + "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", - "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18", + "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "ext-openssl": "*", + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "mikey179/vfsstream": "~1.5", + "phpmd/phpmd": "~2.2", + "phpunit/php-invoker": "~1.1", + "phpunit/phpunit": "^5.7 || ^7.3", + "squizlabs/php_codesniffer": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Lcobucci\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Luís Otávio Cobucci Oblonczyk", + "email": "lcobucci@gmail.com", + "role": "Developer" + } + ], + "description": "A simple library to work with JSON Web Token and JSON Web Signature", + "keywords": [ + "JWS", + "jwt" + ], + "time": "2019-05-24T18:30:49+00:00" + }, + { + "name": "league/commonmark", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/commonmark.git", + "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505", + "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1" + }, + "conflict": { + "scrutinizer/ocular": "1.7.*" + }, + "require-dev": { + "cebe/markdown": "~1.0", + "commonmark/commonmark.js": "0.29.1", + "erusev/parsedown": "~1.0", + "ext-json": "*", + "github/gfm": "0.29.0", + "michelf/php-markdown": "~1.4", + "mikehaertl/php-shellcommand": "^1.4", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5", + "scrutinizer/ocular": "^1.5", + "symfony/finder": "^4.2" + }, + "bin": [ + "bin/commonmark" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "League\\CommonMark\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + } + ], + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", + "homepage": "https://commonmark.thephpleague.com", + "keywords": [ + "commonmark", + "flavored", + "gfm", + "github", + "github-flavored", + "markdown", + "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-05-04T22:15:21+00:00" + }, + { + "name": "league/event", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/event.git", + "reference": "d2cc124cf9a3fab2bb4ff963307f60361ce4d119" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/event/zipball/d2cc124cf9a3fab2bb4ff963307f60361ce4d119", + "reference": "d2cc124cf9a3fab2bb4ff963307f60361ce4d119", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "henrikbjorn/phpspec-code-coverage": "~1.0.1", + "phpspec/phpspec": "^2.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Event\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "description": "Event package", + "keywords": [ + "emitter", + "event", + "listener" + ], + "time": "2018-11-26T11:52:41+00:00" + }, + { + "name": "league/flysystem", + "version": "1.0.68", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3e4198372276ec99ac3409a21d7c9d1ced9026e4", + "reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4", "shasum": "" }, "require": { @@ -1783,44 +2266,123 @@ "sftp", "storage" ], - "time": "2020-02-05T18:14:17+00:00" + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], + "time": "2020-05-12T20:33:44+00:00" }, { - "name": "maatwebsite/excel", - "version": "2.1.30", + "name": "league/oauth2-server", + "version": "8.1.0", "source": { "type": "git", - "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f" + "url": "https://github.com/thephpleague/oauth2-server.git", + "reference": "b53d324f774eb782250f7d8973811a33a75ecdef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/f5540c4ba3ac50cebd98b09ca42e61f926ef299f", - "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/b53d324f774eb782250f7d8973811a33a75ecdef", + "reference": "b53d324f774eb782250f7d8973811a33a75ecdef", "shasum": "" }, "require": { - "illuminate/cache": "^5.0", - "illuminate/config": "^5.0", - "illuminate/filesystem": "^5.0", - "illuminate/support": "^5.0", - "jeremeamia/superclosure": "^2.3", - "nesbot/carbon": "~1.0", - "php": ">=5.5", - "phpoffice/phpexcel": "^1.8.1", - "tijsverkoyen/css-to-inline-styles": "~2.0" + "defuse/php-encryption": "^2.2.1", + "ext-json": "*", + "ext-openssl": "*", + "lcobucci/jwt": "^3.3.1", + "league/event": "^2.2", + "php": ">=7.2.0", + "psr/http-message": "^1.0.1" + }, + "replace": { + "league/oauth2server": "*", + "lncd/oauth2": "*" }, "require-dev": { - "mockery/mockery": "~1.0", - "orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*|3.6.*", - "phpseclib/phpseclib": "~1.0", - "phpunit/phpunit": "~4.0" + "laminas/laminas-diactoros": "^2.3.0", + "phpstan/phpstan": "^0.11.19", + "phpstan/phpstan-phpunit": "^0.11.2", + "phpunit/phpunit": "^8.5.4 || ^9.1.3", + "roave/security-advisories": "dev-master" }, - "suggest": { - "illuminate/http": "^5.0", - "illuminate/queue": "^5.0", - "illuminate/routing": "^5.0", - "illuminate/view": "^5.0" + "type": "library", + "autoload": { + "psr-4": { + "League\\OAuth2\\Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Bilbie", + "email": "hello@alexbilbie.com", + "homepage": "http://www.alexbilbie.com", + "role": "Developer" + }, + { + "name": "Andy Millington", + "email": "andrew@noexceptions.io", + "homepage": "https://www.noexceptions.io", + "role": "Developer" + } + ], + "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.", + "homepage": "https://oauth2.thephpleague.com/", + "keywords": [ + "Authentication", + "api", + "auth", + "authorisation", + "authorization", + "oauth", + "oauth 2", + "oauth 2.0", + "oauth2", + "protect", + "resource", + "secure", + "server" + ], + "funding": [ + { + "url": "https://github.com/sephster", + "type": "github" + } + ], + "time": "2020-04-29T22:14:38+00:00" + }, + { + "name": "maatwebsite/excel", + "version": "3.1.19", + "source": { + "type": "git", + "url": "https://github.com/Maatwebsite/Laravel-Excel.git", + "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", + "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", + "shasum": "" + }, + "require": { + "ext-json": "*", + "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0", + "php": "^7.0", + "phpoffice/phpspreadsheet": "^1.10" + }, + "require-dev": { + "mockery/mockery": "^1.1", + "orchestra/database": "^4.0", + "orchestra/testbench": "^4.0", + "phpunit/phpunit": "^8.0", + "predis/predis": "^1.1" }, "type": "library", "extra": { @@ -1834,10 +2396,7 @@ } }, "autoload": { - "classmap": [ - "src/Maatwebsite/Excel" - ], - "psr-0": { + "psr-4": { "Maatwebsite\\Excel\\": "src/" } }, @@ -1847,11 +2406,11 @@ ], "authors": [ { - "name": "Maatwebsite.nl", + "name": "Patrick Brouwers", "email": "patrick@maatwebsite.nl" } ], - "description": "Supercharged Excel exports in Laravel", + "description": "Supercharged Excel exports and imports in Laravel", "keywords": [ "PHPExcel", "batch", @@ -1859,27 +2418,203 @@ "excel", "export", "import", - "laravel" + "laravel", + "php", + "phpspreadsheet" ], - "time": "2018-09-04T19:00:09+00:00" + "funding": [ + { + "url": "https://laravel-excel.com/commercial-support", + "type": "custom" + }, + { + "url": "https://github.com/patrickbrouwers", + "type": "github" + } + ], + "time": "2020-02-28T15:47:45+00:00" }, { - "name": "monolog/monolog", - "version": "1.25.3", + "name": "markbaker/complex", + "version": "1.4.8", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" + "url": "https://github.com/MarkBaker/PHPComplex.git", + "reference": "8eaa40cceec7bf0518187530b2e63871be661b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72", + "reference": "8eaa40cceec7bf0518187530b2e63871be661b72", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^5.6.0|^7.0.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "phpcompatibility/php-compatibility": "^9.0", + "phpdocumentor/phpdocumentor": "2.*", + "phploc/phploc": "2.*", + "phpmd/phpmd": "2.*", + "phpunit/phpunit": "^4.8.35|^5.4.0", + "sebastian/phpcpd": "2.*", + "squizlabs/php_codesniffer": "^3.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Complex\\": "classes/src/" + }, + "files": [ + "classes/src/functions/abs.php", + "classes/src/functions/acos.php", + "classes/src/functions/acosh.php", + "classes/src/functions/acot.php", + "classes/src/functions/acoth.php", + "classes/src/functions/acsc.php", + "classes/src/functions/acsch.php", + "classes/src/functions/argument.php", + "classes/src/functions/asec.php", + "classes/src/functions/asech.php", + "classes/src/functions/asin.php", + "classes/src/functions/asinh.php", + "classes/src/functions/atan.php", + "classes/src/functions/atanh.php", + "classes/src/functions/conjugate.php", + "classes/src/functions/cos.php", + "classes/src/functions/cosh.php", + "classes/src/functions/cot.php", + "classes/src/functions/coth.php", + "classes/src/functions/csc.php", + "classes/src/functions/csch.php", + "classes/src/functions/exp.php", + "classes/src/functions/inverse.php", + "classes/src/functions/ln.php", + "classes/src/functions/log2.php", + "classes/src/functions/log10.php", + "classes/src/functions/negative.php", + "classes/src/functions/pow.php", + "classes/src/functions/rho.php", + "classes/src/functions/sec.php", + "classes/src/functions/sech.php", + "classes/src/functions/sin.php", + "classes/src/functions/sinh.php", + "classes/src/functions/sqrt.php", + "classes/src/functions/tan.php", + "classes/src/functions/tanh.php", + "classes/src/functions/theta.php", + "classes/src/operations/add.php", + "classes/src/operations/subtract.php", + "classes/src/operations/multiply.php", + "classes/src/operations/divideby.php", + "classes/src/operations/divideinto.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@lange.demon.co.uk" + } + ], + "description": "PHP Class for working with complex numbers", + "homepage": "https://github.com/MarkBaker/PHPComplex", + "keywords": [ + "complex", + "mathematics" + ], + "time": "2020-03-11T20:15:49+00:00" + }, + { + "name": "markbaker/matrix", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/MarkBaker/PHPMatrix.git", + "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21", + "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21", + "shasum": "" + }, + "require": { + "php": "^5.6.0|^7.0.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "dev-master", + "phploc/phploc": "^4", + "phpmd/phpmd": "dev-master", + "phpunit/phpunit": "^5.7", + "sebastian/phpcpd": "^3.0", + "squizlabs/php_codesniffer": "^3.0@dev" + }, + "type": "library", + "autoload": { + "psr-4": { + "Matrix\\": "classes/src/" + }, + "files": [ + "classes/src/functions/adjoint.php", + "classes/src/functions/antidiagonal.php", + "classes/src/functions/cofactors.php", + "classes/src/functions/determinant.php", + "classes/src/functions/diagonal.php", + "classes/src/functions/identity.php", + "classes/src/functions/inverse.php", + "classes/src/functions/minors.php", + "classes/src/functions/trace.php", + "classes/src/functions/transpose.php", + "classes/src/operations/add.php", + "classes/src/operations/directsum.php", + "classes/src/operations/subtract.php", + "classes/src/operations/multiply.php", + "classes/src/operations/divideby.php", + "classes/src/operations/divideinto.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@lange.demon.co.uk" + } + ], + "description": "PHP Class for working with matrices", + "homepage": "https://github.com/MarkBaker/PHPMatrix", + "keywords": [ + "mathematics", + "matrix", + "vector" + ], + "time": "2019-10-06T11:29:25+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8", + "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8", + "shasum": "" + }, + "require": { + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -1887,33 +2622,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -1939,38 +2677,51 @@ "logging", "psr-3" ], - "time": "2019-12-20T14:15:16+00:00" + "time": "2019-12-20T14:22:59+00:00" }, { "name": "nesbot/carbon", - "version": "1.25.3", + "version": "2.34.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8" + "reference": "52ea68aebbad8a3b27b5d24e4c66ebe1933f8399" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8", - "reference": "ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/52ea68aebbad8a3b27b5d24e4c66ebe1933f8399", + "reference": "52ea68aebbad8a3b27b5d24e4c66ebe1933f8399", "shasum": "" }, "require": { - "kylekatarnls/update-helper": "^1.1", - "php": ">=5.3.9", - "symfony/translation": "~2.6 || ~3.0 || ~4.0" + "ext-json": "*", + "php": "^7.1.8 || ^8.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { - "composer/composer": "^1.2", - "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "doctrine/orm": "^2.7", + "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", + "kylekatarnls/multi-tester": "^1.1", + "phpmd/phpmd": "^2.8", + "phpstan/phpstan": "^0.11", + "phpunit/phpunit": "^7.5 || ^8.0", + "squizlabs/php_codesniffer": "^3.4" }, "bin": [ - "bin/upgrade-carbon" + "bin/carbon" ], "type": "library", "extra": { - "update-helper": "Carbon\\Upgrade" + "branch-alias": { + "dev-master": "2.x-dev", + "dev-3.x": "3.x-dev" + }, + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + } }, "autoload": { "psr-4": { @@ -1986,29 +2737,43 @@ "name": "Brian Nesbitt", "email": "brian@nesbot.com", "homepage": "http://nesbot.com" + }, + { + "name": "kylekatarnls", + "homepage": "http://github.com/kylekatarnls" } ], - "description": "A simple API extension for DateTime.", + "description": "An API extension for DateTime that supports 281 different languages.", "homepage": "http://carbon.nesbot.com", "keywords": [ "date", "datetime", "time" ], - "time": "2019-06-03T17:56:44+00:00" + "funding": [ + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2020-05-12T19:53:34+00:00" }, { "name": "nikic/php-parser", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", "shasum": "" }, "require": { @@ -2047,7 +2812,195 @@ "parser", "php" ], - "time": "2019-11-08T13:50:10+00:00" + "time": "2020-04-10T16:34:50+00:00" + }, + { + "name": "nyholm/psr7", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/Nyholm/psr7.git", + "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/55ff6b76573f5b242554c9775792bd59fb52e11c", + "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c", + "shasum": "" + }, + "require": { + "php": "^7.1", + "php-http/message-factory": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "http-interop/http-factory-tests": "dev-master", + "php-http/psr7-integration-tests": "dev-master", + "phpunit/phpunit": "^7.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Nyholm\\Psr7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + }, + { + "name": "Martijn van der Ven", + "email": "martijn@vanderven.se" + } + ], + "description": "A fast PHP7 implementation of PSR-7", + "homepage": "http://tnyholm.se", + "keywords": [ + "psr-17", + "psr-7" + ], + "time": "2019-09-05T13:24:16+00:00" + }, + { + "name": "olimortimer/laravelshoppingcart", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/olimortimer/LaravelShoppingcart.git", + "reference": "bcd52a0e60670ca64fe8af991ae2e2cd1f547dcf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/olimortimer/LaravelShoppingcart/zipball/bcd52a0e60670ca64fe8af991ae2e2cd1f547dcf", + "reference": "bcd52a0e60670ca64fe8af991ae2e2cd1f547dcf", + "shasum": "" + }, + "require": { + "illuminate/events": "5.*.* || 6.*.* || 7.*.*", + "illuminate/session": "5.*.* || 6.*.* || 7.*.*", + "illuminate/support": "5.*.* || 6.*.* || 7.*.*" + }, + "require-dev": { + "mockery/mockery": "~0.9.0 || ^1.0", + "orchestra/testbench": "~3.1", + "phpunit/phpunit": "~5.0 || ~6.0 || ~7.0 || ~8.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Gloudemans\\Shoppingcart\\ShoppingcartServiceProvider" + ], + "aliases": { + "Cart": "Gloudemans\\Shoppingcart\\Facades\\Cart" + } + } + }, + "autoload": { + "psr-4": { + "Gloudemans\\Shoppingcart\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rob Gloudemans", + "email": "info@robgloudemans.nl" + }, + { + "name": "Michael V.", + "email": "michael@michaelbelgium.me" + }, + { + "name": "Oli Mortimer", + "email": "oli@olimortimer.com" + } + ], + "description": "Laravel Shoppingcart", + "keywords": [ + "laravel", + "shoppingcart" + ], + "time": "2020-03-24T13:17:26+00:00" + }, + { + "name": "opis/closure", + "version": "3.5.1", + "source": { + "type": "git", + "url": "https://github.com/opis/closure.git", + "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969", + "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969", + "shasum": "" + }, + "require": { + "php": "^5.4 || ^7.0" + }, + "require-dev": { + "jeremeamia/superclosure": "^2.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\Closure\\": "src/" + }, + "files": [ + "functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" + } + ], + "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", + "homepage": "https://opis.io/closure", + "keywords": [ + "anonymous functions", + "closure", + "function", + "serializable", + "serialization", + "serialize" + ], + "time": "2019-11-29T22:36:02+00:00" }, { "name": "paragonie/random_compat", @@ -2095,67 +3048,385 @@ "time": "2018-07-02T15:55:56+00:00" }, { - "name": "phpoffice/phpexcel", - "version": "1.8.2", + "name": "phenx/php-font-lib", + "version": "0.5.2", "source": { "type": "git", - "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870" + "url": "https://github.com/PhenX/php-font-lib.git", + "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870", - "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870", + "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8", + "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8", "shasum": "" }, - "require": { - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "php": "^5.2|^7.0" - }, "require-dev": { - "squizlabs/php_codesniffer": "2.*" + "phpunit/phpunit": "^4.8.35 || ^5 || ^6 || ^7" }, "type": "library", "autoload": { - "psr-0": { - "PHPExcel": "Classes/" + "psr-4": { + "FontLib\\": "src/FontLib" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "LGPL-3.0" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse, export and make subsets of different types of font files.", + "homepage": "https://github.com/PhenX/php-font-lib", + "time": "2020-03-08T15:31:32+00:00" + }, + { + "name": "phenx/php-svg-lib", + "version": "v0.3.3", + "source": { + "type": "git", + "url": "https://github.com/PhenX/php-svg-lib.git", + "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "shasum": "" + }, + "require": { + "sabberworm/php-css-parser": "^8.3" + }, + "require-dev": { + "phpunit/phpunit": "^5.5|^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Svg\\": "src/Svg" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse and export to PDF SVG files.", + "homepage": "https://github.com/PhenX/php-svg-lib", + "time": "2019-09-11T20:02:13+00:00" + }, + { + "name": "php-http/message-factory", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-http/message-factory.git", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Factory interfaces for PSR-7 HTTP Message", + "homepage": "http://php-http.org", + "keywords": [ + "factory", + "http", + "message", + "stream", + "uri" + ], + "time": "2015-12-19T14:08:53+00:00" + }, + { + "name": "phpoffice/phpspreadsheet", + "version": "1.12.0", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", + "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/f79611d6dc1f6b7e8e30b738fc371b392001dbfd", + "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-fileinfo": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "ext-zip": "*", + "ext-zlib": "*", + "markbaker/complex": "^1.4", + "markbaker/matrix": "^1.2", + "php": "^7.1", + "psr/simple-cache": "^1.0" + }, + "require-dev": { + "dompdf/dompdf": "^0.8.3", + "friendsofphp/php-cs-fixer": "^2.16", + "jpgraph/jpgraph": "^4.0", + "mpdf/mpdf": "^8.0", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.5", + "squizlabs/php_codesniffer": "^3.5", + "tecnickcom/tcpdf": "^6.3" + }, + "suggest": { + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "mpdf/mpdf": "Option for rendering PDF with PDF Writer", + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], "authors": [ { "name": "Maarten Balliauw", - "homepage": "http://blog.maartenballiauw.be" + "homepage": "https://blog.maartenballiauw.be" + }, + { + "name": "Mark Baker", + "homepage": "https://markbakeruk.net" + }, + { + "name": "Franck Lefevre", + "homepage": "https://rootslabs.net" }, { "name": "Erik Tilt" }, { - "name": "Franck Lefevre", - "homepage": "http://rootslabs.net" - }, - { - "name": "Mark Baker", - "homepage": "http://markbakeruk.net" + "name": "Adrien Crivelli" } ], - "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", - "homepage": "https://github.com/PHPOffice/PHPExcel", + "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", + "homepage": "https://github.com/PHPOffice/PhpSpreadsheet", "keywords": [ "OpenXML", "excel", + "gnumeric", + "ods", "php", "spreadsheet", "xls", "xlsx" ], - "abandoned": "phpoffice/phpspreadsheet", - "time": "2018-11-22T23:07:24+00:00" + "time": "2020-04-27T08:12:48+00:00" + }, + { + "name": "phpoption/phpoption", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae", + "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.3", + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "time": "2020-03-21T18:07:53+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.27", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc", + "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phing/phing": "~2.7", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "sami/sami": "~2.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "type": "library", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "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" }, { "name": "psr/container", @@ -2206,6 +3477,58 @@ ], "time": "2017-02-14T16:28:37+00:00" }, + { + "name": "psr/http-factory", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "time": "2019-04-30T12:38:16+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", @@ -2258,16 +3581,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -2301,7 +3624,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "psr/simple-cache", @@ -2353,32 +3676,30 @@ }, { "name": "psy/psysh", - "version": "v0.9.12", + "version": "v0.10.4", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "90da7f37568aee36b116a030c5f99c915267edd4" + "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/90da7f37568aee36b116a030c5f99c915267edd4", - "reference": "90da7f37568aee36b116a030c5f99c915267edd4", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560", + "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", - "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", - "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", - "php": ">=5.4.0", - "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0|~5.0", - "symfony/var-dumper": "~2.7|~3.0|~4.0|~5.0" + "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", + "php": "^8.0 || ^7.0 || ^5.5.9", + "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", + "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "~2.15|~3.16", - "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0" + "hoa/console": "3.17.*" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -2393,7 +3714,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.9.x-dev" + "dev-master": "0.10.x-dev" } }, "autoload": { @@ -2423,7 +3744,7 @@ "interactive", "shell" ], - "time": "2019-12-06T14:19:43+00:00" + "time": "2020-05-03T19:32:03+00:00" }, { "name": "ralouphie/getallheaders", @@ -2554,16 +3875,16 @@ }, { "name": "reliese/laravel", - "version": "v0.0.14", + "version": "v0.0.15", "source": { "type": "git", "url": "https://github.com/reliese/laravel.git", - "reference": "490d503836ca5e375c8d886cc2511c3b1ac43f71" + "reference": "2fe06849c7a96d17f245d5a9fff46081bf91e133" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reliese/laravel/zipball/490d503836ca5e375c8d886cc2511c3b1ac43f71", - "reference": "490d503836ca5e375c8d886cc2511c3b1ac43f71", + "url": "https://api.github.com/repos/reliese/laravel/zipball/2fe06849c7a96d17f245d5a9fff46081bf91e133", + "reference": "2fe06849c7a96d17f245d5a9fff46081bf91e133", "shasum": "" }, "require": { @@ -2609,7 +3930,52 @@ "laravel", "reliese" ], - "time": "2019-12-26T23:35:33+00:00" + "time": "2020-03-14T21:38:59+00:00" + }, + { + "name": "sabberworm/php-css-parser", + "version": "8.3.0", + "source": { + "type": "git", + "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", + "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", + "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "codacy/coverage": "^1.4", + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "autoload": { + "psr-0": { + "Sabberworm\\CSS": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Raphael Schweikert" + } + ], + "description": "Parser for CSS Files written in PHP", + "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser", + "keywords": [ + "css", + "parser", + "stylesheet" + ], + "time": "2019-02-22T07:42:52+00:00" }, { "name": "setasign/fpdf", @@ -2652,16 +4018,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.3.0", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "ff7e43e07abb97feb4a1cceaf72d75ce0e175ca0" + "reference": "50c388860a73191e010810ed57dbed795578e867" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/ff7e43e07abb97feb4a1cceaf72d75ce0e175ca0", - "reference": "ff7e43e07abb97feb4a1cceaf72d75ce0e175ca0", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/50c388860a73191e010810ed57dbed795578e867", + "reference": "50c388860a73191e010810ed57dbed795578e867", "shasum": "" }, "require": { @@ -2678,10 +4044,7 @@ "tecnickcom/tcpdf": "~6.2" }, "suggest": { - "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.", - "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.", - "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.", - "setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF." + "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured." }, "type": "library", "autoload": { @@ -2712,7 +4075,13 @@ "fpdi", "pdf" ], - "time": "2020-02-19T11:30:55+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi", + "type": "tidelift" + } + ], + "time": "2020-04-28T12:40:35+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -2778,16 +4147,16 @@ }, { "name": "symfony/console", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9" + "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9", - "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9", + "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7", + "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7", "shasum": "" }, "require": { @@ -2850,20 +4219,34 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-02-24T13:10:00+00:00" + "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-30T11:41:10+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.5", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44" + "reference": "5f8d5271303dad260692ba73dfa21777d38e124e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/a0b51ba9938ccc206d9284de7eb527c2d4550b44", - "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e", + "reference": "5f8d5271303dad260692ba73dfa21777d38e124e", "shasum": "" }, "require": { @@ -2903,20 +4286,34 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2020-02-04T09:41:09+00:00" + "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" }, { "name": "symfony/debug", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21" + "reference": "346636d2cae417992ecfd761979b2ab98b339a45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21", - "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21", + "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45", + "reference": "346636d2cae417992ecfd761979b2ab98b339a45", "shasum": "" }, "require": { @@ -2959,20 +4356,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2020-02-23T14:41:43+00:00" + "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" }, { "name": "symfony/error-handler", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be" + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/89aa4b9ac6f1f35171b8621b24f60477312085be", - "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358", + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358", "shasum": "" }, "require": { @@ -3015,20 +4426,34 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2020-02-26T11:45:31+00:00" + "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" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d" + "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d", - "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed", + "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed", "shasum": "" }, "require": { @@ -3085,7 +4510,21 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2020-02-04T09:32:40+00:00" + "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" }, { "name": "symfony/event-dispatcher-contracts", @@ -3147,16 +4586,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357" + "reference": "5729f943f9854c5781984ed4907bbb817735776b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357", - "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357", + "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", + "reference": "5729f943f9854c5781984ed4907bbb817735776b", "shasum": "" }, "require": { @@ -3192,20 +4631,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2020-02-14T07:42:58+00:00" + "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" }, { "name": "symfony/http-foundation", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648" + "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648", - "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2", + "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2", "shasum": "" }, "require": { @@ -3247,20 +4700,34 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2020-02-13T19:40:01+00:00" + "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-04-18T20:40:08+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8c8734486dada83a6041ab744709bdc1651a8462" + "reference": "1799a6c01f0db5851f399151abdb5d6393fec277" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8c8734486dada83a6041ab744709bdc1651a8462", - "reference": "8c8734486dada83a6041ab744709bdc1651a8462", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1799a6c01f0db5851f399151abdb5d6393fec277", + "reference": "1799a6c01f0db5851f399151abdb5d6393fec277", "shasum": "" }, "require": { @@ -3337,20 +4804,34 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2020-02-29T10:31:38+00:00" + "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-04-28T18:47:42+00:00" }, { "name": "symfony/mime", - "version": "v5.0.5", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c" + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c", - "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c", + "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b", + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b", "shasum": "" }, "require": { @@ -3399,20 +4880,34 @@ "mime", "mime-type" ], - "time": "2020-02-04T09:41:09+00:00" + "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-04-17T03:29:44+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "shasum": "" }, "require": { @@ -3424,7 +4919,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3457,20 +4952,34 @@ "polyfill", "portable" ], - "time": "2020-01-13T11:15:53+00:00" + "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-05-12T16:14:59+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "926832ce51059bb58211b7b2080a88e0c3b5328e" + "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/926832ce51059bb58211b7b2080a88e0c3b5328e", - "reference": "926832ce51059bb58211b7b2080a88e0c3b5328e", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424", + "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424", "shasum": "" }, "require": { @@ -3482,7 +4991,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3516,20 +5025,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "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-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a" + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a", - "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a", + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a", "shasum": "" }, "require": { @@ -3543,7 +5066,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3578,20 +5101,34 @@ "portable", "shim" ], - "time": "2020-01-17T12:01:36+00:00" + "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-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c", "shasum": "" }, "require": { @@ -3603,7 +5140,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3637,76 +5174,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" - }, - { - "name": "symfony/polyfill-php56", - "version": "v1.14.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/16ec91cb06998b609501b55b7177b7d7c02badb3", - "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.14-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "funding": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "url": "https://symfony.com/sponsor", + "type": "custom" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf" + "reference": "f048e612a3905f34931127360bdd2def19a5e582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", - "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582", + "reference": "f048e612a3905f34931127360bdd2def19a5e582", "shasum": "" }, "require": { @@ -3715,7 +5210,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3748,20 +5243,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "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-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.14.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675" + "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675", - "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc", + "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc", "shasum": "" }, "require": { @@ -3770,7 +5279,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3806,72 +5315,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.14.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ba3cfcea6d0192cae46c62041f61cbb704b526d3", - "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.14-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "funding": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "url": "https://symfony.com/sponsor", + "type": "custom" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/process", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7" + "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7", - "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7", + "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4", + "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4", "shasum": "" }, "require": { @@ -3907,20 +5378,98 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2020-02-07T20:06:44+00:00" + "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-04-15T15:56:18+00:00" }, { - "name": "symfony/routing", - "version": "v4.4.5", + "name": "symfony/psr-http-message-bridge", + "version": "v2.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "4124d621d0e445732520037f888a0456951bde8c" + "url": "https://github.com/symfony/psr-http-message-bridge.git", + "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4124d621d0e445732520037f888a0456951bde8c", - "reference": "4124d621d0e445732520037f888a0456951bde8c", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/ce709cd9c90872c08c2427b45739d5f3c781ab4f", + "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f", + "shasum": "" + }, + "require": { + "php": "^7.1", + "psr/http-message": "^1.0", + "symfony/http-foundation": "^4.4 || ^5.0" + }, + "require-dev": { + "nyholm/psr7": "^1.1", + "symfony/phpunit-bridge": "^4.4 || ^5.0" + }, + "suggest": { + "nyholm/psr7": "For a super lightweight PSR-7/17 implementation" + }, + "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bridge\\PsrHttpMessage\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "PSR HTTP message bridge", + "homepage": "http://symfony.com", + "keywords": [ + "http", + "http-message", + "psr-17", + "psr-7" + ], + "time": "2020-01-02T08:07:11+00:00" + }, + { + "name": "symfony/routing", + "version": "v4.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/routing.git", + "reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/routing/zipball/67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c", + "reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c", "shasum": "" }, "require": { @@ -3983,7 +5532,21 @@ "uri", "url" ], - "time": "2020-02-25T12:41:09+00:00" + "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-04-21T19:59:53+00:00" }, { "name": "symfony/service-contracts", @@ -4045,16 +5608,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "0a19a77fba20818a969ef03fdaf1602de0546353" + "reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353", - "reference": "0a19a77fba20818a969ef03fdaf1602de0546353", + "url": "https://api.github.com/repos/symfony/translation/zipball/8272bbd2b7e220ef812eba2a2b30068a5c64b191", + "reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191", "shasum": "" }, "require": { @@ -4117,7 +5680,21 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2020-02-04T09:32:40+00:00" + "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-04-12T16:45:36+00:00" }, { "name": "symfony/translation-contracts", @@ -4178,16 +5755,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.5", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2572839911702b0405479410ea7a1334bfab0b96" + "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2572839911702b0405479410ea7a1334bfab0b96", - "reference": "2572839911702b0405479410ea7a1334bfab0b96", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c587e04ce5d1aa62d534a038f574d9a709e814cf", + "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf", "shasum": "" }, "require": { @@ -4250,7 +5827,21 @@ "debug", "dump" ], - "time": "2020-02-24T13:10:00+00:00" + "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-04-12T16:14:02+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4303,29 +5894,36 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.6.1", + "version": "v3.6.4", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5" + "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5", - "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5", + "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": "^5.4 || ^7.0 || ^8.0", + "phpoption/phpoption": "^1.5", "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0" + "ext-filter": "*", + "ext-pcre": "*", + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-filter": "Required to use the boolean validator.", + "ext-pcre": "Required to use most of the library." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "3.6-dev" } }, "autoload": { @@ -4338,10 +5936,15 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "homepage": "https://gjcampbell.co.uk/" + }, { "name": "Vance Lucas", "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" + "homepage": "https://vancelucas.com/" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -4350,32 +5953,42 @@ "env", "environment" ], - "time": "2019-01-29T11:11:52+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], + "time": "2020-05-02T13:46:13+00:00" }, { "name": "yajra/laravel-datatables-oracle", - "version": "v8.13.7", + "version": "v9.10.0", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "17b50e3ee91ceb5b1cc6e596c366718af4ff45cc" + "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/17b50e3ee91ceb5b1cc6e596c366718af4ff45cc", - "reference": "17b50e3ee91ceb5b1cc6e596c366718af4ff45cc", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/b0b9e2c37b5a17ca35bb2c6d3927bf6176393229", + "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229", "shasum": "" }, "require": { - "illuminate/database": "5.4.*|5.5.*|5.6.*|5.7.*", - "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*", - "illuminate/http": "5.4.*|5.5.*|5.6.*|5.7.*", - "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*", - "illuminate/view": "5.4.*|5.5.*|5.6.*|5.7.*", - "php": ">=7.0" + "illuminate/database": "5.8.*|^6|^7", + "illuminate/filesystem": "5.8.*|^6|^7", + "illuminate/http": "5.8.*|^6|^7", + "illuminate/support": "5.8.*|^6|^7", + "illuminate/view": "5.8.*|^6|^7", + "php": "^7.1.3" }, "require-dev": { - "orchestra/testbench": "~3.5" + "orchestra/testbench": "^3.8" }, "suggest": { "yajra/laravel-datatables-buttons": "Plugin for server-side exporting of dataTables.", @@ -4386,7 +5999,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "9.0-dev" }, "laravel": { "providers": [ @@ -4421,22 +6034,106 @@ "jquery", "laravel" ], - "time": "2019-06-12T05:03:20+00:00" + "funding": [ + { + "url": "https://www.paypal.me/yajra", + "type": "custom" + }, + { + "url": "https://www.patreon.com/yajra", + "type": "patreon" + } + ], + "time": "2020-04-23T01:21:11+00:00" } ], "packages-dev": [ { - "name": "barryvdh/laravel-ide-helper", - "version": "v2.6.7", + "name": "barryvdh/laravel-debugbar", + "version": "v3.3.3", "source": { "type": "git", - "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "edd69c5e0508972c81f1f7173236de2459c45814" + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/edd69c5e0508972c81f1f7173236de2459c45814", - "reference": "edd69c5e0508972c81f1f7173236de2459c45814", + "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" + ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2020-05-05T10:53:32+00:00" + }, + { + "name": "barryvdh/laravel-ide-helper", + "version": "v2.7.0", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-ide-helper.git", + "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5f677edc14bdcfdcac36633e6eea71b2728a4dbc", + "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc", "shasum": "" }, "require": { @@ -4452,7 +6149,7 @@ "illuminate/config": "^5.5|^6|^7", "illuminate/view": "^5.5|^6|^7", "mockery/mockery": "^1.3", - "orchestra/testbench": "^3|^4", + "orchestra/testbench": "^3|^4|^5", "phpro/grumphp": "^0.17.1", "squizlabs/php_codesniffer": "^3" }, @@ -4494,7 +6191,13 @@ "phpstorm", "sublime" ], - "time": "2020-02-25T20:41:32+00:00" + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2020-04-22T09:57:26+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -4547,16 +6250,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e" + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e", - "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", "shasum": "" }, "require": { @@ -4599,20 +6302,30 @@ "ssl", "tls" ], - "time": "2020-01-13T10:02:55+00:00" + "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" }, { "name": "composer/composer", - "version": "1.9.3", + "version": "1.10.6", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b" + "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/1291a16ce3f48bfdeca39d64fca4875098af4d7b", - "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b", + "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88", + "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88", "shasum": "" }, "require": { @@ -4625,17 +6338,18 @@ "psr/log": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.7 || ^3.0 || ^4.0", - "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0", - "symfony/process": "^2.7 || ^3.0 || ^4.0" + "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0", + "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0", + "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0", + "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "conflict": { - "symfony/console": "2.8.38" + "symfony/console": "2.8.38", + "symfony/phpunit-bridge": "3.4.40" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7", - "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" + "phpspec/prophecy": "^1.10", + "symfony/phpunit-bridge": "^3.4" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -4648,7 +6362,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.10-dev" } }, "autoload": { @@ -4679,7 +6393,17 @@ "dependency", "package" ], - "time": "2020-02-04T11:58:49+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-05-06T08:28:10+00:00" }, { "name": "composer/semver", @@ -4804,16 +6528,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "cbe23383749496fe0f373345208b79568e4bc248" + "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248", - "reference": "cbe23383749496fe0f373345208b79568e4bc248", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7", + "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7", "shasum": "" }, "require": { @@ -4844,7 +6568,13 @@ "Xdebug", "performance" ], - "time": "2019-11-06T16:40:04+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + } + ], + "time": "2020-03-01T12:26:26+00:00" }, { "name": "doctrine/instantiator", @@ -4904,16 +6634,16 @@ }, { "name": "filp/whoops", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130" + "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", - "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", + "url": "https://api.github.com/repos/filp/whoops/zipball/17d0d3f266c8f925ebd035cd36f83cf802b47d4a", + "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a", "shasum": "" }, "require": { @@ -4961,7 +6691,7 @@ "throwable", "whoops" ], - "time": "2020-01-15T10:00:00+00:00" + "time": "2020-05-05T12:28:07+00:00" }, { "name": "fzaninotto/faker", @@ -5061,6 +6791,96 @@ ], "time": "2016-01-20T08:20:44+00:00" }, + { + "name": "jakub-onderka/php-console-color", + "version": "v0.2", + "source": { + "type": "git", + "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "jakub-onderka/php-code-style": "1.0", + "jakub-onderka/php-parallel-lint": "1.0", + "jakub-onderka/php-var-dump-check": "0.*", + "phpunit/phpunit": "~4.3", + "squizlabs/php_codesniffer": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "JakubOnderka\\PhpConsoleColor\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "jakub.onderka@gmail.com" + } + ], + "abandoned": "php-parallel-lint/php-console-color", + "time": "2018-09-29T17:23:10+00:00" + }, + { + "name": "jakub-onderka/php-console-highlighter", + "version": "v0.4", + "source": { + "type": "git", + "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "jakub-onderka/php-console-color": "~0.2", + "php": ">=5.4.0" + }, + "require-dev": { + "jakub-onderka/php-code-style": "~1.0", + "jakub-onderka/php-parallel-lint": "~1.0", + "jakub-onderka/php-var-dump-check": "~0.1", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "JakubOnderka\\PhpConsoleHighlighter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "acci@acci.cz", + "homepage": "http://www.acci.cz/" + } + ], + "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", + "time": "2018-09-29T18:48:56+00:00" + }, { "name": "justinrainbow/json-schema", "version": "5.2.9", @@ -5127,6 +6947,67 @@ ], "time": "2019-09-25T14:49:45+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", @@ -5242,16 +7123,16 @@ }, { "name": "nunomaduro/collision", - "version": "v2.1.1", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63" + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/af42d339fe2742295a54f6fdd42aaa6f8c4aca68", + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68", "shasum": "" }, "require": { @@ -5261,10 +7142,10 @@ "symfony/console": "~2.8|~3.3|~4.0" }, "require-dev": { - "laravel/framework": "5.7.*", + "laravel/framework": "5.8.*", "nunomaduro/larastan": "^0.3.0", - "phpstan/phpstan": "^0.10", - "phpunit/phpunit": "~7.3" + "phpstan/phpstan": "^0.11", + "phpunit/phpunit": "~8.0" }, "type": "library", "extra": { @@ -5302,7 +7183,7 @@ "php", "symfony" ], - "time": "2018-11-21T21:40:54+00:00" + "time": "2019-03-07T21:35:13+00:00" }, { "name": "phar-io/manifest", @@ -5408,24 +7289,21 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "shasum": "" }, "require": { "php": ">=7.1" }, - "require-dev": { - "phpunit/phpunit": "~6" - }, "type": "library", "extra": { "branch-alias": { @@ -5456,7 +7334,7 @@ "reflection", "static analysis" ], - "time": "2018-08-07T13:53:10+00:00" + "time": "2020-04-27T09:25:28+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -5559,16 +7437,16 @@ }, { "name": "phpspec/prophecy", - "version": "v1.10.2", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" + "reference": "451c3cd1418cf640de218914901e51b064abb093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9", - "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { @@ -5618,44 +7496,45 @@ "spy", "stub" ], - "time": "2020-01-20T15:57:02+00:00" + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "8.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "31e94ccc084025d6abee0585df533eb3a792b96a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a", + "reference": "31e94ccc084025d6abee0585df533eb3a792b96a", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "php": "^7.3", + "phpunit/php-file-iterator": "^3.0", + "phpunit/php-text-template": "^2.0", + "phpunit/php-token-stream": "^4.0", + "sebastian/code-unit-reverse-lookup": "^2.0", + "sebastian/environment": "^5.0", + "sebastian/version": "^3.0", + "theseer/tokenizer": "^1.1.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.0" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-pcov": "*", + "ext-xdebug": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "8.0-dev" } }, "autoload": { @@ -5681,32 +7560,32 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "time": "2020-02-19T13:41:19+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.2", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "050bedf145a257b1ff02746c31894800e5122946" + "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", - "reference": "050bedf145a257b1ff02746c31894800e5122946", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4", + "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -5731,26 +7610,90 @@ "filesystem", "iterator" ], - "time": "2018-09-13T20:33:42+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-18T05:02:12+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a", + "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.0" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "time": "2020-02-07T06:06:11+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346", + "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346", + "shasum": "" + }, + "require": { + "php": "^7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -5772,32 +7715,32 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2020-02-01T07:43:44+00:00" }, { "name": "phpunit/php-timer", - "version": "2.1.2", + "version": "3.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" + "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", - "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/dc9368fae6ef2ffa57eba80a7410bcef81df6258", + "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -5821,33 +7764,39 @@ "keywords": [ "timer" ], - "time": "2019-06-07T04:22:29+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-20T06:00:37+00:00" }, { "name": "phpunit/php-token-stream", - "version": "3.1.1", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" + "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", - "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c", + "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -5870,57 +7819,64 @@ "keywords": [ "tokenizer" ], - "time": "2019-09-17T06:23:10+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-05-06T09:56:31+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "9.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "2d7080c622cf7884992e7c3cf87853877bae8ff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2d7080c622cf7884992e7c3cf87853877bae8ff4", + "reference": "2d7080c622cf7884992e7c3cf87853877bae8ff4", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.2.0", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.9.1", + "phar-io/manifest": "^1.0.3", + "phar-io/version": "^2.0.1", + "php": "^7.3", + "phpspec/prophecy": "^1.8.1", + "phpunit/php-code-coverage": "^8.0.1", + "phpunit/php-file-iterator": "^3.0", + "phpunit/php-invoker": "^3.0", + "phpunit/php-text-template": "^2.0", + "phpunit/php-timer": "^3.1.4", + "sebastian/code-unit": "^1.0.2", + "sebastian/comparator": "^4.0", + "sebastian/diff": "^4.0", + "sebastian/environment": "^5.0.1", + "sebastian/exporter": "^4.0", + "sebastian/global-state": "^4.0", + "sebastian/object-enumerator": "^4.0", + "sebastian/resource-operations": "^3.0", + "sebastian/type": "^2.0", + "sebastian/version": "^3.0" }, "require-dev": { - "ext-pdo": "*" + "ext-pdo": "*", + "phpspec/prophecy-phpunit": "^2.0" }, "suggest": { "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "ext-xdebug": "*" }, "bin": [ "phpunit" @@ -5928,12 +7884,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "9.1-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5954,32 +7913,94 @@ "testing", "xunit" ], - "time": "2020-01-08T08:45:45+00:00" + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-30T06:32:53+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.1", + "name": "sebastian/code-unit", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5", + "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-30T05:58:10+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e", + "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e", + "shasum": "" + }, + "require": { + "php": "^7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -5999,34 +8020,34 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "time": "2020-02-07T06:20:13+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.2", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" + "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", - "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8", + "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8", "shasum": "" }, "require": { - "php": "^7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": "^7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6039,6 +8060,10 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -6050,10 +8075,6 @@ { "name": "Bernhard Schussek", "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" } ], "description": "Provides the functionality to compare PHP values for equality", @@ -6063,33 +8084,33 @@ "compare", "equality" ], - "time": "2018-07-12T15:12:46+00:00" + "time": "2020-02-07T06:08:51+00:00" }, { "name": "sebastian/diff", - "version": "3.0.2", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" + "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", - "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a", + "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.0", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6102,13 +8123,13 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], "description": "Diff implementation", @@ -6119,27 +8140,33 @@ "unidiff", "unified diff" ], - "time": "2019-02-04T06:01:07+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-05-08T05:01:12+00:00" }, { "name": "sebastian/environment", - "version": "4.2.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" + "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", - "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c", + "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.0" }, "suggest": { "ext-posix": "*" @@ -6147,7 +8174,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -6172,34 +8199,40 @@ "environment", "hhvm" ], - "time": "2019-11-20T08:46:58+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-14T13:36:52+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.2", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" + "reference": "80c26562e964016538f832f305b2286e1ec29566" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566", + "reference": "80c26562e964016538f832f305b2286e1ec29566", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/recursion-context": "^3.0" + "php": "^7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6239,27 +8272,30 @@ "export", "exporter" ], - "time": "2019-09-14T09:02:43+00:00" + "time": "2020-02-07T06:10:52+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bdb1e7c79e592b8c82cb1699be3c8743119b8a72", + "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^9.0" }, "suggest": { "ext-uopz": "*" @@ -6267,7 +8303,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6290,34 +8326,34 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2020-02-07T06:11:37+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.3", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + "reference": "e67516b175550abad905dc952f43285957ef4363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363", + "reference": "e67516b175550abad905dc952f43285957ef4363", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": "^7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6337,122 +8373,27 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "time": "2020-02-07T06:12:23+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" + "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", - "reference": "773f97c67f28de00d397be301821b06708fca0be", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7", + "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", - "shasum": "" - }, - "require": { - "php": "^7.1" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { @@ -6475,31 +8416,175 @@ "email": "sebastian@phpunit.de" } ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2018-10-04T04:07:39+00:00" + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2020-02-07T06:19:40+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "sebastian/recursion-context", + "version": "4.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "cdd86616411fc3062368b720b0425de10bd3d579" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579", + "reference": "cdd86616411fc3062368b720b0425de10bd3d579", "shasum": "" }, "require": { - "php": ">=5.6" + "php": "^7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2020-02-07T06:18:20+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98", + "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98", + "shasum": "" + }, + "require": { + "php": "^7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2020-02-07T06:13:02+00:00" + }, + { + "name": "sebastian/type", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1", + "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1", + "shasum": "" + }, + "require": { + "php": "^7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "time": "2020-02-07T06:13:43+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "0411bde656dce64202b39c2f4473993a9081d39e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e", + "reference": "0411bde656dce64202b39c2f4473993a9081d39e", + "shasum": "" + }, + "require": { + "php": "^7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" } }, "autoload": { @@ -6520,24 +8605,24 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2020-01-21T06:36:37+00:00" }, { "name": "seld/jsonlint", - "version": "1.7.2", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", "shasum": "" }, "require": { - "php": "^5.3 || ^7.0" + "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" @@ -6569,7 +8654,17 @@ "parser", "validator" ], - "time": "2019-10-24T14:27:39+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2020-04-30T19:05:18+00:00" }, { "name": "seld/phar-utils", @@ -6617,26 +8712,26 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.5", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd" + "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd", - "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91", + "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.5", "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -6663,7 +8758,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2020-01-21T08:20:44+00:00" + "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-04-12T14:40:17+00:00" }, { "name": "theseer/tokenizer", @@ -6707,16 +8816,16 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, "require": { @@ -6724,7 +8833,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -6751,18 +8860,17 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-04-18T12:12:48+00:00" } ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "laravelcollective/html": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.1.3" + "php": "^7.2.5" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/config/auth.php b/config/auth.php index 4345b95..e5a3224 100755 --- a/config/auth.php +++ b/config/auth.php @@ -42,7 +42,7 @@ return [ ], 'api' => [ - 'driver' => 'token', + 'driver' => 'passport', 'provider' => 'users', ], ], @@ -69,6 +69,10 @@ return [ 'driver' => 'eloquent', 'model' => App\User::class, ], + /* 'api_users' => [ + 'driver' => 'eloquent', + 'model' => App\ApiUser::class, + ],*/ // 'users' => [ // 'driver' => 'database', @@ -96,7 +100,7 @@ return [ 'provider' => 'users', 'table' => 'password_resets', 'expire' => 60, - ], + ] ], ]; diff --git a/config/database.php b/config/database.php index cab5d06..e939b89 100755 --- a/config/database.php +++ b/config/database.php @@ -50,7 +50,7 @@ return [ 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', - 'strict' => true, + 'strict' => false, 'engine' => null, ], diff --git a/config/excel.php b/config/excel.php deleted file mode 100644 index bf19051..0000000 --- a/config/excel.php +++ /dev/null @@ -1,704 +0,0 @@ - [ - - /* - |-------------------------------------------------------------------------- - | Enable/Disable cell caching - |-------------------------------------------------------------------------- - */ - 'enable' => true, - - /* - |-------------------------------------------------------------------------- - | Caching driver - |-------------------------------------------------------------------------- - | - | Set the caching driver - | - | Available methods: - | memory|gzip|serialized|igbinary|discISAM|apc|memcache|temp|wincache|sqlite|sqlite3 - | - */ - 'driver' => 'memory', - - /* - |-------------------------------------------------------------------------- - | Cache settings - |-------------------------------------------------------------------------- - */ - 'settings' => [ - - 'memoryCacheSize' => '32MB', - 'cacheTime' => 600 - - ], - - /* - |-------------------------------------------------------------------------- - | Memcache settings - |-------------------------------------------------------------------------- - */ - 'memcache' => [ - - 'host' => 'localhost', - 'port' => 11211, - - ], - - /* - |-------------------------------------------------------------------------- - | Cache dir (for discISAM) - |-------------------------------------------------------------------------- - */ - - 'dir' => storage_path('cache') - ], - - 'properties' => [ - 'creator' => 'Maatwebsite', - 'lastModifiedBy' => 'Maatwebsite', - 'title' => 'Spreadsheet', - 'description' => 'Default spreadsheet export', - 'subject' => 'Spreadsheet export', - 'keywords' => 'maatwebsite, excel, export', - 'category' => 'Excel', - 'manager' => 'Maatwebsite', - 'company' => 'Maatwebsite', - ], - - /* - |-------------------------------------------------------------------------- - | Sheets settings - |-------------------------------------------------------------------------- - */ - 'sheets' => [ - - /* - |-------------------------------------------------------------------------- - | Default page setup - |-------------------------------------------------------------------------- - */ - 'pageSetup' => [ - 'orientation' => 'portrait', - 'paperSize' => '9', - 'scale' => '100', - 'fitToPage' => false, - 'fitToHeight' => true, - 'fitToWidth' => true, - 'columnsToRepeatAtLeft' => ['', ''], - 'rowsToRepeatAtTop' => [0, 0], - 'horizontalCentered' => false, - 'verticalCentered' => false, - 'printArea' => null, - 'firstPageNumber' => null, - ], - ], - - /* - |-------------------------------------------------------------------------- - | Creator - |-------------------------------------------------------------------------- - | - | The default creator of a new Excel file - | - */ - - 'creator' => 'Maatwebsite', - - 'csv' => [ - /* - |-------------------------------------------------------------------------- - | Delimiter - |-------------------------------------------------------------------------- - | - | The default delimiter which will be used to read out a CSV file - | - */ - - 'delimiter' => ',', - - /* - |-------------------------------------------------------------------------- - | Enclosure - |-------------------------------------------------------------------------- - */ - - 'enclosure' => '"', - - /* - |-------------------------------------------------------------------------- - | Line endings - |-------------------------------------------------------------------------- - */ - - 'line_ending' => "\r\n", - - /* - |-------------------------------------------------------------------------- - | setUseBom - |-------------------------------------------------------------------------- - */ - - 'use_bom' => false - ], - - 'export' => [ - - /* - |-------------------------------------------------------------------------- - | Autosize columns - |-------------------------------------------------------------------------- - | - | Disable/enable column autosize or set the autosizing for - | an array of columns ( array('A', 'B') ) - | - */ - 'autosize' => true, - - /* - |-------------------------------------------------------------------------- - | Autosize method - |-------------------------------------------------------------------------- - | - | --> PHPExcel_Shared_Font::AUTOSIZE_METHOD_APPROX - | The default is based on an estimate, which does its calculation based - | on the number of characters in the cell value (applying any calculation - | and format mask, and allowing for wordwrap and rotation) and with an - | "arbitrary" adjustment based on the font (Arial, Calibri or Verdana, - | defaulting to Calibri if any other font is used) and a proportional - | adjustment for the font size. - | - | --> PHPExcel_Shared_Font::AUTOSIZE_METHOD_EXACT - | The second method is more accurate, based on actual style formatting as - | well (bold, italic, etc), and is calculated by generating a gd2 imagettf - | bounding box and using its dimensions to determine the size; but this - | method is significantly slower, and its accuracy is still dependent on - | having the appropriate fonts installed. - | - */ - 'autosize-method' => PHPExcel_Shared_Font::AUTOSIZE_METHOD_APPROX, - - /* - |-------------------------------------------------------------------------- - | Auto generate table heading - |-------------------------------------------------------------------------- - | - | If set to true, the array indices (or model attribute names) - | will automatically be used as first row (table heading) - | - */ - 'generate_heading_by_indices' => true, - - /* - |-------------------------------------------------------------------------- - | Auto set alignment on merged cells - |-------------------------------------------------------------------------- - */ - 'merged_cell_alignment' => 'left', - - /* - |-------------------------------------------------------------------------- - | Pre-calculate formulas during export - |-------------------------------------------------------------------------- - */ - 'calculate' => false, - - /* - |-------------------------------------------------------------------------- - | Include Charts during export - |-------------------------------------------------------------------------- - */ - 'includeCharts' => false, - - /* - |-------------------------------------------------------------------------- - | Default sheet settings - |-------------------------------------------------------------------------- - */ - 'sheets' => [ - - /* - |-------------------------------------------------------------------------- - | Default page margin - |-------------------------------------------------------------------------- - | - | 1) When set to false, default margins will be used - | 2) It's possible to enter a single margin which will - | be used for all margins. - | 3) Alternatively you can pass an array with 4 margins - | Default order: array(top, right, bottom, left) - | - */ - 'page_margin' => false, - - /* - |-------------------------------------------------------------------------- - | Value in source array that stands for blank cell - |-------------------------------------------------------------------------- - */ - 'nullValue' => null, - - /* - |-------------------------------------------------------------------------- - | Insert array starting from this cell address as the top left coordinate - |-------------------------------------------------------------------------- - */ - 'startCell' => 'A1', - - /* - |-------------------------------------------------------------------------- - | Apply strict comparison when testing for null values in the array - |-------------------------------------------------------------------------- - */ - 'strictNullComparison' => false - ], - - /* - |-------------------------------------------------------------------------- - | Store settings - |-------------------------------------------------------------------------- - */ - - 'store' => [ - - /* - |-------------------------------------------------------------------------- - | Path - |-------------------------------------------------------------------------- - | - | The path we want to save excel file to - | - */ - 'path' => storage_path('exports'), - - /* - |-------------------------------------------------------------------------- - | Return info - |-------------------------------------------------------------------------- - | - | Whether we want to return information about the stored file or not - | - */ - 'returnInfo' => false - - ], - - /* - |-------------------------------------------------------------------------- - | PDF Settings - |-------------------------------------------------------------------------- - */ - 'pdf' => [ - - /* - |-------------------------------------------------------------------------- - | PDF Drivers - |-------------------------------------------------------------------------- - | Supported: DomPDF, tcPDF, mPDF - */ - 'driver' => 'DomPDF', - - /* - |-------------------------------------------------------------------------- - | PDF Driver settings - |-------------------------------------------------------------------------- - */ - 'drivers' => [ - - /* - |-------------------------------------------------------------------------- - | DomPDF settings - |-------------------------------------------------------------------------- - */ - 'DomPDF' => [ - 'path' => base_path('vendor/dompdf/dompdf/') - ], - - /* - |-------------------------------------------------------------------------- - | tcPDF settings - |-------------------------------------------------------------------------- - */ - 'tcPDF' => [ - 'path' => base_path('vendor/tecnick.com/tcpdf/') - ], - - /* - |-------------------------------------------------------------------------- - | mPDF settings - |-------------------------------------------------------------------------- - */ - 'mPDF' => [ - 'path' => base_path('vendor/mpdf/mpdf/') - ], - ] - ] - ], - - 'filters' => [ - /* - |-------------------------------------------------------------------------- - | Register read filters - |-------------------------------------------------------------------------- - */ - - 'registered' => [ - 'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter' - ], - - /* - |-------------------------------------------------------------------------- - | Enable certain filters for every file read - |-------------------------------------------------------------------------- - */ - - 'enabled' => [] - ], - - 'import' => [ - - /* - |-------------------------------------------------------------------------- - | Has heading - |-------------------------------------------------------------------------- - | - | The sheet has a heading (first) row which we can use as attribute names - | - | Options: true|false|slugged|slugged_with_count|ascii|numeric|hashed|hashed_with_lower|trans|original - | - */ - - 'heading' => 'slugged', - - /* - |-------------------------------------------------------------------------- - | First Row with data or heading of data - |-------------------------------------------------------------------------- - | - | If the heading row is not the first row, or the data doesn't start - | on the first row, here you can change the start row. - | - */ - - 'startRow' => 1, - - /* - |-------------------------------------------------------------------------- - | Cell name word separator - |-------------------------------------------------------------------------- - | - | The default separator which is used for the cell names - | Note: only applies to 'heading' settings 'true' && 'slugged' - | - */ - - 'separator' => '_', - - /* - |-------------------------------------------------------------------------- - | Slug whitelisting - |-------------------------------------------------------------------------- - | - | Here you can whitelist certain characters in the slug. - | E.g. user.last_name will not remove . and _ - | Note: only applies to 'heading' settings 'true' && 'slugged' - | - */ - - 'slug_whitelist' => '._', - - /* - |-------------------------------------------------------------------------- - | Include Charts during import - |-------------------------------------------------------------------------- - */ - - 'includeCharts' => false, - - /* - |-------------------------------------------------------------------------- - | Sheet heading conversion - |-------------------------------------------------------------------------- - | - | Convert headings to ASCII - | Note: only applies to 'heading' settings 'true' && 'slugged' - | - */ - - 'to_ascii' => true, - - /* - |-------------------------------------------------------------------------- - | Import encoding - |-------------------------------------------------------------------------- - */ - - 'encoding' => [ - - 'input' => 'UTF-8', - 'output' => 'UTF-8' - - ], - - /* - |-------------------------------------------------------------------------- - | Calculate - |-------------------------------------------------------------------------- - | - | By default cells with formulas will be calculated. - | - */ - - 'calculate' => true, - - /* - |-------------------------------------------------------------------------- - | Ignore empty cells - |-------------------------------------------------------------------------- - | - | By default empty cells are not ignored - | - */ - - 'ignoreEmpty' => false, - - /* - |-------------------------------------------------------------------------- - | Force sheet collection - |-------------------------------------------------------------------------- - | - | For a sheet collection even when there is only 1 sheets. - | When set to false and only 1 sheet found, the parsed file will return - | a row collection instead of a sheet collection. - | When set to true, it will return a sheet collection instead. - | - */ - 'force_sheets_collection' => false, - - /* - |-------------------------------------------------------------------------- - | Date format - |-------------------------------------------------------------------------- - | - | The format dates will be parsed to - | - */ - - 'dates' => [ - - /* - |-------------------------------------------------------------------------- - | Enable/disable date formatting - |-------------------------------------------------------------------------- - */ - 'enabled' => true, - - /* - |-------------------------------------------------------------------------- - | Default date format - |-------------------------------------------------------------------------- - | - | If set to false, a carbon object will return - | - */ - 'format' => false, - - /* - |-------------------------------------------------------------------------- - | Date columns - |-------------------------------------------------------------------------- - */ - 'columns' => [] - ], - - /* - |-------------------------------------------------------------------------- - | Import sheets by config - |-------------------------------------------------------------------------- - */ - 'sheets' => [ - - /* - |-------------------------------------------------------------------------- - | Example sheet - |-------------------------------------------------------------------------- - | - | Example sheet "test" will grab the firstname at cell A2 - | - */ - - 'test' => [ - - 'firstname' => 'A2' - - ] - - ] - ], - - 'views' => [ - - /* - |-------------------------------------------------------------------------- - | Styles - |-------------------------------------------------------------------------- - | - | The default styles which will be used when parsing a view - | - */ - - 'styles' => [ - - /* - |-------------------------------------------------------------------------- - | Table headings - |-------------------------------------------------------------------------- - */ - 'th' => [ - 'font' => [ - 'bold' => true, - 'size' => 12, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Strong tags - |-------------------------------------------------------------------------- - */ - 'strong' => [ - 'font' => [ - 'bold' => true, - 'size' => 12, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Bold tags - |-------------------------------------------------------------------------- - */ - 'b' => [ - 'font' => [ - 'bold' => true, - 'size' => 12, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Italic tags - |-------------------------------------------------------------------------- - */ - 'i' => [ - 'font' => [ - 'italic' => true, - 'size' => 12, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 1 - |-------------------------------------------------------------------------- - */ - 'h1' => [ - 'font' => [ - 'bold' => true, - 'size' => 24, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 2 - |-------------------------------------------------------------------------- - */ - 'h2' => [ - 'font' => [ - 'bold' => true, - 'size' => 18, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 3 - |-------------------------------------------------------------------------- - */ - 'h3' => [ - 'font' => [ - 'bold' => true, - 'size' => 13.5, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 4 - |-------------------------------------------------------------------------- - */ - 'h4' => [ - 'font' => [ - 'bold' => true, - 'size' => 12, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 5 - |-------------------------------------------------------------------------- - */ - 'h5' => [ - 'font' => [ - 'bold' => true, - 'size' => 10, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Heading 6 - |-------------------------------------------------------------------------- - */ - 'h6' => [ - 'font' => [ - 'bold' => true, - 'size' => 7.5, - ] - ], - - /* - |-------------------------------------------------------------------------- - | Hyperlinks - |-------------------------------------------------------------------------- - */ - 'a' => [ - 'font' => [ - 'underline' => true, - 'color' => ['argb' => 'FF0000FF'], - ] - ], - - /* - |-------------------------------------------------------------------------- - | Horizontal rules - |-------------------------------------------------------------------------- - */ - 'hr' => [ - 'borders' => [ - 'bottom' => [ - 'style' => 'thin', - 'color' => ['FF000000'] - ], - ] - ] - ] - - ] - -); diff --git a/config/filesystems.php b/config/filesystems.php index 67ac153..7260e0c 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -53,6 +53,12 @@ return [ 'url' => env('APP_URL').'/storage/users', 'visibility' => 'public', ], + 'import' => [ + 'driver' => 'local', + 'root' => storage_path("app/import"), + 'url' => env('APP_URL').'/storage/app/import', + + ], 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), diff --git a/database/migrations/2018_09_29_145909_create_countries_table.php b/database/migrations/2018_09_29_145909_create_countries_table.php index 3e8e026..5bd2555 100644 --- a/database/migrations/2018_09_29_145909_create_countries_table.php +++ b/database/migrations/2018_09_29_145909_create_countries_table.php @@ -24,6 +24,15 @@ class CreateCountriesTable extends Migration $table->string('it', 100); $table->string('ru', 100); + $table->boolean('active')->default(true); + + $table->boolean('switch')->default(false); + $table->boolean('own_eur')->default(false); + $table->boolean('currency')->default(false); + $table->string('currency_unit', 10)->nullable(); + $table->boolean('currency_calc')->default(false); + $table->decimal('currency_faktor', 4, 2)->nullable(); + $table->boolean('active')->default(true); $table->text('trans_name')->nullable(); $table->text('attr')->nullable(); diff --git a/database/migrations/2018_10_21_164001_create_products_table.php b/database/migrations/2018_10_21_164001_create_products_table.php index 5221e75..9f2db0f 100644 --- a/database/migrations/2018_10_21_164001_create_products_table.php +++ b/database/migrations/2018_10_21_164001_create_products_table.php @@ -40,6 +40,8 @@ class CreateProductsTable extends Migration $table->unsignedTinyInteger('unit')->nullable(); $table->string('number')->nullable(); + $table->unsignedInteger('wp_number')->nullable(); + $table->string('icons')->nullable(); //as array cast $table->text('description')->nullable(); diff --git a/database/migrations/2019_02_23_161530_create_shopping_users_table.php b/database/migrations/2019_02_23_161530_create_shopping_users_table.php index 29c986f..f9dab52 100644 --- a/database/migrations/2019_02_23_161530_create_shopping_users_table.php +++ b/database/migrations/2019_02_23_161530_create_shopping_users_table.php @@ -52,10 +52,20 @@ class CreateShoppingUsersTable extends Migration $table->string('shipping_phone')->nullable(); $table->boolean('abo_options')->default(false); + $table->boolean('has_buyed')->default(false); + $table->boolean('subscribed')->default(false); $table->text('notice')->default(false); + $table->char('mode', 4)->nullable(); + + $table->unsignedInteger('wp_order_number')->nullable(); + $table->timestamp('wp_order_date')->nullable(); + $table->timestamps(); + $table->softDeletes(); + $table->timestamp('user_deleted_at')->nullable(); + $table->foreign('billing_country_id') ->references('id') diff --git a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php index 896fe66..aa1fff8 100644 --- a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php +++ b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php @@ -40,8 +40,9 @@ class CreateShoppingOrdersTable extends Migration $table->char('mode', 4)->nullable(); - $table->timestamps(); + $table->softDeletes(); + $table->timestamp('user_deleted_at')->nullable(); $table->foreign('shopping_user_id') ->references('id') @@ -50,7 +51,7 @@ class CreateShoppingOrdersTable extends Migration $table->foreign('country_id') ->references('id') - ->on('countries'); + ->on('shipping_countries'); $table->foreign('user_shop_id') ->references('id') diff --git a/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php b/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php index c6c826f..70c8d94 100644 --- a/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php +++ b/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php @@ -24,6 +24,9 @@ class CreateShoppingOrderItemsTable extends Migration $table->string('slug')->nullable(); $table->timestamps(); + $table->softDeletes(); + $table->timestamp('user_deleted_at')->nullable(); + $table->foreign('shopping_order_id') ->references('id') diff --git a/database/migrations/2020_06_03_152445_create_country_prices_table.php b/database/migrations/2020_06_03_152445_create_country_prices_table.php new file mode 100644 index 0000000..5f7ed38 --- /dev/null +++ b/database/migrations/2020_06_03_152445_create_country_prices_table.php @@ -0,0 +1,49 @@ +increments('id'); + + $table->unsignedInteger('country_id')->index(); + $table->unsignedInteger('product_id')->index(); + + $table->decimal('c_price', 8, 2)->nullable(); + $table->decimal('c_tax', 5, 2)->nullable(); + $table->decimal('c_price_old', 8, 2)->nullable(); + + $table->decimal('c_currency', 8, 2)->nullable(); + + $table->timestamps(); + + $table->foreign('country_id') + ->references('id') + ->on('countries'); + + $table->foreign('product_id') + ->references('id') + ->on('products'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('country_prices'); + } +} diff --git a/public/.htaccess b/public/.htaccess index 05dfde8..0e24be4 100755 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,3 +1,4 @@ +#php_value memory_limit 512MB Options -MultiViews -Indexes diff --git a/public/css/application.css b/public/css/application.css index ab97437..23c815b 100644 --- a/public/css/application.css +++ b/public/css/application.css @@ -51,4 +51,26 @@ a[aria-expanded='true'] > .fa-caret-expand:before { .text-match{ color:#295B28; +} + +.sidenav-vertical .sidenav-menu { + padding-top: 0.225rem; + padding-bottom: 0.225rem; +} + +.sidenav-vertical .sidenav-menu .sidenav-link { + padding-top: 0.525rem; + padding-bottom: 0.525rem; +} + +.form-control.has-error .form-control { + border: 1px solid #ea8e49; +} + +.form-group.has-error .form-control { + border: 1px solid #ea8e49; +} + +.has-error .help-block{ + color: #a94442; } \ No newline at end of file diff --git a/public/phpinfo.php b/public/phpinfo.php new file mode 100644 index 0000000..d7c3469 --- /dev/null +++ b/public/phpinfo.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/resources/lang/de.json b/resources/lang/de.json index 64d9426..b08c741 100755 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -1,201 +1 @@ -{ - "MR": "Herr", - "MS": "Frau", - "please select": "Bitte w\u00e4hlen", - "further countries": "weitere L\u00e4nder", - "no": "Keine", - "Company data": "Firmendaten", - "Company name": "Firmenname", - "Street": "Stra\u00dfe", - "House number": "Hausnummer", - "City": "Ort", - "Postcode": "PLZ", - "Country": "Land", - "Phone": "Telefon", - "Homepage": "Homepage", - "Industry": "Branche", - "Industries": "Branchen", - "Main Industry": "Hauptbranche", - "Personal Data": "Persönliche Daten", - "Function": "Funktion", - "Salutation": "Anrede", - "Title": "Titel", - "First name": "Vorname", - "Last name": "Nachname", - "Mobile Phone": "Mobiltelefon", - "Your interests": "Deine Interessen", - "Your contact person": "Dein Ansprechpartner", - "Name": "Name", - "Consent & Privacy": "Einwilligung & Datenschutz", - "New Password": "Neues Passwort", - "Old Password": "Altes Passwort", - "Change Password": "Passwort \u00e4ndern", - "Confirm new Password": "Neues Passwort wiederholen", - "Confirm Password": "Passwort best\u00e4tigen", - "Confirm E-Mail": "E-Mail wiederholen", - "E-Mail Address": "E-Mail Adresse", - "Confirm E-Mail Address": "E-Mail Adresse wiederholen", - "Forgot your Password?": "Passwort vergessen?", - "Login": "Einloggen", - "Logout": "Ausloggen", - "Password": "Passwort", - "Register": "Registrieren", - "Remember Me": "Angemeldet bleiben", - "Reset Password": "Passwort zur\u00fccksetzen", - "Send Password Reset Link": "Link zum Zur\u00fccksetzen des Passworts senden", - "save": "speichern", - "save and next": "speichern und weiter", - "save changes": "\u00c4nderungen speichern", - "abort": "abbrechen", - "This field is required.": "Dieses Feld ist ein Pflichtfeld.", - "Please enter a valid email address.": "Bitte gebe eine g\u00fcltige E-Mail-Adresse ein.", - "This E-mail is already in use.": "Diese E-Mail wird bereits verwendet.", - "Please enter the same value again.": "Die E-Mail Adressen sind nicht gleich.", - "a valid e-mail address": "Gebe bitte eine g\u00fcltige E-Mail-Adresse ein.", - "Already have an account?": "Hast Du schon einen Account?", - "Login to your account": "Melde Dich in Deinem Account an", - "Dont have an account yet?": "Du hast noch keinen Account?", - "We keep you up to date on product news": "Gerne informieren wir Dich \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:", - "Registration": "Registrierung", - "that\u2019s how it\u2019s done": "so geht\u2019s", - "Just register": "Einfach registrieren", - "Just fill out the fields": "F\u00fclle einfach die Felder in der Eingabemaske aus. Danach erhälst Du von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigst Du Deine Registrierung.", - "Changeable at any time": "Jederzeit \u00e4nderbar", - "With your e-mail address and password": "Mit Deiner E-Mailadresse und Deinem Passwort kannst Du jederzeit Deine Daten einsehen oder \u00e4ndern.", - "Absolutely safe": "Absolut sicher", - "Your data will be stored on": "Deine Daten werden auf deutschen Servern unter Ber\u00fccksichtigung aktueller Sicherheitsstandards gespeichert.", - "now register data": "jetzt Daten registieren", - "Required fields": "Pflichtfelder", - "You will receive an e-mail for confirmation": "Du erhälst eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schaltest Du Deine Daten frei.", - "Industry sectors": "Branchen", - "Interests": "Interessen", - "Leads": "Kontakte", - "Your Data": "Deine Daten", - "Change password": "Passwort \u00e4ndern", - "Edit your data": "Deine Daten bearbeiten", - "I have read the :link and accept it.*": "Ich habe die :link gelesen und akzeptiere diese.*", - "data protection": "Datenschutzerkl\u00e4rung", - "Yes, I agree that will send me more information.": "Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit \u00fcber diese Webseite widerrufbar.", - "saved": "Gespeichert", - "The changes have been saved.": "Die \u00c4nderungen wurden gespeichert.", - "error": "Fehler", - "Delete Account": "Account l\u00f6schen", - "account deleted": "Account gel\u00f6schen", - "Here you can adjust your data.": "Hier kannst du Deine Daten anpassen.", - "Overview": "\u00dcbersicht", - "Adjust data": "Daten anpassen", - "Data, Login & Security": "Daten, Anmeldung & Sicherheit", - "Sign in with your e-mail:": "Anmeldung mit Deiner E-Mail:", - "Change your password here to access your account.": "\u00c4ndere hier Dein Passwort f\u00fcr den Zugriff auf Deinen Account.", - "Activities": "Aktivit\u00e4ten", - "Delete": "L\u00f6schen", - "If you no longer want to use our offer, you can delete your account here.": "Wenn Du unser Angebot nicht mehr nutzen m\u00f6chten, kannst Du hier Deinen Account l\u00f6schen.", - "Confirm your identity with your password before proceeding.": "Best\u00e4tige mit Deinem Passwort Deine Identit\u00e4t, bevor du weiter machst.", - "imprint": "Impressum", - "data protections": "Datenschutz", - "E-Mail address can not be changed!": "E-Mail Adresse ist nicht \u00e4nderbar!", - "E-Mail address can not be changed here!": "E-Mail Adresse kann hier nicht ge\u00e4ndert werden!", - "Thank you for your registration!": "Vielen Dank f\u00fcr Deine Registrierung!", - "We have sent you an e-mail with a link to activate your data.": "Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.", - "Please check your emails and confirm the link.": "Bitte rufe Deine E-Mails ab und bestätige den Link.", - "back to the homepage": "zur\u00fcck zur Startseite", - "You have successfully verified your account!": "Du hast Dein Konto erfolgreich verifiziert!", - "Now check your data and release the data.": "\u00dcberpr\u00fcfe jetzt Deine Daten und gebe Deine die Daten frei.", - "Check and release data": "Daten \u00fcberpr\u00fcfen und freigeben", - "Check data": "Daten \u00fcberpr\u00fcfen", - "Page not available": "Seite nicht verf\u00fcgbar", - "Data released": "Daten freigeben", - "Data released now": "Daten jetzt freigeben", - "E-Mail verified": "E-Mail verifiziert", - "E-Mail not verified": "E-Mail nicht verifiziert", - "Privacy policy approved": "Datenschutzerkl\u00e4rung zugestimmt", - "Consent for further information": "Einwilligung f\u00fcr weitere Informationen", - "at": "am", - "Assign a password for your account.": "Gib ein Passwort f\u00fcr Deinen Account ein.", - "Create Password": "Passwort erstellen", - "back": "zur\u00fcck", - "If you have checked your data, share your data here!": "Wenn Du Deine Daten \u00fcberpr\u00fcft hast, gib Deine Daten hier frei!", - "Contacts all": "gesamte Kontakte", - "Contacts verify": "Kontakte verifiziert", - "Contacts active": "Kontakte freigeschaltet", - "This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Deinem Besuch auf dieser Seite stimmst Du der Verwendung von Cookies zu.", - "OK": "OK", - "Contacts": "Kontake", - "active": "aktiviert", - "inactive": "deaktiviert", - "verified": "verifiziert", - "'E-Mail": "'E-Mail", - "create new Contact": "Neuen Kontakt erstellen", - "Create\/Edit Contact": "Kontakt bearbeiten\/erstellen", - "Pos": "Pos", - "Description": "Bezeichnung", - "Translate": "\u00dcbersetzung", - "Status": "Status", - "create\/edit": "erstellen\/bearbeiten", - "when active, the interest in the selection is displayed": "wenn aktiv, wird das Interesse in der Aushwahl angezeigt", - "close": "schlie\u00dfen", - "Number to move the position if necessary": "Zahl um ggf. die Postion zu verschieben", - "Create new interest": "Neues Interesse erstellen", - "Really delete entry?": "Eintrag wirklich l\u00f6schen?", - "Create a new industry": "Neue Branche erstellen", - "Your e-mail has been changed.": "Deine E-Mail wurde ge\u00e4ndert.", - "We sent you an activation code. Check your email!": "Wir haben Dir einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Deine E-Mails!", - "An activation code was sent to the account by e-mail!": "An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!", - "New E-Mail Address": "Neue E-Mail Adresse", - "Confirm new E-Mail": "Neue E-Mail Adresse wiederholen", - "Change E-Mail": "E-Mail Adresse \u00e4ndern", - "Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "\u00c4ndere hier Deine E-Mail-Adresse. Wir senden Dir einen neuen Aktivierungslink an Deine neue E-Mail-Adresse, um diese zu verifizieren.", - "Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "\u00c4nder hier Deine E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.", - "business": "gesch\u00e4ftlich", - "private": "privat", - "business or private": "gesch\u00e4ftlich oder privat", - "use": "Nutzung", - "Country code": "L\u00e4ndervorwahl", - "Contact": "Kontakt", - "waiting for activation since": "wartet auf Aktivierung seit", - "edit": "bearbeiten", - "delete": "l\u00f6schen", - "your mivita.care team": "Dein Team von mivita.care", - "create new password": "neues Passwort erstellen", - "Now assign a password.": "Vergebe jetzt Dein Passwort für den Zugriff auf Deinen Account.", - "to your data":"zu Deinen Daten", - "Your registration has already been completed.":"Deine Registrierung wurde bereits abgeschlossen.", - "The link to register is no longer active.":"Der Link zur Registrierung ist nicht mehr aktiv, oder die Registrierung ist bereits abgeschlossen", - "go to login": "zur Anmeldung", - "Please confirm your data first.": "Bitte überprüfen Deine Daten als erstes und bestätige diese.", - "yes, data checked and share":"Ja, Daten überprüft und jetzt freigeben", - "Declaration of shop": "Hiermit bestätige und akzeptiere ich die Nutzungsbedinungen zu meinem mivita-Shop.", - "Your Shop": "Dein Shop", - "Terms of Use": "Nutzungsbedingungen", - "Your Shop Name" : "Gib deinem Shop einen Namen", - "Choose Your Shop Name" : "Wähle einen einprägsamen Shop-Namen, der zu Dir passt.", - "shop_name_error_1":"Dein Shop-Name darf nur lateinische Buchstaben ohne Akzent sowie Ziffern enthalten, keine Leerzeichen.", - "shop_name_error_2":"Shop-Namen müssen 4 bis 20 Zeichen lang sein.", - "shop_name_description":"Dein Shop-Name wird in Deinem Shop angezeigt. Aus Deinem Shop-Namen wird die Internet-Adresse (Domain) erstellt, mit der Dein Shop aufgerufen werden kann. Wähle Deinen Shop-Namen sorgfältig aus, dieser ist später nur gegen eine Gebühr von 50,- Euro änderbar.", - "save and continue":"speichern und fortfahren", - "shop_title": "Shop Inhaber", - "shop_title_help": "Gib Deinen Namen zum Shop an.", - "shop_contact": "Shop Kontakt", - "shop_contact_help": "Vervollständige Deine Kontaktdaten die im Shop angezeigt werden.", - "shop_accessibility": "Shop Erreichbarkeit", - "shop_accessibility_help": "Gib Deine Erreichbarkeit an.", - "shop_about": "Shop persönlicher Text", - "shop_about_help": "Gib Deinen persönlicher Text über Dich an. (max. 190 Zeichen)", - "Shop details":"Shop Details", - "available":"erreichbar", - "not available":"nicht erreichbar", - "active since":"Aktiv seit", - "open since":"Eröffnet seit", - "Domain":"Domain", - "name":"Name", - "not available copy":" Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schaue in einigen Minuten noch einmal nach.", - "shop image":"Dein Shop Bild", - "shop image copy":"Lade hier ein Foto / Bild / Logo von Dir hoch.", - "shop on site":"Für Dich vor Ort:", - "shop on site copy":"Warst du auf der Aloe Vera Farm auf Mallorca? Lade hier bis zu 6 Bilder von Dir hoch.", - "open your shop": "Eröffne Deinen eigenen mivita-Shop", - "settings your shop":"Deine Shop-Einstellungen", - "taxable_sales_1":"umsatzsteuerpflichtig (Ich mache eine UST-Voranmeldung pro Monat / Quartal / Jahr ans Finanzamt)", - "taxable_sales_2":"nicht umsatzsteuerpflichtig (Kleinunternehmer im Sinne von § 19)", - "": "" -} \ No newline at end of file +{"MR":"Herr","MS":"Frau","please select":"Bitte w\u00e4hlen","further countries":"weitere L\u00e4nder","no":"Keine","Company data":"Firmendaten","Company name":"Firmenname","Street":"Stra\u00dfe","House number":"Hausnummer","City":"Ort","Postcode":"PLZ","Country":"Land","Phone":"Telefon","Homepage":"Homepage","Industry":"Branche","Industries":"Branchen","Main Industry":"Hauptbranche","Personal Data":"Pers\u00f6nliche Daten","Function":"Funktion","Salutation":"Anrede","Title":"Titel","First name":"Vorname","Last name":"Nachname","Mobile Phone":"Mobiltelefon","Your interests":"Deine Interessen","Your contact person":"Dein Ansprechpartner","Name":"Name","Consent & Privacy":"Einwilligung & Datenschutz","New Password":"Neues Passwort","Old Password":"Altes Passwort","Change Password":"Passwort \u00e4ndern","Confirm new Password":"Neues Passwort wiederholen","Confirm Password":"Passwort best\u00e4tigen","Confirm E-Mail":"E-Mail wiederholen","E-Mail Address":"E-Mail Adresse","Confirm E-Mail Address":"E-Mail Adresse wiederholen","Forgot your Password?":"Passwort vergessen?","Login":"Einloggen","Logout":"Ausloggen","Password":"Passwort","Register":"Registrieren","Remember Me":"Angemeldet bleiben","Reset Password":"Passwort zur\u00fccksetzen","Send Password Reset Link":"Link zum Zur\u00fccksetzen des Passworts senden","save":"speichern","save and next":"speichern und weiter","save changes":"\u00c4nderungen speichern","abort":"abbrechen","This field is required.":"Dieses Feld ist ein Pflichtfeld.","Please enter a valid email address.":"Bitte gebe eine g\u00fcltige E-Mail-Adresse ein.","This E-mail is already in use.":"Diese E-Mail wird bereits verwendet.","Please enter the same value again.":"Die E-Mail Adressen sind nicht gleich.","a valid e-mail address":"Gebe bitte eine g\u00fcltige E-Mail-Adresse ein.","Already have an account?":"Hast Du schon einen Account?","Login to your account":"Melde Dich in Deinem Account an","Dont have an account yet?":"Du hast noch keinen Account?","We keep you up to date on product news":"Gerne informieren wir Dich \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:","Registration":"Registrierung","that\u2019s how it\u2019s done":"so geht\u2019s","Just register":"Einfach registrieren","Just fill out the fields":"F\u00fclle einfach die Felder in der Eingabemaske aus. Danach erh\u00e4lst Du von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigst Du Deine Registrierung.","Changeable at any time":"Jederzeit \u00e4nderbar","With your e-mail address and password":"Mit Deiner E-Mailadresse und Deinem Passwort kannst Du jederzeit Deine Daten einsehen oder \u00e4ndern.","Absolutely safe":"Absolut sicher","Your data will be stored on":"Deine Daten werden auf deutschen Servern unter Ber\u00fccksichtigung aktueller Sicherheitsstandards gespeichert.","now register data":"jetzt Daten registieren","Required fields":"Pflichtfelder","You will receive an e-mail for confirmation":"Du erh\u00e4lst eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schaltest Du Deine Daten frei.","Industry sectors":"Branchen","Interests":"Interessen","Leads":"Kontakte","Your Data":"Deine Daten","Change password":"Passwort \u00e4ndern","Edit your data":"Deine Daten bearbeiten","I have read the :link and accept it.*":"Ich habe die :link gelesen und akzeptiere diese.*","data protection":"Datenschutzerkl\u00e4rung","Yes, I agree that will send me more information.":"Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit \u00fcber diese Webseite widerrufbar.","saved":"Gespeichert","The changes have been saved.":"Die \u00c4nderungen wurden gespeichert.","error":"Fehler","Delete Account":"Account l\u00f6schen","account deleted":"Account gel\u00f6schen","Here you can adjust your data.":"Hier kannst du Deine Daten anpassen.","Overview":"\u00dcbersicht","Adjust data":"Daten anpassen","Data, Login & Security":"Daten, Anmeldung & Sicherheit","Sign in with your e-mail:":"Anmeldung mit Deiner E-Mail:","Change your password here to access your account.":"\u00c4ndere hier Dein Passwort f\u00fcr den Zugriff auf Deinen Account.","Activities":"Aktivit\u00e4ten","Delete":"l\u00f6schen","If you no longer want to use our offer, you can delete your account here.":"Wenn Du unser Angebot nicht mehr nutzen m\u00f6chten, kannst Du hier Deinen Account l\u00f6schen.","Confirm your identity with your password before proceeding.":"Best\u00e4tige mit Deinem Passwort Deine Identit\u00e4t, bevor du weiter machst.","imprint":"Impressum","data protections":"Datenschutz","E-Mail address can not be changed!":"E-Mail Adresse ist nicht \u00e4nderbar!","E-Mail address can not be changed here!":"E-Mail Adresse kann hier nicht ge\u00e4ndert werden!","Thank you for your registration!":"Vielen Dank f\u00fcr Deine Registrierung!","We have sent you an e-mail with a link to activate your data.":"Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.","Please check your emails and confirm the link.":"Bitte rufe Deine E-Mails ab und best\u00e4tige den Link.","back to the homepage":"zur\u00fcck zur Startseite","You have successfully verified your account!":"Du hast Dein Konto erfolgreich verifiziert!","Now check your data and release the data.":"\u00dcberpr\u00fcfe jetzt Deine Daten und gebe Deine die Daten frei.","Check and release data":"Daten \u00fcberpr\u00fcfen und freigeben","Check data":"Daten \u00fcberpr\u00fcfen","Page not available":"Seite nicht verf\u00fcgbar","Data released":"Daten freigeben","Data released now":"Daten jetzt freigeben","E-Mail verified":"E-Mail verifiziert","E-Mail not verified":"E-Mail nicht verifiziert","Privacy policy approved":"Datenschutzerkl\u00e4rung zugestimmt","Consent for further information":"Einwilligung f\u00fcr weitere Informationen","at":"am","Assign a password for your account.":"Gib ein Passwort f\u00fcr Deinen Account ein.","Create Password":"Passwort erstellen","back":"zur\u00fcck","If you have checked your data, share your data here!":"Wenn Du Deine Daten \u00fcberpr\u00fcft hast, gib Deine Daten hier frei!","Contacts all":"gesamte Kontakte","Contacts verify":"Kontakte verifiziert","Contacts active":"Kontakte freigeschaltet","This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.":"Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Deinem Besuch auf dieser Seite stimmst Du der Verwendung von Cookies zu.","OK":"OK","Contacts":"Kontake","active":"aktiviert","inactive":"deaktiviert","verified":"verifiziert","'E-Mail":"'E-Mail","create new Contact":"Neuen Kontakt erstellen","Create\/Edit Contact":"Kontakt bearbeiten\/erstellen","Pos":"Pos","Description":"Bezeichnung","Translate":"\u00dcbersetzung","Status":"Status","create\/edit":"erstellen\/bearbeiten","when active, the interest in the selection is displayed":"wenn aktiv, wird das Interesse in der Aushwahl angezeigt","close":"schlie\u00dfen","Number to move the position if necessary":"Zahl um ggf. die Postion zu verschieben","Create new interest":"Neues Interesse erstellen","Really delete entry?":"Eintrag wirklich l\u00f6schen?","Create a new industry":"Neue Branche erstellen","Your e-mail has been changed.":"Deine E-Mail wurde ge\u00e4ndert.","We sent you an activation code. Check your email!":"Wir haben Dir einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Deine E-Mails!","An activation code was sent to the account by e-mail!":"An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!","New E-Mail Address":"Neue E-Mail Adresse","Confirm new E-Mail":"Neue E-Mail Adresse wiederholen","Change E-Mail":"E-Mail Adresse \u00e4ndern","Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.":"\u00c4ndere hier Deine E-Mail-Adresse. Wir senden Dir einen neuen Aktivierungslink an Deine neue E-Mail-Adresse, um diese zu verifizieren.","Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.":"\u00c4nder hier Deine E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.","business":"gesch\u00e4ftlich","private":"privat","business or private":"gesch\u00e4ftlich oder privat","use":"Nutzung","Country code":"L\u00e4ndervorwahl","Contact":"Kontakt","waiting for activation since":"wartet auf Aktivierung seit","edit":"bearbeiten","delete":"l\u00f6schen","your mivita.care team":"Dein Team von mivita.care","create new password":"neues Passwort erstellen","Now assign a password.":"Vergebe jetzt Dein Passwort f\u00fcr den Zugriff auf Deinen Account.","to your data":"zu Deinen Daten","Your registration has already been completed.":"Deine Registrierung wurde bereits abgeschlossen.","The link to register is no longer active.":"Der Link zur Registrierung ist nicht mehr aktiv, oder die Registrierung ist bereits abgeschlossen","go to login":"zur Anmeldung","Please confirm your data first.":"Bitte \u00fcberpr\u00fcfen Deine Daten als erstes und best\u00e4tige diese.","yes, data checked and share":"Ja, Daten \u00fcberpr\u00fcft und jetzt freigeben","Declaration of shop":"Hiermit best\u00e4tige und akzeptiere ich die Nutzungsbedinungen zu meinem mivita-Shop.","Your Shop":"Dein Shop","Terms of Use":"Nutzungsbedingungen","Your Shop Name":"Gib deinem Shop einen Namen","Choose Your Shop Name":"W\u00e4hle einen einpr\u00e4gsamen Shop-Namen, der zu Dir passt.","shop_name_error_1":"Dein Shop-Name darf nur lateinische Buchstaben ohne Akzent sowie Ziffern enthalten, keine Leerzeichen.","shop_name_error_2":"Shop-Namen m\u00fcssen 4 bis 20 Zeichen lang sein.","shop_name_description":"Dein Shop-Name wird in Deinem Shop angezeigt. Aus Deinem Shop-Namen wird die Internet-Adresse (Domain) erstellt, mit der Dein Shop aufgerufen werden kann. W\u00e4hle Deinen Shop-Namen sorgf\u00e4ltig aus, dieser ist sp\u00e4ter nur gegen eine Geb\u00fchr von 50,- Euro \u00e4nderbar.","save and continue":"speichern und fortfahren","shop_title":"Shop Inhaber","shop_title_help":"Gib Deinen Namen zum Shop an.","shop_contact":"Shop Kontakt","shop_contact_help":"Vervollst\u00e4ndige Deine Kontaktdaten die im Shop angezeigt werden.","shop_accessibility":"Shop Erreichbarkeit","shop_accessibility_help":"Gib Deine Erreichbarkeit an.","shop_about":"Shop pers\u00f6nlicher Text","shop_about_help":"Gib Deinen pers\u00f6nlicher Text \u00fcber Dich an. (max. 190 Zeichen)","Shop details":"Shop Details","available":"erreichbar","not available":"nicht erreichbar","active since":"Aktiv seit","open since":"Er\u00f6ffnet seit","Domain":"Domain","name":"Name","not available copy":"Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schaue in einigen Minuten noch einmal nach.","shop image":"Dein Shop Bild","shop image copy":"Lade hier ein Foto \/ Bild \/ Logo von Dir hoch.","shop on site":"F\u00fcr Dich vor Ort:","shop on site copy":"Warst du auf der Aloe Vera Farm auf Mallorca? Lade hier bis zu 6 Bilder von Dir hoch.","open your shop":"Er\u00f6ffne Deinen eigenen mivita-Shop","settings your shop":"Deine Shop-Einstellungen","taxable_sales_1":"umsatzsteuerpflichtig (Ich mache eine UST-Voranmeldung pro Monat \/ Quartal \/ Jahr ans Finanzamt)","taxable_sales_2":"nicht umsatzsteuerpflichtig (Kleinunternehmer im Sinne von \u00a7 19)"} \ No newline at end of file diff --git a/resources/lang/de/navigation.php b/resources/lang/de/navigation.php index 765a651..61645c4 100755 --- a/resources/lang/de/navigation.php +++ b/resources/lang/de/navigation.php @@ -2,12 +2,17 @@ return [ 'home' => 'Home', + 'my_account' => 'Mein Konto', 'my_data' => 'Meine Daten', + 'edit' => 'bearbeiten', 'my_shop' => 'Mein Shop', 'settings' => 'Einstellungen', 'my_team' => 'Mein Team', + 'my_clients' => 'Meine Kunden', 'member_register' => 'Berater registrieren', 'member'=>'Berater', + 'membership' => 'Mitgliedschaft', + 'my_membership' => 'Meine Mitgliedschaft', 'orders'=>'Bestellungen', 'clients'=>'Kunden', 'products'=>'Produkte', @@ -17,6 +22,7 @@ return [ 'contents'=>'Inhalte', 'start_site'=>'Startseite', 'translate'=>'Übersetzungen', + 'add' => 'hinzufügen', 'general'=>'Allgemein', 'modules'=>'Module', 'user_roles'=>'User Rechte', diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index 00e0b5e..fcca382 100755 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -130,6 +130,7 @@ return [ */ 'custom' => [ + 'unique_email_client' => 'Ein Kunde mit der E-Mail-Adresse ist schon im mivita-Salescenter vorhanden', 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -201,6 +202,7 @@ return [ 'shipping_zipcode'=>'PLZ', 'shipping_city' => 'Stadt', 'm_account' => 'Account ID', - + 'has_customer_buyed' => 'Die Angabe', + 'billing_country_code' => 'Land Code', ], ]; diff --git a/resources/views/admin/country/form.blade.php b/resources/views/admin/country/form.blade.php index 860974a..1088766 100755 --- a/resources/views/admin/country/form.blade.php +++ b/resources/views/admin/country/form.blade.php @@ -36,14 +36,14 @@ {{ Form::text('ru', $country->ru, array('placeholder'=>__('Land RU'), 'class'=>'form-control', 'id'=>'ru')) }} -
+
- + {{ Form::text('code', $country->code, array('placeholder'=>__('code'), 'class'=>'form-control', 'id'=>'code')) }}
- + {{ Form::text('phone', $country->phone, array('placeholder'=>__('phone'), 'class'=>'form-control', 'id'=>'phone')) }}
@@ -51,6 +51,66 @@ +
+
+ Anzeige und Währung +
+
+
+
+ +
+
+ +
+
+
+
+
+ + +
+
+ + {{ Form::text('currency_unit', $country->currency_unit, array('placeholder'=>__('CHF'), 'class'=>'form-control', 'id'=>'currency_unit')) }} +
+
+
+
+
+
+
+
+ +
+ + +
+
+
+ + {{ Form::text('currency_faktor', formatNumber($country->currency_faktor, 4), array('placeholder'=>__('1,07'), 'class'=>'form-control', 'id'=>'currency_faktor')) }} +
+
+
+
+
+
@@ -82,6 +142,7 @@ +
{{ __('Übersetzungen') }} @@ -100,3 +161,19 @@
+ + + \ No newline at end of file diff --git a/resources/views/admin/country/index.blade.php b/resources/views/admin/country/index.blade.php index 74b1a66..41f20cc 100644 --- a/resources/views/admin/country/index.blade.php +++ b/resources/views/admin/country/index.blade.php @@ -15,6 +15,10 @@ {{__('Code')}} {{__('Phone')}} {{__('Status')}} + {{__('Länderwechsel')}} + {{__('e. Preis')}} + {{__('e. Währung')}} + {{__('Kalkulation')}} @@ -28,17 +32,29 @@ {{ $value->de }} {{ $value->code }} {{ $value->phone }} - @if($value->active) @else@endif + {!! get_active_badge($value->active) !!} + {!! get_active_badge($value->switch) !!} + {!! get_active_badge($value->own_eur) !!} + {!! get_active_badge($value->currency) !!} {{$value->currency_unit}} + + @if($value->currency) + @if($value->currency_calc) + {{$value->currency_faktor}} + @else + {{$value->currency_faktor}} + @endif + @else - @endif + @endforeach
- + --}}
@@ -50,13 +66,7 @@ "bLengthChange": false, "iDisplayLength": 50, "order": [[ 0, "asc" ]], - "aoColumns": [ - { "sWidth": "8%" }, - { "sWidth": "20%" }, - { "sWidth": "10%" }, - { "sWidth": "10%" }, - { "sWidth": "8%" }, - ], + "language": { "url": "/js/German.json" } diff --git a/resources/views/admin/customer/_detail.blade.php b/resources/views/admin/customer/_detail.blade.php index b170871..d986139 100644 --- a/resources/views/admin/customer/_detail.blade.php +++ b/resources/views/admin/customer/_detail.blade.php @@ -1,37 +1,54 @@
+
+ @if($isAdmin)
-
-
Datum
- {{$shopping_user->created_at->format("d.m.Y H:i")}} +
+
E-Mail
+ {{ $shopping_user->billing_email }}
-
+
Kundennummer
{{$shopping_user->number}}
-
-
ist Berater
- @if($shopping_user->auth_user) - - - {{$shopping_user->auth_user->getFullName()}} #{{$shopping_user->auth_user->number}} - @else - - @endif +
+
Datum
+ {{$shopping_user->created_at->format("d.m.Y H:i")}} +
+
+ Kundendaten bearbeiten
+ @else +
+
+
E-Mail
+ {{ $shopping_user->billing_email }} +
+
+
Kundennummer
+ {{$shopping_user->number}} +
+
+
Erstellt
+ {{$shopping_user->firstEntryByNumber()->created_at->format("d.m.Y H:i")}} +
+
+ Kundendaten bearbeiten +
+
+ @endif
- @if($isAdmin)
-
+
@if(isset($change_member_error) && $change_member_error)
@@ -44,16 +61,14 @@
@endif
Zugewiesener Berater
- @if($shopping_user->is_like) - @else - + @else @if($shopping_user->member) {{$shopping_user->member->getFullName()}} #{{$shopping_user->member->number}} @@ -64,10 +79,8 @@ data-view="customer" data-route="{{ route('modal_load') }}"> @endif - -
-
+
Über Shop
@if($shopping_user->shopping_order) @if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop()) @@ -77,6 +90,16 @@ @endif @endif
+
+
ist Berater
+ @if($shopping_user->auth_user) + + + {{$shopping_user->auth_user->getFullName()}} #{{$shopping_user->auth_user->number}} + @else + + @endif +
@@ -95,7 +118,6 @@ {{ $shopping_user->billing_company }}
@endif -
Anrede
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }} @@ -127,17 +149,13 @@ {{ $shopping_user->billing_city }}
-
E-Mail
- {{ $shopping_user->billing_email }} +
Land
+ {{ $shopping_user->billing_country->getLocated() }}
Telefon
{{ $shopping_user->billing_phone }}
-
-
Land
- {{ $shopping_user->billing_country->getLocated() }} -
@@ -158,7 +176,6 @@ {{ $shopping_user->shipping_company }}
@endif -
Anrede
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }} @@ -190,23 +207,41 @@ {{ $shopping_user->shipping_city }}
-
E-Mail
- {{ $shopping_user->shipping_email }} +
Land
+ {{ $shopping_user->shipping_country->getLocated() }}
Telefon
{{ $shopping_user->shipping_phone }}
-
-
Land
- {{ $shopping_user->shipping_country->getLocated() }} -
@endif
+
+
+ Kunde +
+
+
+ @if($shopping_user->has_buyed) + Kunde hat schon gekauft. + @else + Kunde hat noch nicht gekauft. + @endif +
+
+ @if($shopping_user->subscribed) + Kunde ist für Newsletter abonniert. + @else + Kunde ist nicht für Newsletter abonniert. + @endif +
+
+
+
- + @if($isAdmin)
@@ -323,4 +358,5 @@
+ @endif \ No newline at end of file diff --git a/resources/views/admin/customer/_edit.blade.php b/resources/views/admin/customer/_edit.blade.php new file mode 100644 index 0000000..455fc69 --- /dev/null +++ b/resources/views/admin/customer/_edit.blade.php @@ -0,0 +1,388 @@ +
+
+
+
+ Rechnungsadresse +
+
+ * {{trans('register.required_fields')}} + Lieferadresse +
+
+
+
+
+
+
+
+ + {{ Form::text('billing_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }} +
+
+
+
+ + + @if ($errors->has('billing_salutation')) + + {{ $errors->first('billing_salutation') }} + + @endif +
+
+
+
+ + {{ Form::text('billing_firstname', $shopping_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'billing_firstname', 'required'=>true, 'tabindex' => 4)) }} + @if ($errors->has('billing_firstname')) + + {{ $errors->first('billing_firstname') }} + + @endif + +
+
+ + {{ Form::text('billing_lastname', $shopping_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'billing_lastname', 'required'=>true, 'tabindex' => 5)) }} + @if ($errors->has('billing_lastname')) + + {{ $errors->first('billing_lastname') }} + + @endif + +
+
+
+
+ + {{ Form::text('billing_address', $shopping_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_address', 'tabindex' => 6)) }} + @if ($errors->has('billing_address')) + + {{ $errors->first('billing_address') }} + + @endif +
+
+
+
+ + {{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }} +
+
+
+
+ + {{ Form::text('billing_zipcode', $shopping_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_zipcode', 'tabindex' => 7)) }} + @if ($errors->has('billing_zipcode')) + + {{ $errors->first('billing_zipcode') }} + + @endif +
+
+ + {{ Form::text('billing_city', $shopping_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_city', 'tabindex' => 8)) }} + @if ($errors->has('billing_city')) + + {{ $errors->first('billing_city') }} + + @endif +
+
+
+
+ + + @if ($errors->has('billing_country_id')) + + {{ $errors->first('billing_country_id') }} + + @endif +
+
+
+
+ + {{ Form::text('billing_phone', $shopping_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'billing_phone', 'tabindex' => 11)) }} +
+
+
+
+
+
+
Lieferadresse
+
+
+
+
+ + {{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }} +
+
+
+
+ + + @if ($errors->has('shipping_salutation')) + + {{ $errors->first('shipping_salutation') }} + + @endif +
+
+
+
+ + {{ Form::text('shipping_firstname', $shopping_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }} + @if ($errors->has('shipping_firstname')) + + {{ $errors->first('shipping_firstname') }} + + @endif +
+
+ + {{ Form::text('shipping_lastname', $shopping_user->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }} + @if ($errors->has('shipping_lastname')) + + {{ $errors->first('shipping_lastname') }} + + @endif + +
+
+
+
+ + {{ Form::text('shipping_address', $shopping_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }} + @if ($errors->has('shipping_address')) + + {{ $errors->first('shipping_address') }} + + @endif +
+
+
+
+ + {{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }} + @if ($errors->has('shipping_address_2')) + + {{ $errors->first('shipping_address_2') }} + + @endif +
+
+
+
+ + {{ Form::text('shipping_zipcode', $shopping_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }} + @if ($errors->has('shipping_zipcode')) + + {{ $errors->first('shipping_zipcode') }} + + @endif + +
+
+ + {{ Form::text('shipping_city', $shopping_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }} + @if ($errors->has('shipping_city')) + + {{ $errors->first('shipping_city') }} + + @endif +
+
+
+
+ + + @if ($errors->has('shipping_country_id')) + + {{ $errors->first('shipping_country_id') }} + + @endif +
+
+
+
+ + {{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }} +
+
+
+
+
+ +
+
+
+ @if($isView === 'customer') + + + + @endif +
+
+
+ +
+
+ +
+
+
+
+ @if($isView === 'customer-add') + {{ Form::hidden('billing_email_1', $billing_email) }} + {{ Form::hidden('billing_email-confirm_1', $billing_email) }} + +
+
+ + {{ Form::text('billing_email', $billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email', 'readonly')) }} +
+
+ + {{ Form::text('billing_email-confirm', $billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm', 'readonly')) }} +
+
+ @else +
+
+ + {{ Form::text('billing_email', $shopping_user->billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email')) }} +
+
+ + {{ Form::text('billing_email-confirm', $shopping_user->billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm')) }} +
+
+ + + @endif +
+
+ + diff --git a/resources/views/admin/customer/detail.blade.php b/resources/views/admin/customer/detail.blade.php index 12c74aa..f20a060 100644 --- a/resources/views/admin/customer/detail.blade.php +++ b/resources/views/admin/customer/detail.blade.php @@ -4,7 +4,7 @@

zurück - {{ __('Kunden Details') }} #{{$shopping_user->id}} + {{ __('Kunden Details') }}

@include('admin.customer._detail') zurück diff --git a/resources/views/admin/customer/edit.blade.php b/resources/views/admin/customer/edit.blade.php new file mode 100644 index 0000000..b035770 --- /dev/null +++ b/resources/views/admin/customer/edit.blade.php @@ -0,0 +1,15 @@ +@extends('layouts.layout-2') + +@section('content') +

+ zurück + {{ __('Kunden Details') }} bearbeiten +

+ {!! Form::open(['url' => route('admin_customer_edit', [$shopping_user->id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} + @include('admin.customer._edit') +
+   +
+ {!! Form::close() !!} + zurück +@endsection \ No newline at end of file diff --git a/resources/views/admin/customer/index.blade.php b/resources/views/admin/customer/index.blade.php index 5ffa428..5aca26b 100644 --- a/resources/views/admin/customer/index.blade.php +++ b/resources/views/admin/customer/index.blade.php @@ -41,7 +41,6 @@ - @@ -56,6 +55,7 @@ + @@ -98,6 +98,7 @@ { data: 'billing_city', name: 'billing_city' }, { data: 'billing_country_id', name: 'billing_country_id' }, { data: 'orders', name: 'orders' }, + { data: 'subscribed', name: 'subscribed' }, { data: 'member_id', name: 'member_id', searchable: false, orderable: false }, { data: 'created_at', name: 'created_at' }, ], diff --git a/resources/views/admin/modal/is_like_member.blade.php b/resources/views/admin/modal/is_like_member.blade.php index b960cd4..c8bb4a4 100644 --- a/resources/views/admin/modal/is_like_member.blade.php +++ b/resources/views/admin/modal/is_like_member.blade.php @@ -66,6 +66,32 @@

+ + @if($current->member_id) + + +
+

Zugeordneter Berater:

+

+ #{{$current->member->number}}
+ {{$current->member->getFullName()}}
+ {{$current->member->account->zipcode}} {{$current->member->account->city}}
+ @if($current->member->shop) + @if($current->member->isActive() && $current->member->isActiveShop()) + {{$current->member->shop->getSubdomain(false)}} + @else + {{$current->member->shop->getSubdomain(false)}} + @endif + @else + Keinen Shop eingerichtet + @endif + +

+ @endif +

Bestellt im Shop:

@@ -80,14 +106,17 @@ {{$current->shopping_order->user_shop->getSubdomain(false)}} @endif @endif + @if(!$current->member_id) + @endif @else Keiner Bestellung / Shop zugeordnet @endif

+
@@ -99,7 +128,6 @@ @if(isset($possible[0])) @php($possible = $possible[0]) @endif -
diff --git a/resources/views/admin/product/form.blade.php b/resources/views/admin/product/form.blade.php index 7de4132..fc63a16 100755 --- a/resources/views/admin/product/form.blade.php +++ b/resources/views/admin/product/form.blade.php @@ -22,11 +22,8 @@ {{ Form::text('title', $product->title, array('placeholder'=>__('Title'), 'class'=>'form-control', 'id'=>'title')) }}
--}} - -
-
@@ -53,28 +50,28 @@
- {{ __('Preise') }} + {{ __('Preise in EUR') }}
- - {{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('price'), 'class'=>'form-control', 'id'=>'price')) }} + + {{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('Preis VK in EUR (Brutto)'), 'class'=>'form-control', 'id'=>'price')) }}
- - {{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('price_ek'), 'class'=>'form-control', 'id'=>'price_ek')) }} + + {{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
- - {{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('tax'), 'class'=>'form-control', 'id'=>'tax')) }} + + {{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'tax')) }}
- - {{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('price_old'), 'class'=>'form-control', 'id'=>'price_old')) }} + + {{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'price_old')) }}
@@ -85,18 +82,108 @@ {{ Form::text('weight', $product->weight, array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }}
- + {{ Form::text('points', $product->points, array('placeholder'=>__('Points pro Produkt'), 'class'=>'form-control', 'id'=>'points')) }}
- {{ Form::text('amount', $product->amount, array('placeholder'=>__('amount'), 'class'=>'form-control', 'id'=>'amount')) }} + {{ Form::text('amount', $product->amount, array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }}
+
+
+ Landesspezifische Preise +
+ +
+ @foreach($country_for_prices as $country) + + {{ Form::hidden('country_prices[]', $country->id) }} +
+
{{$country->de}}
+
+
+ @if($country->own_eur) +
+
+ +

+
+
+ + {{ Form::text('c_price['.$country->id.']', formatNumber($product->getCPrice($country->id)), array('placeholder'=>__('Preis VK in EUR Brutto'), 'class'=>'form-control', 'id'=>'c_price_'.$country->id)) }} + +
+
+ + {{ Form::text('c_tax['.$country->id.']', formatNumber($product->getCTax($country->id)), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'c_tax'.$country->id)) }} + +
+
+ + {{ Form::text('c_price_old['.$country->id.']', formatNumber($product->getCPriceOld($country->id)), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'c_price_old'.$country->id)) }} + +
+
+ @endif + @if($country->currency) +
+
+ +

@if($country->currency_calc) Preis Berechnung automatisch @else Preis manuell + angegeben @endif

+
+ + @if($country->currency_calc) + {{-- + NUR Anzeige vom automatisch berechneten Preis currency_faktor + Auf Basis vom price + Wenn own_eur auf basis vom own_eur price + --}} +
+ + {{ Form::text('c_currency['.$country->id.']', formatNumber($product->getRealPrice($country) * $country->currency_faktor), array('class'=>'form-control', 'readonly')) }} + +
+ @else + {{-- + Eingabe + Währungs Namen aus currency_name + currency_faktor als Hinweis ausgeben + Auf Basis vom price + Wenn own_eur auf basis vom own_eur price + --}} +
+ + {{ Form::text('c_currency['.$country->id.']', formatNumber($product->getCCurrency($country->id)), array('placeholder'=>__('Preis VK in ').$country->currency_unit, 'class'=>'form-control')) }} +
+ @endif + +
+ + {{ Form::text('currency_faktor['.$country->id.']', formatNumber($country->currency_faktor, 4), array('class'=>'form-control', 'readonly')) }} +
+
+ + {{ Form::text('preis_eur['.$country->id.']', formatNumber($product->getRealPrice($country)), array('class'=>'form-control', 'readonly')) }} +
+
+ + {{ Form::text('currency_unit['.$country->id.']', $country->currency_unit, array('class'=>'form-control', 'readonly')) }} +
+ +
+ @endif +
+ @endforeach + für die Einstellung von landesspezifischen Preisen müssen diese unter + Länder -> Land aktiviert werden. +
+
@@ -135,24 +222,25 @@
- {!! HTMLHelper::getAttributesOptions($product->attributes()->pluck('attribute_id')->toArray()) !!}
-
- - {{ Form::textarea('description', $product->description , array('placeholder'=>__('description'), 'class'=>'form-control summernote', 'id'=>'description')) }} -
-
- - {{ Form::textarea('usage', $product->usage , array('placeholder'=>__('usage'), 'class'=>'form-control summernote', 'id'=>'usage')) }} -
-
- - {{ Form::textarea('ingredients', $product->ingredients , array('placeholder'=>__('ingredients'), 'class'=>'form-control summernote', 'id'=>'ingredients')) }} -
+
+ + {{ Form::textarea('description', $product->description , array('placeholder'=>__('description'), 'class'=>'form-control summernote', 'id'=>'description')) }} +
+
+ + {{ Form::textarea('usage', $product->usage , array('placeholder'=>__('usage'), 'class'=>'form-control summernote', 'id'=>'usage')) }} +
+
+ + {{ Form::textarea('ingredients', $product->ingredients , array('placeholder'=>__('ingredients'), 'class'=>'form-control summernote', 'id'=>'ingredients')) }} +
@@ -176,6 +264,12 @@ {{ Form::text('upgrade_to_id', $product->upgrade_to_id, array('placeholder'=>__('Product ID when need an upgrade'), 'class'=>'form-control', 'id'=>'upgrade_to_id')) }} +
+
+ + {{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }} +
+
diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php index d21884e..91bfd2d 100755 --- a/resources/views/layouts/includes/layout-sidenav.blade.php +++ b/resources/views/layouts/includes/layout-sidenav.blade.php @@ -13,8 +13,20 @@ @if(Auth::user()->showSideNav()) -
  • -
    {{ __('navigation.my_data') }}
     + +
  • + + +
    {{ __('navigation.my_account') }}
    +     +
    • @if(Auth::user()->isActiveShop()) @@ -46,6 +58,22 @@ @endif + @if(Auth::user()->isActiveAccount()) +
  • + + +
    {{ __('navigation.my_clients') }}
    +     + +
    • + @endif @endif @if(Auth::user()->isAdmin()) @@ -56,10 +84,9 @@
    {{ __('navigation.member') }}
     -
  • +
  • {{ __('navigation.clients') }}
    • -
  • @@ -162,7 +189,9 @@
  • Shopping Orders
     - +
    • +
  • +
    Import
    • diff --git a/resources/views/sys/admin/cronjobs.blade.php b/resources/views/sys/admin/cronjobs.blade.php index 5f5305d..e53936d 100644 --- a/resources/views/sys/admin/cronjobs.blade.php +++ b/resources/views/sys/admin/cronjobs.blade.php @@ -24,17 +24,17 @@
    - {{--
    - - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} -
    - - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }} -
    - + {{--
    + + {!! Form::open(['url' => url()->current(), 'class' => '']) !!} +
    + + {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }} +
    + - {!! Form::close() !!} -
    --}} + {!! Form::close() !!} +
    --}} @if(count($values)>0)
    diff --git a/resources/views/sys/admin/customers.blade.php b/resources/views/sys/admin/customers.blade.php index bbf43b0..c1952af 100644 --- a/resources/views/sys/admin/customers.blade.php +++ b/resources/views/sys/admin/customers.blade.php @@ -21,31 +21,56 @@ Kunden - + {!! Form::open(['url' => url()->current(), 'class' => '']) !!}
    - {{--
    +
    - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} +
    - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }} + {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>1)) }}
    - + - {!! Form::close() !!} -
    --}} + +
    @if(count($values)>0)
    + +
    +
    #{{__('Stadt')}} {{__('Land')}} {{__('Käufe')}}{{__('Newsletter')}} {{__('zugewiesener Berater')}} {{__('Datum')}}
    + + + + + + + + + + + + @foreach($values as $shopping_user) + + + + + + + + + @endforeach + +
    ID{{__('Mail')}}{{__('is like')}}{{__('OrderID')}}{{__('txaction')}}{{__('Action')}}
    {{$shopping_user->id}}{{$shopping_user->billing_email}}{{$shopping_user->is_like}}@if($shopping_user->shopping_order){{$shopping_user->shopping_order->id}}@endif@if($shopping_user->shopping_order){{$shopping_user->shopping_order->txaction}}@endif
    - @foreach($values as $shopping_user) - 
    {{$shopping_user->billing_email}} |
-                        @if($shopping_user->shopping_order && $shopping_user->shopping_order->user_shop) {{ $shopping_user->shopping_order->user_shop->user_id}} @endif {{$shopping_user->orders}}
    - @endforeach + @endif + + {!! Form::close() !!} @endsection diff --git a/resources/views/sys/admin/import-show.blade.php b/resources/views/sys/admin/import-show.blade.php new file mode 100644 index 0000000..43f722c --- /dev/null +++ b/resources/views/sys/admin/import-show.blade.php @@ -0,0 +1,104 @@ +@extends('layouts.layout-2') + +@section('content') + + +

    + Kontakte Import Status +

    + +
    +
    +
    +
    +
    +
    +
    +
    {{ __('eingelesene Datensätze') }}
    +
    {{ $import['count'] }}
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    {{ __('Kontakte importiert') }}
    +
    {{ count($import['imported']) }}
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ __('ohne E-Mai Adresse') }}
    +
    {{ $import['not'] }}
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    {{__('Mail schon vorhanden')}}
    +
    {{ count($import['has_imported']) }}
    +
    +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + +
    {{__('Datei')}}:{{ $file }}
    {{__('Import Position start')}}:{{$skip}}
    {{__('Import limit')}}:{{ $limit }}
    + +
    +
    Vorhandene Mails
    + + @foreach($import['has_imported'] as $row) + + {{$row}}
    + + @endforeach + +
    +
    + + + + +@endsection diff --git a/resources/views/sys/admin/import.blade.php b/resources/views/sys/admin/import.blade.php new file mode 100644 index 0000000..14d0e9c --- /dev/null +++ b/resources/views/sys/admin/import.blade.php @@ -0,0 +1,109 @@ +@extends('layouts.layout-2') + +@section('content') + +

    + Kontakte importieren +

    + +
    +
    + Excel-Datei hochladen +
    +
    + + {!! Form::open([ 'url' => route('sysadmin_import_store'), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'realDropzone' ]) !!} +
    + +
    + {!! Form::close() !!} + +
    + +
    +
    +@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/user/_user_form.blade.php b/resources/views/user/_user_form.blade.php new file mode 100644 index 0000000..4b80ba1 --- /dev/null +++ b/resources/views/user/_user_form.blade.php @@ -0,0 +1,468 @@ +
    +
    + {{ __('Rechnungsdaten') }} + * {{trans('register.required_fields')}} +
    + +
    + +
    +
    + + {{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }} +
    +
    +
    + +
    + + + @if ($errors->has('salutation')) + + {{ $errors->first('salutation') }} + + @endif +
    + +
    + + {{ Form::text('first_name', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'first_name', 'required'=>true, 'tabindex' => 4)) }} + @if ($errors->has('first_name')) + + {{ $errors->first('first_name') }} + + @endif + +
    +
    + + {{ Form::text('last_name', $user->account->last_name, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'id'=>'last_name', 'required'=>true, 'tabindex' => 5)) }} + @if ($errors->has('last_name')) + + {{ $errors->first('last_name') }} + + @endif + +
    +
    +
    + + {{ Form::text('address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'address', 'tabindex' => 6)) }} + @if ($errors->has('address')) + + {{ $errors->first('address') }} + + @endif +
    +
    +
    + + {{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }} +
    +
    + + {{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }} +
    +
    +
    +
    + + {{ Form::text('zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'zipcode', 'tabindex' => 7)) }} + @if ($errors->has('zipcode')) + + {{ $errors->first('zipcode') }} + + @endif + +
    +
    + + {{ Form::text('city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'city', 'tabindex' => 8)) }} + @if ($errors->has('city')) + + {{ $errors->first('city') }} + + @endif +
    +
    + + + @if ($errors->has('country_id')) + + {{ $errors->first('country_id') }} + + @endif +
    +
    + +
    +
    + + +
    +
    + + {{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }} +
    +
    +
    +
    + + +
    +
    + + {{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }} +
    +
    + @if($errors->has('phone') || $errors->has('mobil')) +
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    + @else +
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    + @endif +
    + +
    + @if(!isset($step)) +
    + + @if($user->email) +
    +
    + + {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'readonly'=>true, 'tabindex' => 14)) }} +
    +
    + + {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'readonly'=>true, 'tabindex' => 15)) }} +
    +
    + @if(isset($can_change_mail)) + @if(count($user->user_update_email) > 0) +

    {{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}


    + @endif + {{ __('Contact') }} {{__('Change E-Mail')}} + @else + {{__('Change E-Mail')}} + @endif + @else +
    +
    + + {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'tabindex' => 14)) }} +
    +
    + + {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'tabindex' => 15)) }} +
    +
    + + @endif + @endif +
    +
    + +
    +
    +
    +
    + + +

    Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.

    +
    +
    + + {{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('Steuernummer'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }} +
    +
    + + {{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }} +
    + +
    + +
    +
    +
    + +
    +
    +
    + {{ __('Versand Adresse') }} +
    +
    + +
    +
    + + {{ Form::text('shipping_company', $user->account->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }} +
    +
    +
    +
    + + + @if ($errors->has('shipping_salutation')) + + {{ $errors->first('shipping_salutation') }} + + @endif +
    + +
    + + {{ Form::text('shipping_firstname', $user->account->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }} + @if ($errors->has('shipping_firstname')) + + {{ $errors->first('shipping_firstname') }} + + @endif + +
    +
    + + {{ Form::text('shipping_lastname', $user->account->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }} + @if ($errors->has('shipping_lastname')) + + {{ $errors->first('shipping_lastname') }} + + @endif + +
    +
    +
    + + {{ Form::text('shipping_address', $user->account->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }} + @if ($errors->has('shipping_address')) + + {{ $errors->first('shipping_address') }} + + @endif +
    +
    + + {{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }} + @if ($errors->has('shipping_address_2')) + + {{ $errors->first('shipping_address_2') }} + + @endif +
    +
    +
    + + {{ Form::text('shipping_zipcode', $user->account->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }} + @if ($errors->has('shipping_zipcode')) + + {{ $errors->first('shipping_zipcode') }} + + @endif + +
    +
    + + {{ Form::text('shipping_city', $user->account->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }} + @if ($errors->has('shipping_city')) + + {{ $errors->first('shipping_city') }} + + @endif +
    +
    + + + @if ($errors->has('shipping_country_id')) + + {{ $errors->first('shipping_country_id') }} + + @endif +
    +
    +
    +
    + + +
    +
    + + {{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }} +
    +
    + +
    +
    + +{{--
    +
    + {{ __('weiteres') }} +
    +
    +
    +
    + + {{ Form::text('website', $user->account->website, array('placeholder'=>__('Webseite'), 'class'=>'form-control', 'id'=>'website')) }} + +
    +
    + + {{ Form::text('instagram', $user->account->instagram, array('placeholder'=>__('Instagram'), 'class'=>'form-control', 'id'=>'instagram')) }} + +
    +
    +
    +
    + + {{ Form::text('facebook', $user->account->facebook, array('placeholder'=>__('Facebook'), 'class'=>'form-control', 'id'=>'facebook')) }} + +
    +
    + + {{ Form::text('facebook_fanpage', $user->account->facebook_fanpage, array('placeholder'=>__('Facebook Fanpage'), 'class'=>'form-control', 'id'=>'facebook_fanpage')) }} + +
    + +
    +
    +
    --}} + + diff --git a/resources/views/user/customer/add.blade.php b/resources/views/user/customer/add.blade.php new file mode 100644 index 0000000..d4c12e7 --- /dev/null +++ b/resources/views/user/customer/add.blade.php @@ -0,0 +1,103 @@ +@extends('layouts.layout-2') + +@section('content') + + {{-- + @if ($errors->any()) +
    +
    +
    +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    +
    +
    +
    + @endif + --}} +

    + {{ __('Kunden hinzufügen') }} +

    + +
    + + +
    +
    +
    + {!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!} +
    +
    + + {{ Form::text('email', '', array('placeholder'=>'E-Mail Adresse', 'class'=>'form-control', 'id'=>'email', 'required'=>true ,'tabindex' => 1)) }} + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +

    Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im mivita-Salescenter vorhanden sind.

    +
    +
    +
    +   +
    + {!! Form::close() !!} +
    +
    +
    +
    + @if($step == 1) + {!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} + @include('admin.customer._edit') + +
    +   +
    + {!! Form::close() !!} +
    + @endif +
    + +
    +
    + + + + + +@endsection diff --git a/resources/views/user/customer/detail.blade.php b/resources/views/user/customer/detail.blade.php new file mode 100644 index 0000000..bd026a9 --- /dev/null +++ b/resources/views/user/customer/detail.blade.php @@ -0,0 +1,12 @@ +@extends('layouts.layout-2') + +@section('content') + +

    + zurück + {{ __('Kunden Details') }} +

    + @include('admin.customer._detail') + zurück + +@endsection \ No newline at end of file diff --git a/resources/views/user/customer/edit.blade.php b/resources/views/user/customer/edit.blade.php new file mode 100644 index 0000000..39af600 --- /dev/null +++ b/resources/views/user/customer/edit.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.layout-2') + +@section('content') + +

    + zurück + {{ __('Kunden Details') }} bearbeiten +

    + {!! Form::open(['url' => route('user_customer_edit', [$shopping_user->id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} + @include('admin.customer._edit') +
    +   +
    + {!! Form::close() !!} + zurück +@endsection \ No newline at end of file diff --git a/resources/views/user/customer/index.blade.php b/resources/views/user/customer/index.blade.php new file mode 100644 index 0000000..e51c0fc --- /dev/null +++ b/resources/views/user/customer/index.blade.php @@ -0,0 +1,89 @@ +@extends('layouts.layout-2') + +@section('content') +

    + {{ __('navigation.my_clients') }} +

    + +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    #{{__('E-Mail')}}{{__('Anrede')}}{{__('Firma')}}{{__('Vorname')}}{{__('Nachname')}}{{__('PLZ')}}{{__('Stadt')}}{{__('Land')}}{{__('Käufe')}}{{__('Newsletter')}}{{__('erstellt')}}{{__('ID Kunden')}}WP
    +
    + +
    +
    +
    + + +@endsection + diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php index 1d4c0a1..5d8e08b 100644 --- a/resources/views/user/edit.blade.php +++ b/resources/views/user/edit.blade.php @@ -15,11 +15,9 @@ @endif -

    - {{ __('Your Data') }} + {{ __('navigation.my_data') }}

    - {!! Form::open(['url' => route('user_edit'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} @include('user.user_form') diff --git a/resources/views/user/membership/index.blade.php b/resources/views/user/membership/index.blade.php index cf9eeb8..3da83f4 100644 --- a/resources/views/user/membership/index.blade.php +++ b/resources/views/user/membership/index.blade.php @@ -15,12 +15,9 @@ @endif -

    - {{ __('Mitgliedschaft') }} + {{ __('navigation.my_membership') }}

    - -
    @@ -40,7 +37,6 @@ @endif
    @endif - @else @if($user->payment_order_id && $user->payment_order_product->identifier === 'show_upgrade')

    diff --git a/resources/views/user/shop/detail.blade.php b/resources/views/user/shop/detail.blade.php new file mode 100644 index 0000000..12c74aa --- /dev/null +++ b/resources/views/user/shop/detail.blade.php @@ -0,0 +1,12 @@ +@extends('layouts.layout-2') + +@section('content') + +

    + zurück + {{ __('Kunden Details') }} #{{$shopping_user->id}} +

    + @include('admin.customer._detail') + zurück + +@endsection \ No newline at end of file diff --git a/resources/views/user/team/members.blade.php b/resources/views/user/team/members.blade.php index b6d0dc0..bea7a5c 100644 --- a/resources/views/user/team/members.blade.php +++ b/resources/views/user/team/members.blade.php @@ -16,7 +16,7 @@
    @endif

    - {{ __('navigation.my_shop') }} + {{ __('navigation.my_team') }}

    Berater registrieren
    diff --git a/resources/views/user/user_form.blade.php b/resources/views/user/user_form.blade.php index 4b80ba1..b30bde4 100644 --- a/resources/views/user/user_form.blade.php +++ b/resources/views/user/user_form.blade.php @@ -1,171 +1,306 @@
    - {{ __('Rechnungsdaten') }} - * {{trans('register.required_fields')}} +
    +
    + Rechnungsadresse +
    +
    + * {{trans('register.required_fields')}} + Lieferadresse +
    +
    -
    -
    - - {{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }} -
    -
    -
    - -
    - - - @if ($errors->has('salutation')) - +
    +
    +
    +
    + + {{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }} +
    +
    +
    +
    + + + @if ($errors->has('salutation')) + {{ $errors->first('salutation') }} - @endif -
    - -
    - - {{ Form::text('first_name', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'first_name', 'required'=>true, 'tabindex' => 4)) }} - @if ($errors->has('first_name')) - + @endif +
    +
    +
    +
    + + {{ Form::text('first_name', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'first_name', 'required'=>true, 'tabindex' => 4)) }} + @if ($errors->has('first_name')) + {{ $errors->first('first_name') }} - @endif + @endif -
    -
    - - {{ Form::text('last_name', $user->account->last_name, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'id'=>'last_name', 'required'=>true, 'tabindex' => 5)) }} - @if ($errors->has('last_name')) - +
    +
    + + {{ Form::text('last_name', $user->account->last_name, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'last_name', 'required'=>true, 'tabindex' => 5)) }} + @if ($errors->has('last_name')) + {{ $errors->first('last_name') }} - @endif + @endif -
    -
    -
    - - {{ Form::text('address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'address', 'tabindex' => 6)) }} - @if ($errors->has('address')) - - {{ $errors->first('address') }} - - @endif -
    -
    -
    - - {{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }} -
    -
    - - {{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }} -
    -
    -
    -
    - - {{ Form::text('zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'zipcode', 'tabindex' => 7)) }} - @if ($errors->has('zipcode')) - +
    +
    +
    +
    + + {{ Form::text('address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'address', 'tabindex' => 6)) }} + @if ($errors->has('address')) + + {{ $errors->first('address') }} + + @endif +
    +
    +
    +
    + + {{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }} +
    +
    +
    +
    + + {{ Form::text('zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'zipcode', 'tabindex' => 7)) }} + @if ($errors->has('zipcode')) + {{ $errors->first('zipcode') }} - - @endif - -
    -
    - - {{ Form::text('city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'city', 'tabindex' => 8)) }} - @if ($errors->has('city')) - + + @endif +
    +
    + + {{ Form::text('city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'city', 'tabindex' => 8)) }} + @if ($errors->has('city')) + {{ $errors->first('city') }} - - @endif -
    -
    - - - @if ($errors->has('country_id')) - + + @endif +
    +
    +
    +
    + + + @if ($errors->has('country_id')) + {{ $errors->first('country_id') }} - @endif + @endif +
    +
    + + {{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }} +
    +
    +
    +
    + + +
    +
    + + {{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }} +
    +
    +
    +
    + + +
    +
    + + {{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }} +
    +
    + @if($errors->has('phone') || $errors->has('mobil')) +
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    + @else +
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    + @endif +
    + +
    +
    +
    +
    +
    +
    Lieferadresse
    +
    +
    +
    +
    + + {{ Form::text('shipping_company', $user->account->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }} +
    +
    +
    +
    + + + @if ($errors->has('shipping_salutation')) + + {{ $errors->first('shipping_salutation') }} + + @endif +
    +
    +
    +
    + + {{ Form::text('shipping_firstname', $user->account->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }} + @if ($errors->has('shipping_firstname')) + + {{ $errors->first('shipping_firstname') }} + + @endif +
    +
    + + {{ Form::text('shipping_lastname', $user->account->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }} + @if ($errors->has('shipping_lastname')) + + {{ $errors->first('shipping_lastname') }} + + @endif + +
    +
    +
    +
    + + {{ Form::text('shipping_address', $user->account->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }} + @if ($errors->has('shipping_address')) + + {{ $errors->first('shipping_address') }} + + @endif +
    +
    +
    +
    + + {{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }} + @if ($errors->has('shipping_address_2')) + + {{ $errors->first('shipping_address_2') }} + + @endif +
    +
    +
    +
    + + {{ Form::text('shipping_zipcode', $user->account->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }} + @if ($errors->has('shipping_zipcode')) + + {{ $errors->first('shipping_zipcode') }} + + @endif + +
    +
    + + {{ Form::text('shipping_city', $user->account->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }} + @if ($errors->has('shipping_city')) + + {{ $errors->first('shipping_city') }} + + @endif +
    +
    +
    +
    + + + @if ($errors->has('shipping_country_id')) + + {{ $errors->first('shipping_country_id') }} + + @endif +
    +
    +
    +
    + + +
    +
    + + {{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }} +
    +
    +
    +
    +
    + +
    -
    -
    - - -
    -
    - - {{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }} -
    -
    -
    -
    - - -
    -
    - - {{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }} -
    -
    - @if($errors->has('phone') || $errors->has('mobil')) -
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    - @else -
    Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*
    - @endif -
    - -
    @if(!isset($step))
    - - @if($user->email) -
    -
    - - {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'readonly'=>true, 'tabindex' => 14)) }} + @if($user->email) +
    +
    + + {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'readonly'=>true, 'tabindex' => 14)) }} +
    +
    + + {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'readonly'=>true, 'tabindex' => 15)) }} +
    -
    - - {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'readonly'=>true, 'tabindex' => 15)) }} -
    -
    - @if(isset($can_change_mail)) - @if(count($user->user_update_email) > 0) -

    {{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}


    + @if(isset($can_change_mail)) + @if(count($user->user_update_email) > 0) +

    {{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}


    + @endif + {{ __('Contact') }} {{__('Change E-Mail')}} + @else + {{__('Change E-Mail')}} @endif - {{ __('Contact') }} {{__('Change E-Mail')}} @else - {{__('Change E-Mail')}} +
    +
    + + {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'tabindex' => 14)) }} +
    +
    + + {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'tabindex' => 15)) }} +
    +
    @endif - @else -
    -
    - - {{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'tabindex' => 14)) }} -
    -
    - - {{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'tabindex' => 15)) }} -
    -
    - - @endif @endif
    @@ -173,19 +308,19 @@
    -
    +

    Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.

    -
    +
    {{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('Steuernummer'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }}
    -
    - +
    + {{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
    @@ -193,161 +328,10 @@
    -
    - -
    -
    -
    - {{ __('Versand Adresse') }} -
    -
    - -
    -
    - - {{ Form::text('shipping_company', $user->account->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }} -
    -
    -
    -
    - - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
    - -
    - - {{ Form::text('shipping_firstname', $user->account->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif - -
    -
    - - {{ Form::text('shipping_lastname', $user->account->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif - -
    -
    -
    - - {{ Form::text('shipping_address', $user->account->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
    -
    - - {{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }} - @if ($errors->has('shipping_address_2')) - - {{ $errors->first('shipping_address_2') }} - - @endif -
    -
    -
    - - {{ Form::text('shipping_zipcode', $user->account->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif - -
    -
    - - {{ Form::text('shipping_city', $user->account->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
    -
    - - - @if ($errors->has('shipping_country_id')) - - {{ $errors->first('shipping_country_id') }} - - @endif -
    -
    -
    -
    - - -
    -
    - - {{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }} -
    -
    - -
    -
    - -{{--
    -
    - {{ __('weiteres') }} -
    -
    -
    -
    - - {{ Form::text('website', $user->account->website, array('placeholder'=>__('Webseite'), 'class'=>'form-control', 'id'=>'website')) }} - -
    -
    - - {{ Form::text('instagram', $user->account->instagram, array('placeholder'=>__('Instagram'), 'class'=>'form-control', 'id'=>'instagram')) }} - -
    -
    -
    -
    - - {{ Form::text('facebook', $user->account->facebook, array('placeholder'=>__('Facebook'), 'class'=>'form-control', 'id'=>'facebook')) }} - -
    -
    - - {{ Form::text('facebook_fanpage', $user->account->facebook_fanpage, array('placeholder'=>__('Facebook Fanpage'), 'class'=>'form-control', 'id'=>'facebook_fanpage')) }} - -
    - -
    -
    -
    --}}