Merge branch '4.x' into 4.14

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed a bug where blank user group descriptions weren’t getting omitted from project config data. ([#16272](https://github.com/craftcms/cms/pull/16272))
 - Fixed a bug where pressing <kbd>Return</kbd> when a color text input within an editable table was focused was submitting the form rather than moving focus to the next row.
+- Fixed a JavaScript error that occurred on the Plugins index page, if there were any missing plugins associated with the Craft CMS license and no plugins were Composer-installed yet.
 
 ## 4.13.5 - 2024-12-03
 

src/elements/User.php

@@ -1315,8 +1315,8 @@ protected function thumbSvg(): ?string
         // Choose a color based on the UUID
         $uid = strtolower($this->uid ?? '00ff');
         $totalColors = count(self::$photoColors);
-        $color1Index = base_convert(substr($uid, 0, 2), 16, 10) % $totalColors;
-        $color2Index = base_convert(substr($uid, 2, 2), 16, 10) % $totalColors;
+        $color1Index = (int)base_convert(substr($uid, 0, 2), 16, 10) % $totalColors;
+        $color2Index = (int)base_convert(substr($uid, 2, 2), 16, 10) % $totalColors;
         if ($color2Index === $color1Index) {
             $color2Index = ($color1Index + 1) % $totalColors;
         }

src/elements/db/ElementQuery.php

@@ -1359,6 +1359,7 @@ public function cache($duration = true, $dependency = null): \yii\db\Query|Eleme
 
     /**
      * @inheritdoc
+     * @return Query
      * @throws QueryAbortedException if it can be determined that there won’t be any results
      */
     public function prepare($builder): Query

src/elements/db/EntryQuery.php

@@ -817,7 +817,6 @@ public function expiryDate(mixed $value): self
      */
     public function status(array|string|null $value): self
     {
-        /** @var self */
         return parent::status($value);
     }
 

src/elements/db/UserQuery.php

@@ -744,7 +744,6 @@ public function lastLoginDate(mixed $value): self
      */
     public function status(array|string|null $value): self
     {
-        /** @var self */
         return parent::status($value);
     }
 

src/helpers/App.php

@@ -637,6 +637,7 @@ public static function phpExecutable(): ?string
 
         if (
             getenv('PHP_BINARY') === false &&
+            /** @phpstan-ignore-next-line */
             PHP_BINARY &&
             PHP_SAPI === 'cgi-fcgi' &&
             str_ends_with(PHP_BINARY, 'php-cgi')

src/services/Elements.php

@@ -3393,7 +3393,7 @@ private function _saveElementInternal(
             }
 
             // Save the element’s site settings record
-            if ($element->isNewForSite) {
+            if ($element->isNewForSite || !isset($siteSettingsRecord)) {
                 // First time we've saved the element for this site
                 $siteSettingsRecord = new Element_SiteSettingsRecord();
                 $siteSettingsRecord->elementId = $element->id;

src/web/UrlManager.php

@@ -84,9 +84,9 @@ class UrlManager extends \yii\web\UrlManager
     private array $_routeParams = [];
 
     /**
-     * @var ElementInterface|false|null
+     * @var ElementInterface|false
      */
-    private null|false|ElementInterface $_matchedElement = null;
+    private ElementInterface|false $_matchedElement;
 
     /**
      * @var mixed
@@ -266,7 +266,7 @@ public function setMatchedElement(ElementInterface|false|null $element): void
             $element = false;
         }
 
-        $this->_matchedElement = $element;
+        $this->_matchedElement = $element ?? false;
         $this->_matchedElementRoute = $element;
     }
 

src/web/assets/plugins/src/PluginManager.js

@@ -47,7 +47,7 @@ import './plugins.scss';
       },
 
       addUninstalledPluginRow: function (handle, info) {
-        const $table = $('#plugins');
+        let $table = $('#plugins');
         if (!$table.length) {
           $table = $('<table/>', {
             id: 'plugins',