fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Felix Schneider
2026-03-20 00:22:23 +01:00
parent 60c27e50cb
commit 5f37562796
8 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/addressbook/web/js/pages/address-book-index.js
View File

@@ -1,9 +1,9 @@
import { initMultiSelect } from '/js/components/app-multiselect-init.js'; import { initMultiSelect } from '../../../../js/components/app-multiselect-init.js';
import { initMultiSelectCascade } from '/js/components/app-multiselect-cascade.js'; import { initMultiSelectCascade } from '../../../../js/components/app-multiselect-cascade.js';
import { initStandardListPage } from '/js/core/app-grid-factory.js'; import { initStandardListPage } from '../../../../js/core/app-grid-factory.js';
import { readPageConfig } from '/js/core/app-page-config.js'; import { readPageConfig } from '../../../../js/core/app-page-config.js';
import { warnOnce } from '/js/core/app-dom.js'; import { warnOnce } from '../../../../js/core/app-dom.js';
import { getAppBase, escapeHtml, buildBadgeList, gridFilterMultiCsv, gridFilterText } from '/js/pages/app-list-utils.js'; import { getAppBase, escapeHtml, buildBadgeList, gridFilterMultiCsv, gridFilterText } from '../../../../js/pages/app-list-utils.js';
const config = readPageConfig('address-book-index'); const config = readPageConfig('address-book-index');
if (config) { if (config) {

14
modules/bookmarks/lib/Module/Bookmarks/Providers/BookmarksLayoutProvider.php
View File

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

4
modules/bookmarks/pages/bookmarks/delete-data().php
View File

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

4
modules/bookmarks/pages/bookmarks/group-delete-data().php
View File

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

4
modules/bookmarks/pages/bookmarks/group-save-data().php
View File

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

4
modules/bookmarks/pages/bookmarks/reorder-data().php
View File

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

4
modules/bookmarks/pages/bookmarks/save-data().php
View File

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

4
modules/bookmarks/pages/bookmarks/update-data().php
View File

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