fix: resolve module drift in imports, guards, and request context

This commit is contained in:
2026-03-20 00:22:23 +01:00
parent 60c27e50cb
commit 5f37562796
8 changed files with 34 additions and 16 deletions

View File

@@ -4,6 +4,7 @@ namespace MintyPHP\Module\Bookmarks\Providers;
use MintyPHP\App\AppContainer;
use MintyPHP\App\Module\Contracts\LayoutContextProvider;
use MintyPHP\Http\Request;
use MintyPHP\Module\Bookmarks\Support\BookmarkUrlNormalizer;
final class BookmarksLayoutProvider implements LayoutContextProvider
@@ -14,10 +15,15 @@ final class BookmarksLayoutProvider implements LayoutContextProvider
? $session['module.bookmarks.grouped']
: ['groups' => [], 'ungrouped' => []];
$currentPath = BookmarkUrlNormalizer::canonicalizeRequestUri(
(string) ($_SERVER['REQUEST_URI'] ?? ''),
localeBase()
);
$requestUri = '/' . ltrim(Request::pathWithQuery(), '/');
$localePath = (string) (parse_url(localeBase(), PHP_URL_PATH) ?? '/');
$localePath = Request::stripBasePath($localePath);
$localeBasePath = '/' . trim($localePath, '/');
if ($localeBasePath !== '/') {
$localeBasePath .= '/';
}
$currentPath = BookmarkUrlNormalizer::canonicalizeRequestUri($requestUri, $localeBasePath);
return [
'bookmarks.nav' => [

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);

View File

@@ -1,12 +1,14 @@
<?php
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Module\Bookmarks\BookmarksAuthorizationPolicy;
use MintyPHP\Module\Bookmarks\Service\BookmarkService;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
Guard::requireAbilityOrForbidden(BookmarksAuthorizationPolicy::ABILITY_USE);
if (requestInput()->method() !== 'POST') {
http_response_code(405);