Merge branch '3.5' into feature/element-html

# Conflicts: # src/base/Element.php
leevigraham · May 6, 2020 · 7d799f7 · 7d799f7
2 parents 253a1d2 + 6015499
commit 7d799f7
Show file tree

Hide file tree

Showing 425 changed files with 13,729 additions and 5,118 deletions.
diff --git a/CHANGELOG-v3.5.md b/CHANGELOG-v3.5.md
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
diff --git a/bootstrap/bootstrap.php b/bootstrap/bootstrap.php
@@ -236,10 +236,6 @@
     $configService->getConfigFromFile("app.{$appType}")
 );
 
-if (defined('CRAFT_SITE') || defined('CRAFT_LOCALE')) {
-    $config['components']['sites']['currentSite'] = defined('CRAFT_SITE') ? CRAFT_SITE : CRAFT_LOCALE;
-}
-
 // Initialize the application
 /** @var \craft\web\Application|craft\console\Application $app */
 $app = Craft::createObject($config);

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.4.17.1",
+  "version": "3.5.0-beta.2",
   "keywords": [
     "cms",
     "craftcms",
@@ -27,7 +27,7 @@
     "ext-pcre": "*",
     "ext-pdo": "*",
     "ext-zip": "*",
-    "composer/composer": "1.6.3",
+    "composer/composer": "1.10.5",
     "craftcms/oauth2-craftid": "~1.0.0",
     "craftcms/plugin-installer": "~1.5.3",
     "craftcms/server-check": "~1.1.0",
@@ -46,13 +46,12 @@
     "true/punycode": "^2.1.0",
     "twig/twig": "~2.12.0",
     "voku/portable-utf8": "^5.4.28",
-    "voku/stringy": "~5.1.0",
+    "voku/stringy": "^6.2.2",
     "webonyx/graphql-php": "^0.12.0",
     "yii2tech/ar-softdelete": "^1.0.2",
     "yiisoft/yii2": "~2.0.35.0",
     "yiisoft/yii2-debug": "^2.1.0",
     "yiisoft/yii2-queue": "~2.3.0",
-    "yiisoft/yii2-shell": "^2.0.2",
     "yiisoft/yii2-swiftmailer": "^2.1.0",
     "laminas/laminas-feed": "^2.12.0"
   },