Merge branch '5.0' into develop

# Conflicts:
#	src/translations/ar/app.php
#	src/translations/cs/app.php
#	src/translations/da/app.php
#	src/translations/de-CH/app.php
#	src/translations/de/app.php
#	src/translations/en-GB/app.php
#	src/translations/es/app.php
#	src/translations/fr-CA/app.php
#	src/translations/fr/app.php
#	src/translations/he/app.php
#	src/translations/hu/app.php
#	src/translations/it/app.php
#	src/translations/ja/app.php
#	src/translations/ko/app.php
#	src/translations/nb/app.php
#	src/translations/nl/app.php
#	src/translations/pl/app.php
#	src/translations/pt/app.php
#	src/translations/ru/app.php
#	src/translations/sk/app.php
#	src/translations/sv/app.php
#	src/translations/th/app.php
#	src/translations/tr/app.php
#	src/translations/uk/app.php
#	src/translations/zh/app.php

.env.example

@@ -2,6 +2,7 @@
 DEV_SERVER_PUBLIC=http://localhost:8085/
 DEV_SERVER_PORT=8085
 DEV_SERVER_LOOPBACK=http://host.docker.internal:8085
+# DEV_SERVER_HOST=127.0.0.1 # you might needed it if you have a problem with hot reloads not working
 
 # Running webpack-dev-server within container
 # DEV_SERVER_PUBLIC=http://my-project.tld:3000/

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - '5.0'
   pull_request:
 permissions:
   contents: read
@@ -15,7 +16,9 @@ jobs:
     name: ci
     uses: craftcms/.github/.github/workflows/ci.yml@v3
     with:
-      craft_version: '4'
+      php_version: '8.2'
+      craft_version: '5'
+      node_version: '20'
       jobs: '["ecs", "prettier", "phpstan", "tests"]'
       notify_slack: true
       slack_subteam: <!subteam^SGFL9NKNZ>

.github/workflows/create-release.yml

@@ -32,7 +32,15 @@ jobs:
         if: ${{ startsWith(github.event.client_payload.version, '4.') }}
         with:
           extensions: bcmath, curl, dom, json, intl, mbstring, mcrypt, openssl, pcre, pdo, zip
-          php-version: 8.0.2
+          php-version: 8.2.0
+          tools: composer:v2
+
+      - name: 'Set up PHP for Craft 5'
+        uses: shivammathur/[email protected]
+        if: ${{ startsWith(github.event.client_payload.version, '5.') }}
+        with:
+          extensions: bcmath, curl, dom, json, intl, mbstring, mcrypt, openssl, pcre, pdo, zip
+          php-version: 8.2.0
           tools: composer:v2
 
       - name: 'Set up PHP for Craft 5'

.nvmrc

@@ -1 +1 @@
-v16.13.1
+v20.10.0

.prettierrc.json

@@ -1,5 +1,6 @@
 {
   "singleQuote": true,
   "bracketSpacing": false,
-  "vueIndentScriptAndStyle": true
+  "vueIndentScriptAndStyle": true,
+  "trailingComma": "es5"
 }

bootstrap/bootstrap.php

@@ -187,15 +187,20 @@
 $cmsPath = dirname(__DIR__);
 $libPath = $cmsPath . DIRECTORY_SEPARATOR . 'lib';
 $srcPath = $cmsPath . DIRECTORY_SEPARATOR . 'src';
+$iconsPath = $srcPath . DIRECTORY_SEPARATOR . 'icons';
+$brandIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'brands';
+$customIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'custom-icons';
+$regularIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'regular';
+$solidIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'solid';
 require $libPath . DIRECTORY_SEPARATOR . 'yii2' . DIRECTORY_SEPARATOR . 'Yii.php';
 require $srcPath . DIRECTORY_SEPARATOR . 'Craft.php';
 
 // Set aliases
 Craft::setAlias('@craftcms', $cmsPath);
 Craft::setAlias('@root', $rootPath);
 Craft::setAlias('@lib', $libPath);
-Craft::setAlias('@craft', $srcPath);
-Craft::setAlias('@appicons', $srcPath . DIRECTORY_SEPARATOR . 'icons');
+Craft::setAlias('@craft', $srcPath); // same as @app, but needed for the `help` command
+Craft::setAlias('@appicons', $solidIconsPath);
 Craft::setAlias('@dotenv', $dotenvPath);
 Craft::setAlias('@config', $configPath);
 Craft::setAlias('@contentMigrations', $contentMigrationsPath);
