From: Vincent Vanwaelscappel Date: Tue, 28 Mar 2023 18:33:45 +0000 (+0200) Subject: wip #5835 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6b3ce46458242df2ac60f6895706875669ebdfbe;p=fluidbook-toolbox.git wip #5835 @0.5 --- diff --git a/app/Console/Commands/FluidbookQuote.php b/app/Console/Commands/FluidbookQuote.php index cb124882f..d555f8edd 100644 --- a/app/Console/Commands/FluidbookQuote.php +++ b/app/Console/Commands/FluidbookQuote.php @@ -2,9 +2,7 @@ namespace App\Console\Commands; -use App\Models\User; use App\Slack\Slack; -use Backpack\CRUD\app\Library\Widget; use Cubist\Backpack\Console\Commands\CubistCommand; use Cubist\Backpack\Facades\App; diff --git a/app/Jobs/Base.php b/app/Jobs/Base.php index cd15bc800..1a05aa6c3 100644 --- a/app/Jobs/Base.php +++ b/app/Jobs/Base.php @@ -3,6 +3,7 @@ namespace App\Jobs; use App\Models\User; +use Cubist\Backpack\Facades\App; use Illuminate\Support\Facades\Cache; class Base extends \Cubist\Backpack\Jobs\Base diff --git a/app/Jobs/DownloadBase.php b/app/Jobs/DownloadBase.php index 6f479df7e..51ba61038 100644 --- a/app/Jobs/DownloadBase.php +++ b/app/Jobs/DownloadBase.php @@ -8,6 +8,7 @@ use App\Notifications\DownloadReady; use App\Services\ScormCloud; use App\Slack\Message; use App\Slack\Slack; +use Cubist\Backpack\Facades\App; use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; use Cubist\Util\Files\Files; use Cubist\Util\Str; @@ -123,6 +124,7 @@ class DownloadBase extends Base public function handle() { + App::setLocale($this->user->preferredLocale()); try { $url = $this->_compileandpackage(); $translateVariables = $this->_getTranslateVariables(); diff --git a/app/Notifications/DownloadReady.php b/app/Notifications/DownloadReady.php index 316587ded..34e8f4189 100644 --- a/app/Notifications/DownloadReady.php +++ b/app/Notifications/DownloadReady.php @@ -3,7 +3,6 @@ namespace App\Notifications; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; use Illuminate\Support\HtmlString; diff --git a/composer.lock b/composer.lock index a964efa45..5c5a9ec91 100644 --- a/composer.lock +++ b/composer.lock @@ -984,23 +984,23 @@ }, { "name": "cache/redis-adapter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/php-cache/redis-adapter.git", - "reference": "80645507231494f9daa874e7bc1bf85d72443188" + "reference": "558fd52bd813930c8e6dc83ffd8044ad1abec242" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-cache/redis-adapter/zipball/80645507231494f9daa874e7bc1bf85d72443188", - "reference": "80645507231494f9daa874e7bc1bf85d72443188", + "url": "https://api.github.com/repos/php-cache/redis-adapter/zipball/558fd52bd813930c8e6dc83ffd8044ad1abec242", + "reference": "558fd52bd813930c8e6dc83ffd8044ad1abec242", "shasum": "" }, "require": { "cache/adapter-common": "^1.0", "cache/hierarchical-cache": "^1.0", - "php": "^5.6 || ^7.0 || ^8.0", - "psr/cache": "^1.0", + "php": ">=7.4", + "psr/cache": "^1.0 || ^2.0", "psr/simple-cache": "^1.0" }, "provide": { @@ -1008,8 +1008,8 @@ "psr/simple-cache-implementation": "^1.0" }, "require-dev": { - "cache/integration-tests": "^0.16", - "phpunit/phpunit": "^5.7.21" + "cache/integration-tests": "^0.17", + "phpunit/phpunit": "^7.5.20 || ^9.5.10" }, "suggest": { "ext-redis": "The extension required to use this pool." @@ -1054,9 +1054,9 @@ "tag" ], "support": { - "source": "https://github.com/php-cache/redis-adapter/tree/1.1.0" + "source": "https://github.com/php-cache/redis-adapter/tree/1.2.0" }, - "time": "2020-12-14T12:17:39+00:00" + "time": "2022-01-15T15:47:19+00:00" }, { "name": "cache/tag-interop", @@ -1572,13 +1572,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git", - "reference": "6dec3a72c60cdaa1deecca1e9ca47fa8cd0def6c" + "reference": "98802c1034587987361da929e59ab312e540d861" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-8e8271.tar", - "reference": "6dec3a72c60cdaa1deecca1e9ca47fa8cd0def6c", - "shasum": "5b7600763ead9152905d170a2295da4af549d43f" + "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-ab8453.tar", + "reference": "98802c1034587987361da929e59ab312e540d861", + "shasum": "348165e75d2616d174924046e013ce99bb538b99" }, "require": { "cubist/cms-back": "dev-master" @@ -1610,7 +1610,7 @@ } ], "description": "Cubedesigners common users database", - "time": "2023-03-15T13:22:37+00:00" + "time": "2023-03-28T17:16:29+00:00" }, { "name": "cubist/azuretts", @@ -2170,13 +2170,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "5a476584825712624604f6a76c34433aa44e574f" + "reference": "64323281a1250182f95e7187d13ad15239ff37a7" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-b2137c.tar", - "reference": "5a476584825712624604f6a76c34433aa44e574f", - "shasum": "b7168ab47ddd33a94ac2f2c71b941aa672d5aebd" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-91a58a.tar", + "reference": "64323281a1250182f95e7187d13ad15239ff37a7", + "shasum": "ae5742d5912900a0fec3d8682eb5cceec2d6956f" }, "require": { "cubist/net": "dev-master", @@ -2209,7 +2209,7 @@ } ], "description": "Utilities class", - "time": "2023-03-15T17:53:16+00:00" + "time": "2023-03-22T17:16:53+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -3505,13 +3505,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "98083167b6beb91e5a54cb641fef8b7963bd3645" + "reference": "1321bea19745ffaf0d0944085dd7900ab8426e46" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-c64fbe.tar", - "reference": "98083167b6beb91e5a54cb641fef8b7963bd3645", - "shasum": "5ab6f1b8926c4209969f4fa174b4e8d5f6ed6e8e" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-825435.tar", + "reference": "1321bea19745ffaf0d0944085dd7900ab8426e46", + "shasum": "e3dff8ef16fd5ac940104a5545e1417db423d4bc" }, "require": { "barryvdh/laravel-debugbar": "^3.6", @@ -3545,7 +3545,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-03-15T17:57:55+00:00" + "time": "2023-03-22T17:17:02+00:00" }, { "name": "genealabs/laravel-model-caching", @@ -4325,7 +4325,7 @@ }, { "name": "jane-php/json-schema-runtime", - "version": "v7.4.2", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/janephp/json-schema-runtime.git", @@ -4381,13 +4381,13 @@ ], "description": "Jane runtime Library", "support": { - "source": "https://github.com/janephp/json-schema-runtime/tree/v7.4.2" + "source": "https://github.com/janephp/json-schema-runtime/tree/v7.4.3" }, "time": "2023-01-24T07:25:29+00:00" }, { "name": "jane-php/open-api-runtime", - "version": "v7.4.2", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/janephp/open-api-runtime.git", @@ -4444,22 +4444,22 @@ ], "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi", "support": { - "source": "https://github.com/janephp/open-api-runtime/tree/v7.4.2" + "source": "https://github.com/janephp/open-api-runtime/tree/v7.4.3" }, "time": "2021-12-16T13:26:58+00:00" }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.113", + "version": "v1.2.114", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "6710b75871da2b718550c2bc33388315a3b20151" + "reference": "62d0e6b38f6715c673e156ffb0fc894791de3452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/6710b75871da2b718550c2bc33388315a3b20151", - "reference": "6710b75871da2b718550c2bc33388315a3b20151", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/62d0e6b38f6715c673e156ffb0fc894791de3452", + "reference": "62d0e6b38f6715c673e156ffb0fc894791de3452", "shasum": "" }, "require": { @@ -4496,9 +4496,9 @@ ], "support": { "issues": "https://github.com/JayBizzle/Crawler-Detect/issues", - "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.113" + "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.114" }, - "time": "2023-02-02T21:01:40+00:00" + "time": "2023-03-21T21:54:27+00:00" }, { "name": "jenssegers/agent", @@ -7678,20 +7678,20 @@ }, { "name": "psr/cache", - "version": "1.0.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/php-fig/cache/zipball/213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", + "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { @@ -7711,7 +7711,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for caching libraries", @@ -7721,9 +7721,9 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "source": "https://github.com/php-fig/cache/tree/2.0.0" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-02-03T23:23:37+00:00" }, { "name": "psr/container", @@ -9099,16 +9099,16 @@ }, { "name": "spatie/laravel-permission", - "version": "5.9.1", + "version": "5.10.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "a88ed98c8937442737e0c50163682e832d608f13" + "reference": "5d0a703ece4636e6bde98eb85ac72b40aa6e42bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/a88ed98c8937442737e0c50163682e832d608f13", - "reference": "a88ed98c8937442737e0c50163682e832d608f13", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/5d0a703ece4636e6bde98eb85ac72b40aa6e42bc", + "reference": "5d0a703ece4636e6bde98eb85ac72b40aa6e42bc", "shasum": "" }, "require": { @@ -9169,7 +9169,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/5.9.1" + "source": "https://github.com/spatie/laravel-permission/tree/5.10.0" }, "funding": [ { @@ -9177,7 +9177,7 @@ "type": "github" } ], - "time": "2023-02-06T21:37:02+00:00" + "time": "2023-03-22T02:57:36+00:00" }, { "name": "spatie/laravel-signal-aware-command", @@ -9459,23 +9459,23 @@ }, { "name": "swayok/alternative-laravel-cache", - "version": "6.1.8", + "version": "6.1.10", "source": { "type": "git", "url": "https://github.com/swayok/alternative-laravel-cache.git", - "reference": "e3aa7c2940c524e4628966ae6127952371a76417" + "reference": "31df4d2e3fa9b44b5b3a063f34b0e7bd4abb4236" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/e3aa7c2940c524e4628966ae6127952371a76417", - "reference": "e3aa7c2940c524e4628966ae6127952371a76417", + "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/31df4d2e3fa9b44b5b3a063f34b0e7bd4abb4236", + "reference": "31df4d2e3fa9b44b5b3a063f34b0e7bd4abb4236", "shasum": "" }, "require": { "cache/adapter-common": "^1.0.0", "cache/hierarchical-cache": "^1.0.0", "laravel/framework": ">=6.0", - "php": "^7.2.5|^8.0|^8.1" + "php": ">=7.2.5" }, "require-dev": { "cache/memcached-adapter": "^1.0", @@ -9485,10 +9485,10 @@ "swayok/cache-filesystem-adapter": "^1.0.0" }, "suggest": { - "cache/filesystem-adapter": "Required to use file-based cache", "cache/memcached-adapter": "Required to use Memcache-based cache", "cache/predis-adapter": "Required to use Redis-based cache through predis/predis package", - "cache/redis-adapter": "Required to use Redis-based cache through php-redis extension (recommended - faster and more stable then predis)" + "cache/redis-adapter": "Required to use Redis-based cache through php-redis extension (recommended - faster and more stable then predis)", + "swayok/cache-filesystem-adapter": "Required to use file-based cache" }, "type": "library", "extra": { @@ -9523,9 +9523,9 @@ ], "support": { "issues": "https://github.com/swayok/alternative-laravel-cache/issues", - "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.8" + "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.10" }, - "time": "2022-10-29T20:03:06+00:00" + "time": "2023-03-16T10:54:40+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -14256,16 +14256,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.12", + "version": "v0.11.14", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7" + "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/52cb7c47d403c31c0adc9bf7710fc355f93c20f7", - "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17", + "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17", "shasum": "" }, "require": { @@ -14326,9 +14326,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.12" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.14" }, - "time": "2023-01-29T21:24:40+00:00" + "time": "2023-03-28T03:41:01+00:00" }, { "name": "sebastian/code-unit-reverse-lookup",