From: Vincent Vanwaelscappel Date: Thu, 7 Dec 2023 14:16:26 +0000 (+0100) Subject: wip #6433 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=98d4ac0b196370e10dc40576a9cd04cc166c3494;p=cubist_cms-back.git wip #6433 @1 --- diff --git a/composer.json b/composer.json index 5213926..ec1f30b 100644 --- a/composer.json +++ b/composer.json @@ -24,21 +24,21 @@ "ext-libxml": "*", "ext-json": "*", "ext-redis": "*", - "backpack/crud": "^5.5.5", + "backpack/crud": "^5.6.1", "backpack/backupmanager": "^v3.0.9", "backpack/logmanager": "^v4.0.10", "backpack/permissionmanager": "^6.0.16", - "backpack/pro": "^1.6.4", + "backpack/pro": "^1.6.6", "cubist/cms-front": "dev-backpack5", "cubist/util": "dev-master", "cubist/locale": "dev-backpack5", "cubist/laravel-backpack-dropzone-field": "dev-master", - "spatie/laravel-translatable": "^6.4.0", + "spatie/laravel-translatable": "^6.5.0", "venturecraft/revisionable": "^1.40.0", "cviebrock/eloquent-sluggable": "^10.0.0", "lavary/laravel-menu": "^v1.8.3", "graham-campbell/markdown": "^v15.0.0", - "barryvdh/laravel-debugbar": "^v3.8.1", + "barryvdh/laravel-debugbar": "^v3.9.2", "league/commonmark": "^2.4.0", "cviebrock/laravel-elasticsearch": "^10.0.0", "spatie/laravel-honeypot": "^4.3.2", @@ -48,10 +48,10 @@ "backpack/revise-operation": "^1.0.12", "digitallyhappy/toggle-field-for-backpack": "^2.0.1", "calebporzio/parental": "^v1.3.3", - "laravel/framework": "^v10.6.2", + "laravel/framework": "^v10.33.0", "laravel-lang/lang": "12.19.4", - "laravel-lang/publisher": "^v14.6.4", - "spatie/laravel-permission": "^4.4.3|^5.10.0", + "laravel-lang/publisher": "^v14.7.4", + "spatie/laravel-permission": "^4.4.3|^5.11.0", "mews/purifier": "^3.4" }, "require-dev": { diff --git a/src/app/Cache/CacheManager.php b/src/app/Cache/CacheManager.php index b645b0e..c75a8b4 100644 --- a/src/app/Cache/CacheManager.php +++ b/src/app/Cache/CacheManager.php @@ -1,6 +1,7 @@ remember($key, $ttl, $callback); } + + public function remember($key, $ttl, Closure $callback) + { + start_measure('Cache::remember ' . $key); + + $res = parent::remember($key, $ttl, $callback); + stop_measure('Cache::remember ' . $key); + + return $res; + } + + public function get($key, $default = null): mixed + { + start_measure('Cache::get ' . $key); + $res = parent::get($key, $default); + stop_measure('Cache::get ' . $key); + + return $res; + } } diff --git a/src/app/Middleware/BackLocaleSelector.php b/src/app/Middleware/BackLocaleSelector.php index 7635ab1..1532014 100644 --- a/src/app/Middleware/BackLocaleSelector.php +++ b/src/app/Middleware/BackLocaleSelector.php @@ -13,6 +13,7 @@ class BackLocaleSelector extends CubistMiddleware { public function handle(Request $request, Closure $next) { + start_measure('Middleware '.get_class($this)); parent::handle($request, $next); $availableLanguages = config('backpack.base.locales', ['en']); @@ -26,7 +27,7 @@ class BackLocaleSelector extends CubistMiddleware $locale = $availableLanguages[0]; } $this->setLocale($locale); - + stop_measure('Middleware '.get_class($this)); return $this->getResponse(); } diff --git a/src/app/Middleware/BunchRequest.php b/src/app/Middleware/BunchRequest.php index d481668..c6bf6cb 100644 --- a/src/app/Middleware/BunchRequest.php +++ b/src/app/Middleware/BunchRequest.php @@ -11,6 +11,7 @@ class BunchRequest extends CubistMiddleware { public function handle(Request $request, Closure $next) { + start_measure('Middleware '.get_class($this)); parent::handle($request, $next); $appendComposite = []; @@ -38,6 +39,7 @@ class BunchRequest extends CubistMiddleware $newBag = array_merge($newBag, $appendComposite); $request->request->replace($newBag); + stop_measure('Middleware '.get_class($this)); return $this->getResponse(); } diff --git a/src/app/Middleware/CheckDisabledUsers.php b/src/app/Middleware/CheckDisabledUsers.php index 518f25f..b15d194 100644 --- a/src/app/Middleware/CheckDisabledUsers.php +++ b/src/app/Middleware/CheckDisabledUsers.php @@ -12,6 +12,7 @@ class CheckDisabledUsers { public function handle(Request $request, Closure $next) { + start_measure('Middleware '.get_class($this)); if (auth()->check()) { $user = auth()->user(); if ($user instanceof CubistMagicAuthenticatable && $user->isDisabled()) { @@ -22,6 +23,7 @@ class CheckDisabledUsers return redirect('/')->with('error', 'Unknown account'); } } + stop_measure('Middleware '.get_class($this)); return $next($request); } } diff --git a/src/app/Middleware/EmailObfuscate.php b/src/app/Middleware/EmailObfuscate.php index f50f2e7..478703d 100644 --- a/src/app/Middleware/EmailObfuscate.php +++ b/src/app/Middleware/EmailObfuscate.php @@ -12,6 +12,7 @@ class EmailObfuscate extends CubistMiddleware { public function handle(Request $request, Closure $next) { + start_measure('Middleware '.get_class($this)); parent::handle($request, $next); if ($this->onAdmin()) { return $this->getResponse(); @@ -25,6 +26,7 @@ class EmailObfuscate extends CubistMiddleware $content = $this->obfuscate($response->getContent()); $response->setContent($content); } + stop_measure('Middleware '.get_class($this)); return $response; } diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php index 4eea5b1..0841e4c 100644 --- a/src/app/Middleware/LocaleSelector.php +++ b/src/app/Middleware/LocaleSelector.php @@ -12,6 +12,7 @@ class LocaleSelector extends CubistMiddleware { public function handle(Request $request, Closure $next) { + start_measure('Middleware '.get_class($this)); parent::handle($request, $next); $defaultLocale = Locale::getDefaultLocale(); @@ -44,6 +45,7 @@ class LocaleSelector extends CubistMiddleware } $this->setLocale($selectedLocale); + stop_measure('Middleware '.get_class($this)); return $this->getResponse(); } diff --git a/src/app/Middleware/VariantSelector.php b/src/app/Middleware/VariantSelector.php index 7d675d9..0dbdff4 100644 --- a/src/app/Middleware/VariantSelector.php +++ b/src/app/Middleware/VariantSelector.php @@ -12,6 +12,7 @@ class VariantSelector extends CubistMiddleware { public function handle(Request $request, Closure $next) { + start_measure('Middleware ' . get_class($this)); parent::handle($request, $next); if (!App::hasVariant()) { @@ -21,6 +22,7 @@ class VariantSelector extends CubistMiddleware $variant = $this->_getVariantByDomain($request, Locale::getLocales()); App::setVariant($variant); + stop_measure('Middleware ' . get_class($this)); return $this->getResponse(); }