Merge branch '5.x' into 5.1

# Conflicts:
#	.github/workflows/ci.yml

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop
+      - 5.x
       - '5.1'
   pull_request:
 permissions:

.github/workflows/create-release.yml

@@ -53,15 +53,15 @@ jobs:
 
       - name: 'Initialize Craft 3 starter project'
         if: ${{ startsWith(github.event.client_payload.version, '3.') }}
-        run: 'composer create-project craftcms/craft=^1 ${{ env.PROJECT_DIRECTORY }}'
+        run: 'composer create-project craftcms/craft:^3 ${{ env.PROJECT_DIRECTORY }}'
 
       - name: 'Initialize Craft 4 starter project'
         if: ${{ startsWith(github.event.client_payload.version, '4.') }}
-        run: 'composer create-project craftcms/craft ${{ env.PROJECT_DIRECTORY }}'
+        run: 'composer create-project craftcms/craft:^4 ${{ env.PROJECT_DIRECTORY }}'
 
       - name: 'Initialize Craft 5 starter project'
         if: ${{ startsWith(github.event.client_payload.version, '5.') }}
-        run: 'composer create-project craftcms/craft=^5.0.0-alpha.1 ${{ env.PROJECT_DIRECTORY }}'
+        run: 'composer create-project craftcms/craft:^5 ${{ env.PROJECT_DIRECTORY }}'
 
       - name: 'Install specific Craft version'
         working-directory: ${{ env.PROJECT_DIRECTORY }}

packages/craftcms-sass/_mixins.scss

