Merge branch '5.x' into 6.x

Author: gharlan

.tools/psalm/baseline.xml

@@ -784,7 +784,6 @@
   </file>
   <file src="pages/mailer/checkmail.php">
     <MixedArgument>
-      <code><![CDATA[$str]]></code>
       <code><![CDATA[Core::getConfig('phpmailer_test_address')]]></code>
     </MixedArgument>
     <MixedAssignment>

AGENTS.md

@@ -76,7 +76,8 @@ All core classes live in the `Redaxo\Core\` namespace, mapped to `src/`. Tests l
 - PHPStan level 6 + Psalm level 1, both with baselines in `.tools/phpstan/` and `.tools/psalm/`
 - PHPUnit strict mode: warnings, notices, deprecations all fail the build
 - In YAML files, prefer single quotes when quoting is needed
-- Comments and commit messages in English; commits use conventional commits (`feat:`, `fix:`, `refactor:`, `docs:`, `chore:`, `test:`, `style:`, `ci:`)
+- Comments and commit messages in English; commits use conventional commits (`feat:`, `fix:`, `refactor:`, `docs:`, `chore:`, `test:`, `style:`, `ci:`). The same rules (English + conventional commit prefix) apply to PR titles, since they become the commit message on squash merge
+- Don't write bare `@name` tokens in commit messages (e.g. annotations like `@internal`/`@deprecated`, or anything that looks like a username): GitHub autolinks them into user mentions and pings a random account. Wrap them in backticks (`` `@internal` ``) — GitHub renders code spans in commit messages and doesn't link mentions inside them
 - **Properties**: prefer modern public properties (with `readonly`, asymmetric visibility, property hooks as appropriate) over getter/setter methods
 
 ### Baselines
@@ -86,5 +87,6 @@ The static analysis baselines exist to grandfather pre-existing issues. **New co
 
 - `6.x` is actively under development and has not shipped a stable release yet. Breaking changes to public APIs are acceptable while we still can — prefer **fixing the design** over piling on `@deprecated` shims.
 - `@internal`-marked symbols may change without notice.
+- Mark new classes `@internal` by default. Only omit it when the class is deliberately part of the public API. In that case, review every public property, constant, and method individually and mark `@internal` each one that isn't meant to be a public contract — public visibility alone shouldn't lock you into supporting it.
 - DB schema changes belong in the relevant install/update path.
 - Behavior that needs to stay aligned with `5.x` (because changes are regularly merged up) should be kept structurally close to its `5.x` counterpart unless the divergence is intentional.

assets/css/redaxo.css

@@ -450,21 +450,61 @@ jQuery(function($){
     $("[autofocus]").trigger("focus");
 });
 
-// scroll to anchor element + adjust scroll-padding-top
+// scroll to anchor element
+// (scrollIntoView honors the CSS scroll-padding-top, so the sticky navbar
+// offset is handled automatically — no manual correction needed)
 function scrollToAnchor() {
-    if (window.location.hash) {
-        var scrollPadding = window.getComputedStyle(document.documentElement).getPropertyValue('scroll-padding-top');
-        scrollPadding = parseInt(scrollPadding, 10); // so 65px will be 65
-        if (scrollPadding > 0) {
-            var anchorItem = document.querySelector(window.location.hash);
-            if (anchorItem) {
-                var anchorItemPosition = anchorItem.getBoundingClientRect().top;
-                if (!isNaN(scrollPadding) && scrollPadding > 0 && anchorItemPosition < scrollPadding) {
-                    window.scrollBy(0, -scrollPadding);
-                }
-            }
-        }
+    if (!window.location.hash) {
+        return;
+    }
+    var anchorItem = document.querySelector(window.location.hash);
+    if (!anchorItem) {
+        return;
     }
+
+    var scrollToItem = function () {
+        anchorItem.scrollIntoView({block: 'start'});
+    };
+
+    // Defer to the next frame so the freshly swapped-in pjax content is laid
+    // out before we scroll, instead of guessing a fixed timeout.
+    requestAnimationFrame(function () {
+        requestAnimationFrame(scrollToItem);
+    });
+
+    // Images that are still loading will shift the layout once they arrive and
+    // push the anchor out of position. Re-scroll whenever one finishes, but
+    // stop as soon as the user scrolls manually so we don't hijack the page.
+    var container = anchorItem.closest('[data-pjax-container]') || document;
+    var pending = Array.prototype.filter.call(container.querySelectorAll('img'), function (img) {
+        return !img.complete;
+    });
+    if (!pending.length) {
+        return;
+    }
+
+    var remaining = pending.length;
+    var stop = function () {
+        window.removeEventListener('wheel', stop);
+        window.removeEventListener('touchstart', stop);
+        pending.forEach(function (img) {
+            img.removeEventListener('load', onImageDone);
+            img.removeEventListener('error', onImageDone);
+        });
+    };
+    var onImageDone = function () {
+        scrollToItem();
+        if (--remaining === 0) {
+            stop();
+        }
+    };
+
+    window.addEventListener('wheel', stop, {passive: true});
+    window.addEventListener('touchstart', stop, {passive: true});
+    pending.forEach(function (img) {
+        img.addEventListener('load', onImageDone);
+        img.addEventListener('error', onImageDone);
+    });
 }
 
 var rex_loader = {

assets/css/styles.css

@@ -74,10 +74,10 @@ body:after {
             //margin-top: -$navbar-height;
             padding-top: $top-navbar-height;
             table-layout: fixed;
+        }
 
-            .rex-is-popup& {
-                padding-top: $top-popup-navbar-height;
-            }
+        &.rex-is-popup .rex-page-container {
+            padding-top: $top-popup-navbar-height;
         }
 
         .rex-nav-main {
@@ -347,11 +347,10 @@ body:after {
     &, a {
         color: $alert-success-text;
     }
-
-    tr&:hover > th,
-    tr&:hover > td {
-        background-color: darken($alert-success-bg, 10%);
-    }
+}
+tr.rex-state-success:hover > th,
+tr.rex-state-success:hover > td {
+    background-color: darken($alert-success-bg, 10%);
 }
 .rex-state-info,
 .rex-state-notice {
@@ -360,23 +359,23 @@ body:after {
     &, a {
         color: $alert-info-text;
     }
-
-    tr&:hover > th,
-    tr&:hover > td {
-        background-color: darken($alert-info-bg, 10%);
-    }
+}
+tr.rex-state-info:hover > th,
+tr.rex-state-info:hover > td,
+tr.rex-state-notice:hover > th,
+tr.rex-state-notice:hover > td {
+    background-color: darken($alert-info-bg, 10%);
 }
 .rex-state-warning {
     background-color: $alert-warning-bg;
 
     &, a {
         color: $alert-warning-text;
     }
-
-    tr&:hover > th,
-    tr&:hover > td {
-        background-color: darken($alert-warning-bg, 10%);
-    }
+}
+tr.rex-state-warning:hover > th,
+tr.rex-state-warning:hover > td {
+    background-color: darken($alert-warning-bg, 10%);
 }
 .rex-state-danger,
 .rex-state-error {
@@ -385,11 +384,12 @@ body:after {
     &, a {
         color: $alert-danger-text;
     }
-
-    tr&:hover > th,
-    tr&:hover > td {
-        background-color: darken($alert-danger-bg, 10%);
-    }
+}
+tr.rex-state-danger:hover > th,
+tr.rex-state-danger:hover > td,
+tr.rex-state-error:hover > th,
+tr.rex-state-error:hover > td {
+    background-color: darken($alert-danger-bg, 10%);
 }
 
 .rex-primary-id {
@@ -609,13 +609,15 @@ body:after {
 
 // correcting bootstrap vendor regarding Quick fix for badges in buttons
 // https://github.com/redaxo/core/blob/120950020f35e9158030513744835c936e527bc6/assets_src/vendor/bootstrap/assets/stylesheets/bootstrap/_badges.scss#L26
-  .btn & {
-    position: relative;
-    top: 0px;
-  }
+.badge {
+    .btn & {
+        position: relative;
+        top: 0px;
+    }
 
-  .btn-xs &,
-  .btn-group-xs > .btn & {
-    top: 0;
-    padding: 1px 5px;
-  }
+    .btn-xs &,
+    .btn-group-xs > .btn & {
+        top: 0;
+        padding: 1px 5px;
+    }
+}

assets/standard.js

@@ -24,7 +24,7 @@
     vertical-align: top;
     white-space: nowrap;
 
-    .rex-truncate-expandable&:hover,
+    &.rex-truncate-expandable:hover,
     .rex-truncate-expandable > &:hover {
         max-width: 10000px !important;
     }

assets_src/scss/_base.scss

@@ -260,11 +260,6 @@ $transitionDuration: 300ms;
                 height: 22px;
                 transform: translate(-50%, -50%) rotate(0);
                 transition: transform $transitionDuration $easeInCubic;
-
-                .rex-nav-main-is-visible& {
-                    transform: translate(-50%, -50%) rotate(-180deg);
-                    transition: transform $transitionDuration $easeOutCubic;
-                }
             }
 
             .icon-bar {
@@ -290,22 +285,6 @@ $transitionDuration: 300ms;
                 &:nth-child(3) {
                     transform: translate(-50%, 5px);
                 }
-
-                .rex-nav-main-is-visible& {
-                    transition: transform $transitionDuration $easeOutCubic, opacity $transitionDuration $easeOutCubic;
-
-                    &:nth-child(1) {
-                        transform: translate(-50%, -50%) rotate(45deg);
-                    }
-
-                    &:nth-child(2) {
-                        opacity: 0;
-                    }
-
-                    &:nth-child(3) {
-                        transform: translate(-50%, -50%) rotate(-45deg);
-                    }
-                }
             }
 
             @media (min-width: $grid-float-breakpoint) {
@@ -335,37 +314,18 @@ $transitionDuration: 300ms;
                 transform: translateY(-$navbar-height); // hide above navbar
                 transition: opacity ($transitionDuration * 2) $easeInOutCubic, transform 0ms linear ($transitionDuration * 2); // fade out and transform afterwards
 
-                .rex-nav-main-is-visible& {
-                    display: block;
-                    opacity: 1;
-                    transform: translateY(0); // show at target position
-                    transition: opacity ($transitionDuration * 2) $easeInOutCubic ($transitionDuration * 2), transform 0ms linear 0ms; // fade in and immediately transform
-                }
-
                 > .nav {
                     margin: 0;
                 }
             }
         }
-
-        .rex-is-popup& {
-            z-index: auto;
-
-            .navbar {
-                min-height: $top-popup-navbar-height;
-                box-shadow: none;
-                padding-top: 0;
-                padding-bottom: 0;
-            }
-        }
     }
 
     .rex-nav-top-is-fixed {
         position: fixed;
     }
 
-    .rex-nav-top-is-elevated,
-    .rex-nav-main-is-visible& {
+    .rex-nav-top-is-elevated {
         .navbar {
             box-shadow: 0 2px 2px 0 rgba($color-a-darker, 0.2);
         }
@@ -385,12 +345,61 @@ $transitionDuration: 300ms;
         @media (min-width: $screen-lg-min) {
             padding-right: $grid-gutter-width;
         }
+    }
+
+    &.rex-is-popup {
+        .rex-nav-top {
+            z-index: auto;
+
+            .navbar {
+                min-height: $top-popup-navbar-height;
+                box-shadow: none;
+                padding-top: 0;
+                padding-bottom: 0;
+            }
+        }
 
-        .rex-is-popup& {
+        .rex-nav-top .container-fluid {
             padding-right: floor($grid-gutter-width / 2);
             justify-content: flex-start;
         }
     }
+
+    &.rex-nav-main-is-visible {
+        .rex-nav-top .navbar-toggle .icon-bars {
+            transform: translate(-50%, -50%) rotate(-180deg);
+            transition: transform $transitionDuration $easeOutCubic;
+        }
+
+        .rex-nav-top .navbar-toggle .icon-bar {
+            transition: transform $transitionDuration $easeOutCubic, opacity $transitionDuration $easeOutCubic;
+
+            &:nth-child(1) {
+                transform: translate(-50%, -50%) rotate(45deg);
+            }
+
+            &:nth-child(2) {
+                opacity: 0;
+            }
+
+            &:nth-child(3) {
+                transform: translate(-50%, -50%) rotate(-45deg);
+            }
+        }
+
+        .navbar {
+            box-shadow: 0 2px 2px 0 rgba($color-a-darker, 0.2);
+        }
+
+        @media (max-width: $grid-float-breakpoint-max) {
+            .rex-nav-top .rex-nav-meta {
+                display: block;
+                opacity: 1;
+                transform: translateY(0); // show at target position
+                transition: opacity ($transitionDuration * 2) $easeInOutCubic ($transitionDuration * 2), transform 0ms linear 0ms; // fade in and immediately transform
+            }
+        }
+    }
 }
 
 .rex-page-nav {

assets_src/scss/_helper.scss

@@ -24,10 +24,6 @@ html {
         height: auto;
         min-height: 100%;
         padding-top: 0;
-
-        .rex-is-popup& {
-            padding-top: 0; // required due to specificity
-        }
     }
 
     .rex-page-main {
@@ -39,19 +35,25 @@ html {
         @media (max-width: $grid-float-breakpoint-max) {
             padding-top: $top-mobile-navbar-height;
         }
-
-        .rex-is-popup& {
-            padding-top: $top-popup-navbar-height;
-        }
     }
 
     .rex-page-main-inner {
         @media (min-width: $screen-lg-min) {
             padding-left: $grid-gutter-width;
             padding-right: $grid-gutter-width;
         }
+    }
+
+    &.rex-is-popup {
+        .rex-page-container {
+            padding-top: 0; // required due to specificity
+        }
+
+        .rex-page-main {
+            padding-top: $top-popup-navbar-height;
+        }
 
-        .rex-is-popup& {
+        .rex-page-main-inner {
             padding-left: floor($grid-gutter-width / 2);
             padding-right: floor($grid-gutter-width / 2);
         }