Merge branch '5.x' into 5.10

Author: brandonkelly

CHANGELOG.md

@@ -3,8 +3,11 @@
 ## Unreleased
 
 - Most classes can now be instantiated via the `create()` Twig function. ([#18376](https://github.com/craftcms/cms/discussions/18376))
+- Added `craft\helpers\ProjectConfig::pathDepth()`.
+- Deprecated `craft\services\ProjectConfig::getPendingChangeSummary()`.
 - Fixed a bug where element search query caches weren’t getting invalidated when elements’ search keywords were indexed. ([#18275](https://github.com/craftcms/cms/issues/18275))
 - Fixed a bug where disabled sites weren’t getting loaded when running Codeception tests. ([#18638](https://github.com/craftcms/cms/issues/18638))
+- Fixed a bug where custom entry index page icons weren’t getting stored properly if the source name contained periods. ([#18631](https://github.com/craftcms/cms/issues/18631))
 
 ## 5.9.18 - 2026-03-26
 

src/helpers/ProjectConfig.php

@@ -485,7 +485,9 @@ public static function unpackAssociativeArray(array $array, bool $recursive = tr
     public static function flattenConfigArray(array $array, string $path, array &$result): void
     {
         foreach ($array as $key => $value) {
-            $thisPath = ltrim($path . '.' . $key, '.');
+            // escape periods within keys, so they don't get confused as multiple path segments
+            // (see https://github.com/craftcms/cms/issues/18631)
+            $thisPath = ltrim(sprintf('%s.%s', $path, str_replace('.', '\.', $key)), '.');
 
             if (is_array($value)) {
                 self::flattenConfigArray($value, $thisPath, $result);
@@ -527,7 +529,7 @@ public static function splitConfigIntoComponents(array $config): array
     public static function traverseDataArray(array &$data, string|array $path, mixed $value = null, bool $delete = false): mixed
     {
         if (is_string($path)) {
-            $path = explode('.', $path);
+            $path = static::pathSegments($path);
         }
 
         $nextSegment = array_shift($path);
@@ -784,9 +786,31 @@ public static function pathSegments(string $path): array
         if ($path === '') {
             throw new InvalidArgumentException('No project config path provided.');
         }
+
+        if (str_contains($path, '\.')) {
+            $segments = preg_split('/(?<!\\\)\./', $path);
+            return array_map(fn(string $segment) => str_replace('\.', '.', $segment), $segments);
+        }
+
         return explode('.', $path);
     }
 
+    /**
+     * Returns the number of segments in the given path.
+     *
+     * @param string $path
+     * @return int
+     * @since 5.9.19
+     */
+    public static function pathDepth(string $path): int
+    {
+        if (str_contains($path, '\.')) {
+            return preg_match_all('/(?<!\\\)\./', $path);
+        }
+
+        return substr_count($path, '.');
+    }
+
     /**
      * Returns the last segment in a given project config path.
      *
@@ -813,6 +837,10 @@ public static function pathWithoutLastSegment(string $path): ?string
     {
         $segments = static::pathSegments($path);
         array_pop($segments);
-        return !empty($segments) ? implode('.', $segments) : null;
+        if (empty($segments)) {
+            return null;
+        }
+        $segments = array_map(fn(string $segment) => str_replace('.', '\.', $segment), $segments);
+        return implode('.', $segments);
     }
 }

src/services/ProjectConfig.php

@@ -918,6 +918,7 @@ protected function persistInternalConfigValues(array $values): void
      * Returns a summary of all pending config changes.
      *
      * @return array
+     * @deprecated in 5.9.19
      */
     public function getPendingChangeSummary(): array
     {
@@ -929,7 +930,7 @@ public function getPendingChangeSummary(): array
         foreach ($pendingChanges as $type => $changes) {
             $summary[$type] = [];
             foreach ($changes as $path) {
-                $pathParts = explode('.', $path);
+                $pathParts = ProjectConfigHelper::pathSegments($path);
                 if (count($pathParts) > 1) {
                     $summary[$type][$pathParts[0] . '.' . $pathParts[1]] = true;
                 }
@@ -1125,7 +1126,7 @@ public function defer(ConfigEvent $event, callable $handler): void
      */
     public function registerChangeEventHandler(string $event, string $path, callable $handler, mixed $data = null): void
     {
-        $specificity = substr_count($path, '.');
+        $specificity = ProjectConfigHelper::pathDepth($path);
         $pattern = '/^(?P<path>' . preg_quote($path, '/') . ')(?P<extra>\..+)?$/';
         $pattern = str_replace('\\{uid\\}', '(' . self::UID_PATTERN . ')', $pattern);
 
@@ -1487,8 +1488,8 @@ private function _getPendingChanges(?array $configData = null, bool $existsOnly
 
         // Sort by number of dots to ensure deepest paths listed first
         $sorter = function($a, $b) {
-            $aDepth = substr_count($a, '.');
-            $bDepth = substr_count($b, '.');
+            $aDepth = ProjectConfigHelper::pathDepth($a);
+            $bDepth = ProjectConfigHelper::pathDepth($b);
             return $bDepth <=> $aDepth;
         };
 
@@ -1848,7 +1849,7 @@ private function _loadInternalConfig(): ReadOnlyProjectConfigData
             $rows = $this->_createProjectConfigQuery()->orderBy('path')->pairs();
             foreach ($rows as $path => $value) {
                 $current = &$data;
-                $segments = explode('.', $path);
+                $segments = ProjectConfigHelper::pathSegments($path);
                 foreach ($segments as $segment) {
                     // If we're still traversing, enforce array to avoid errors.
                     /** @phpstan-ignore-next-line */