@@ -328,7 +328,6 @@ $menuBorderRadius: $mediumBorderRadius;
   // (sub-pixel antialiasing looks too bold/blurry with light text on dark background)
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
-  font-weight: 500;
 }
 
 @mixin light-focus-ring() {

src/Craft.php

@@ -33,7 +33,7 @@ class Craft extends Yii
     /** @deprecated in 5.0.0. [[\craft\enums\CmsEdition::Solo]] should be used instead. */
     public const Solo = 0;
     /** @deprecated in 5.0.0. [[\craft\enums\CmsEdition::Pro]] should be used instead. */
-    public const Pro = 1;
+    public const Pro = 2;
 
     /**
      * @var array The default cookie configuration.

src/base/PluginTrait.php

@@ -7,6 +7,8 @@
 
 namespace craft\base;
 
+use craft\enums\CmsEdition;
+
 /**
  * PluginTrait implements the common methods and properties for plugin classes.
  *
@@ -119,6 +121,12 @@ trait PluginTrait
      */
     public string $minVersionRequired = '';
 
+    /**
+     * @var CmsEdition The minimum required Craft CMS edition.
+     * @since 5.0.0
+     */
+    public CmsEdition $minCmsEdition = CmsEdition::Solo;
+
     /**
      * @var string The active edition.
      */

src/config/app.php

@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '5.0.0-beta.9',
+    'version' => '5.0.0',
     'schemaVersion' => '5.0.0.20',
     'minVersionRequired' => '4.4.0',
     'basePath' => dirname(__DIR__), // Defines the @app alias

src/config/cproutes/pro.php

@@ -2,11 +2,7 @@
 
 return [
     'myaccount/permissions' => 'users/permissions',
-    'users/new' => 'users/create',
-    'users/<userId:\d+>' => 'users/profile',
-    'users/<userId:\d+>/addresses' => 'users/addresses',
     'users/<userId:\d+>/permissions' => 'users/permissions',
-    'users/<source:{slug}>' => ['template' => 'users'],
     'settings/users' => ['template' => 'settings/users/groups/_index'],
     'settings/users/groups/new' => ['template' => 'settings/users/groups/_edit'],
     'settings/users/groups/<groupId:\d+>' => ['template' => 'settings/users/groups/_edit'],

src/config/cproutes/team.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'users/new' => 'users/create',
+    'users/<userId:\d+>' => 'users/profile',
+    'users/<userId:\d+>/addresses' => 'users/addresses',
+    'users/<source:{slug}>' => ['template' => 'users'],
+];

src/controllers/ElementsController.php

@@ -1933,6 +1933,10 @@ public function actionRecentActivity(): Response
     {
         $element = $this->_element();
 
+        if ($element instanceof Response) {
+            return $element;
+        }
+
         if (!$element || $element->getIsRevision()) {
             throw new BadRequestHttpException('No element was identified by the request.');
         }

src/controllers/PluginStoreController.php

@@ -67,6 +67,7 @@ public function actionIndex(): Response
                 'edition' => Craft::$app->edition->handle(),
             ],
             'cmsLicenseKey' => App::licenseKey(),
+            'cmsEditions' => array_map(fn(CmsEdition $edition) => $edition->handle(), CmsEdition::cases()),
             'craftIdAccessToken' => $this->getCraftIdAccessToken(),
             'phpVersion' => App::phpVersion(),
             'composerPhpVersion' => Craft::$app->getComposer()->getConfig()['config']['platform']['php'] ?? null,
@@ -104,6 +105,7 @@ public function actionCraftData(): Response
         $data['canTestEditions'] = Craft::$app->getCanTestEditions();
         $data['CraftEdition'] = Craft::$app->edition->value;
         $data['CraftSolo'] = CmsEdition::Solo->value;
+        $data['CraftTeam'] = CmsEdition::Team->value;
         $data['CraftPro'] = CmsEdition::Pro->value;
 
         // Logos

src/controllers/UserSettingsController.php

@@ -37,7 +37,7 @@ public function beforeAction($action): bool
         $this->requireAdmin();
 
         if ($action->id !== 'save-user-settings') {
-            Craft::$app->requireEdition(CmsEdition::Pro);
+            Craft::$app->requireEdition(CmsEdition::Team);
         }
 
         return true;
@@ -141,7 +141,7 @@ public function actionSaveUserSettings(): ?Response
         $settings['photoVolumeUid'] = $photoVolumeId ? Craft::$app->getVolumes()->getVolumeById($photoVolumeId)?->uid : null;
         $settings['photoSubpath'] = $this->request->getBodyParam('photoSubpath') ?: null;
 
-        if (Craft::$app->edition->value >= CmsEdition::Pro->value) {
+        if (Craft::$app->edition->value >= CmsEdition::Team->value) {
             $settings['require2fa'] = $this->request->getBodyParam('require2fa') ?: false;
         }
 

src/controllers/UsersController.php

@@ -947,7 +947,7 @@ public function actionActivateUser(): ?Response
      */
     public function actionCreate(): Response
     {
-        Craft::$app->requireEdition(CmsEdition::Pro);
+        Craft::$app->requireEdition(CmsEdition::Team);
 
         $user = Craft::createObject(User::class);
 
@@ -1481,7 +1481,7 @@ public function actionSaveUser(): ?Response
             }
         } else {
             // Make sure this is Craft Pro, since that's required for having multiple user accounts
-            Craft::$app->requireEdition(CmsEdition::Pro);
+            Craft::$app->requireEdition(CmsEdition::Team);
 
             // Is someone logged in?
             if ($currentUser) {

src/elements/Asset.php

@@ -1105,6 +1105,20 @@ private static function isFolderIndex(): bool
      */
     private ?int $_oldVolumeId = null;
 
+    /**
+     * @inheritdoc
+     */
+    public function __construct($config = [])
+    {
+        // alt='' actually means something, so we should preserve it.
+        $alt = ArrayHelper::remove($config, 'alt');
+        if ($alt !== null) {
+            $this->alt = $alt;
+        }
+
+        parent::__construct($config);
+    }
+
     /**
      * @inheritdoc
      */
@@ -1188,6 +1202,20 @@ public function init(): void
         $this->_oldVolumeId = $this->_volumeId;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setAttributesFromRequest(array $values): void
+    {
+        // alt='' actually means something, so we should preserve it.
+        $alt = ArrayHelper::remove($values, 'alt');
+        if ($alt !== null) {
+            $this->alt = $alt;
+        }
+
+        parent::setAttributesFromRequest($values); // TODO: Change the autogenerated stub
+    }
+
     /**
      * Returns the volume’s ID.
      *
@@ -2605,6 +2633,18 @@ protected function attributeHtml(string $attribute): string
         return parent::attributeHtml($attribute);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getInlineAttributeInputHtml(string $attribute): string
+    {
+        if ($this->isFolder) {
+            return '';
+        }
+
+        return parent::getInlineAttributeInputHtml($attribute);
+    }
+
     /**
      * Returns the HTML for asset previews.
      *

src/elements/Entry.php

@@ -848,6 +848,18 @@ protected function defineRules(): array
             'required',
             'when' => fn() => !isset($this->fieldId),
         ];
+        $rules[] = [
+            ['typeId'],
+            function(string $attribute) {
+                if (!$this->isEntryTypeAllowed()) {
+                    $this->addError($attribute, Craft::t('app', '{type} entries are no longer allowed in this section. Please choose a different entry type.', [
+                        'type' => $this->getType()->getUiLabel(),
+                    ]));
+                }
+            },
+            'skipOnEmpty' => false,
+            'when' => fn() => $this->getIsCanonical(),
+        ];
         $rules[] = [['fieldId'], function(string $attribute) {
             if (isset($this->sectionId)) {
                 $this->addError($attribute, Craft::t('app', '`sectionId` and `fieldId` cannot both be set on an entry.'));
@@ -1934,7 +1946,10 @@ public function metaFieldsHtml(bool $static): string
             // Type
             $fields[] = (function() use ($static) {
                 $entryTypes = $this->getAvailableEntryTypes();
-                if (count($entryTypes) <= 1) {
+                if (!ArrayHelper::contains($entryTypes, fn(EntryType $entryType) => $entryType->id === $this->typeId)) {
+                    $entryTypes[] = $this->getType();
+                }
+                if (count($entryTypes) <= 1 && $this->isEntryTypeAllowed($entryTypes)) {
                     return null;
                 }
 
@@ -2570,4 +2585,21 @@ private function _shouldSaveRevision(): bool
             $this->getSection()?->enableVersioning
         );
     }
+
+    /**
+     * Check if current typeId is in the array of passed in entry types.
+     * If no entry types are passed, check get all the available ones.
+     *
+     * @param array|null $entryTypes
+     * @return bool
+     * @throws InvalidConfigException
+     */
+    private function isEntryTypeAllowed(array|null $entryTypes = null): bool
+    {
+        if ($entryTypes === null) {
+            $entryTypes = $this->getAvailableEntryTypes();
+        }
+
+        return in_array($this->typeId, array_map(fn($entryType) => $entryType->id, $entryTypes));
+    }
 }