@@ -204,6 +209,53 @@
 Craft::setAlias('@translations', $translationsPath);
 Craft::setAlias('@tests', $testsPath);
 
+// Custom icons
+Craft::setAlias('@appicons/c-debug.svg', "$customIconsPath/c-debug.svg");
+Craft::setAlias('@appicons/c-outline.svg', "$customIconsPath/c-outline.svg");
+Craft::setAlias('@appicons/craft-cms.svg', "$customIconsPath/craft-cms.svg");
+Craft::setAlias('@appicons/craft-partners.svg', "$customIconsPath/craft-partners.svg");
+Craft::setAlias('@appicons/craft-stack-exchange.svg', "$customIconsPath/craft-stack-exchange.svg");
+Craft::setAlias('@appicons/default-plugin.svg', "$customIconsPath/default-plugin.svg");
+Craft::setAlias('@appicons/element-card.svg', "$customIconsPath/element-card.svg");
+Craft::setAlias('@appicons/graphql.svg', "$customIconsPath/graphql.svg");
+Craft::setAlias('@appicons/grip-dots.svg', "$customIconsPath/grip-dots.svg");
+Craft::setAlias('@appicons/list-flip.svg', "$customIconsPath/list-flip.svg");
+Craft::setAlias('@appicons/list-tree-flip.svg', "$customIconsPath/list-tree-flip.svg");
+Craft::setAlias('@appicons/share-flip.svg', "$customIconsPath/share-flip.svg");
+
+// Other
+Craft::setAlias('@appicons/github.svg', "$brandIconsPath/github.svg");
+Craft::setAlias('@appicons/globe.svg', "$regularIconsPath/globe.svg");
+
+// Renamed icon aliases
+Craft::setAlias('@appicons/alert.svg', "$solidIconsPath/triangle-exclamation.svg");
+Craft::setAlias('@appicons/broken-image', "$solidIconsPath/image-slash.svg");
+Craft::setAlias('@appicons/buoey.svg', "$solidIconsPath/life-ring.svg");
+Craft::setAlias('@appicons/draft.svg', "$solidIconsPath/scribble.svg");
+Craft::setAlias('@appicons/entry-types', "$solidIconsPath/files.svg");
+Craft::setAlias('@appicons/excite.svg', "$solidIconsPath/certificate.svg");
+Craft::setAlias('@appicons/feed.svg', "$solidIconsPath/rss.svg");
+Craft::setAlias('@appicons/field.svg', "$solidIconsPath/pen-to-square.svg");
+Craft::setAlias('@appicons/hash.svg', "$solidIconsPath/hashtag.svg");
+Craft::setAlias('@appicons/info-circle', "$solidIconsPath/circle-info.svg");
+Craft::setAlias('@appicons/info-circle.svg', "$solidIconsPath/circle-info.svg");
+Craft::setAlias('@appicons/info.svg', "$solidIconsPath/circle-info.svg");
+Craft::setAlias('@appicons/info.svg', "$solidIconsPath/circle-info.svg");
+Craft::setAlias('@appicons/location.svg', "$solidIconsPath/location-dot.svg");
+Craft::setAlias('@appicons/photo.svg', "$solidIconsPath/image.svg");
+Craft::setAlias('@appicons/plugin.svg', "$solidIconsPath/plug.svg");
+Craft::setAlias('@appicons/routes.svg', "$solidIconsPath/signs-post.svg");
+Craft::setAlias('@appicons/search.svg', "$solidIconsPath/magnifying-glass.svg");
+Craft::setAlias('@appicons/shopping-cart', "$solidIconsPath/cart-shopping.svg");
+Craft::setAlias('@appicons/template.svg', "$solidIconsPath/file-code.svg");
+Craft::setAlias('@appicons/template.svg', "$solidIconsPath/file-code.svg");
+Craft::setAlias('@appicons/tip.svg', "$solidIconsPath/lightbulb.svg");
+Craft::setAlias('@appicons/tools.svg', "$solidIconsPath/screwdriver-wrench.svg");
+Craft::setAlias('@appicons/tree.svg', "$solidIconsPath/sitemap.svg");
+Craft::setAlias('@appicons/upgrade.svg', "$solidIconsPath/square-arrow-up.svg");
+Craft::setAlias('@appicons/wand.svg', "$solidIconsPath/wand-magic-sparkles.svg");
+Craft::setAlias('@appicons/world.svg', "$solidIconsPath/earth-americas.svg");
+
 $webUrl = App::env('CRAFT_WEB_URL');
 if ($webUrl) {
     Craft::setAlias('@web', $webUrl);

codeception.yml

@@ -4,6 +4,7 @@ paths:
   log: tests/_output
   data: tests/_data
   support: tests/_support
+  output: tests/_output
   envs: tests/_envs
 bootstrap: _bootstrap.php
 settings:

composer.json

@@ -19,11 +19,11 @@
     "issues": "https://github.com/craftcms/cms/issues?state=open",
     "forum": "https://craftcms.stackexchange.com/",
     "source": "https://github.com/craftcms/cms",
-    "docs": "https://craftcms.com/docs/4.x/",
+    "docs": "https://craftcms.com/docs/5.x/",
     "rss": "https://github.com/craftcms/cms/releases.atom"
   },
   "require": {
-    "php": "^8.0.2",
+    "php": "^8.2",
     "ext-bcmath": "*",
     "ext-curl": "*",
     "ext-dom": "*",
@@ -34,44 +34,50 @@
     "ext-pcre": "*",
     "ext-pdo": "*",
     "ext-zip": "*",
-    "commerceguys/addressing": "^1.2",
-    "composer/composer": "^2.7.0",
+    "bacon/bacon-qr-code": "^2.0",
+    "commerceguys/addressing": "^2.1.1",
+    "composer/semver": "^3.3.2",
     "craftcms/plugin-installer": "~1.6.0",
-    "craftcms/server-check": "~2.1.2",
+    "craftcms/server-check": "~5.0.1",
     "creocoder/yii2-nested-sets": "~0.9.0",
     "elvanto/litemoji": "~4.3.0",
     "enshrined/svg-sanitize": "~0.16.0",
     "guzzlehttp/guzzle": "^7.2.0",
-    "illuminate/collections": "^9.1.0",
+    "illuminate/collections": "^v10.42.0",
     "mikehaertl/php-shellcommand": "^1.6.3",
     "moneyphp/money": "^4.0",
-    "monolog/monolog": "^2.3",
+    "monolog/monolog": "^3.0",
     "pixelandtonic/imagine": "~1.3.3.1",
+    "pragmarx/google2fa": "^8.0",
+    "pragmarx/recovery": "^0.2.1",
     "samdark/yii2-psr-log-target": "^1.1.3",
     "seld/cli-prompt": "^1.0.4",
+    "symfony/filesystem": "^6.3",
     "symfony/http-client": "^6.0.3",
     "symfony/var-dumper": "^5.0|^6.0",
     "symfony/yaml": "^5.2.3",
     "theiconic/name-parser": "^1.2",
     "twig/twig": "~3.8.0",
     "voku/stringy": "^6.4.0",
+    "web-auth/webauthn-lib": "^4.7.0",
     "webonyx/graphql-php": "~14.11.5",
     "yiisoft/yii2": "~2.0.48.1",
     "yiisoft/yii2-debug": "~2.1.22.0",
     "yiisoft/yii2-queue": "~2.3.2",
-    "yiisoft/yii2-symfonymailer": "^2.0.0"
+    "yiisoft/yii2-symfonymailer": "^4.0.0"
   },
   "require-dev": {
-    "codeception/codeception": "^4.1.29",
-    "codeception/module-asserts": "^1.3.1",
-    "codeception/module-datafactory": "^1.1.0",
-    "codeception/module-phpbrowser": "^1.0.2",
-    "codeception/module-rest": "^1.4.2",
-    "codeception/module-yii2": "^1.1.5",
+    "codeception/codeception": "^5.0.11",
+    "codeception/module-asserts": "^3.0.0",
+    "codeception/module-datafactory": "^3.0.0",
+    "codeception/module-phpbrowser": "^3.0.0",
+    "codeception/module-rest": "^3.3.2",
+    "codeception/module-yii2": "^1.1.9",
+    "codeception/lib-innerbrowser": "4.0.1",
     "craftcms/ecs": "dev-main",
     "fakerphp/faker": "^1.19.0",
     "league/factory-muffin": "^3.3.0",
-    "phpstan/phpstan": "^1.8.5",
+    "phpstan/phpstan": "^1.10.56",
     "vlucas/phpdotenv": "^5.4.1",
     "yiisoft/yii2-redis": "^2.0"
   },
@@ -110,8 +116,9 @@
   "config": {
     "sort-packages": true,
     "platform": {
-      "php": "8.0.2"
+      "php": "8.2"
     },
+    "platform-check": false,
     "allow-plugins": {
       "yiisoft/yii2-composer": true,
       "craftcms/plugin-installer": true