Merge branch '5.x' into bugfix/18711-editing-entry-authors

Author: brandonkelly

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a bug where entries weren’t redirecting back to their section’s page’s URL by default.
+- Fixed a bug where the `resourceBasePath` and `resourceBaseUrl` config settings weren’t being respected for console requests. ([#18685](https://github.com/craftcms/cms/issues/18685))
+- Fixed a bug where eager-loadable GraphQL fields could be populated with the wrong field’s results, if they followed a fragment with a `*Interface` type condition. ([#18708](https://github.com/craftcms/cms/issues/18708))
+
 ## 5.9.20 - 2026-04-14
 
 - Fixed an issue that prevented Craft from being installed. ([#18700](https://github.com/craftcms/cms/issues/18700))

composer.lock

@@ -51,5 +51,4 @@ parameters:
         - '#^Dead catch#'
         - '#^PHPDoc tag @mixin contains invalid type CraftTrait\.$#'
         - '#^Parameter \#2 \$callback of function usort expects#'
-        - '#is never assigned craft\\base\\MemoizableArray#'
     treatPhpDocTypesAsCertain: false

phpstan.neon

@@ -3423,7 +3423,7 @@ public function getSearchKeywords(string $attribute): string
             $event = new DefineAttributeKeywordsEvent(['attribute' => $attribute]);
             $this->trigger(self::EVENT_DEFINE_KEYWORDS, $event);
             if ($event->handled) {
-                return $event->keywords ?? '';
+                return $event->keywords;
             }
         }
 

src/base/Element.php

@@ -105,7 +105,7 @@ protected function containerAttributes(?ElementInterface $element = null, bool $
     {
         $attributes = [];
         if ($this->hasCustomWidth()) {
-            $attributes['class'][] = 'width-' . ($this->width ?? 100);
+            $attributes['class'][] = "width-$this->width";
         }
         return $attributes;
     }

src/base/FieldLayoutElement.php

@@ -26,6 +26,10 @@
         'assetIndexer' => [
             'class' => craft\services\AssetIndexer::class,
         ],
+        'assetManager' => function() {
+            $config = craft\helpers\App::assetManagerConfig();
+            return Craft::createObject($config);
+        },
         'auth' => [
             'class' => craft\services\Auth::class,
         ],

src/config/app.php

@@ -5,10 +5,6 @@
 return [
     'class' => craft\web\Application::class,
     'components' => [
-        'assetManager' => function() {
-            $config = craft\helpers\App::assetManagerConfig();
-            return Craft::createObject($config);
-        },
         'dumper' => function() {
             $dumper = new HtmlDumper();
             $dumper->setTheme('light');

src/config/app.web.php

@@ -320,7 +320,6 @@ public function actionSaveEntry(bool $duplicate = false): ?Response
             $success = false;
         } finally {
             if ($isNotNew) {
-                /** @phpstan-ignore-next-line  */
                 $mutex->release($lockKey);
             }
         }

src/controllers/EntriesController.php

@@ -2275,7 +2275,8 @@ protected function cpEditUrl(): ?string
      */
     public function getPostEditUrl(): ?string
     {
-        return UrlHelper::cpUrl('entries');
+        $page = $this->getSection()?->getPage();
+        return UrlHelper::cpUrl(sprintf('content/%s', $page ? StringHelper::toKebabCase($page) : 'entries'));
     }
 
     /**

src/elements/Entry.php

@@ -422,7 +422,9 @@ public function normalizeValue(mixed $value, ?ElementInterface $element): mixed
             return null;
         }
 
+        /** @phpstan-ignore-next-line */
         if ($this->showTimeZone && (isset($timeZone) || (is_array($value) && !empty($value['timezone'])))) {
+            /** @phpstan-ignore-next-line */
             $date->setTimezone(new DateTimeZone($timeZone ?? $value['timezone']));
         }