Merge branch 'release/2.5.5' into craft-vite

nystudio107 · Mar 30, 2022 · c7197f7 · c7197f7
2 parents c887fa2 + 86b94c3
commit c7197f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.5.5 - 2022.03.30
+### Changed
+* Remove deprecated `useProjectConfigFile` from `config/general.php`
+* Remove `platform` from `composer.json`
+
 ## 2.5.4 - 2022.03.28
 ### Changed
 * Add `disableProcessTimeout` to the `post-craft-update` Composer scripts, and run Project Config before migrations

diff --git a/cms/composer.json b/cms/composer.json
@@ -28,10 +28,7 @@
       "yiisoft/yii2-composer": true
     },
     "optimize-autoloader": true,
-    "sort-packages": true,
-    "platform": {
-      "php": "7.2.5"
-    }
+    "sort-packages": true
   },
   "scripts": {
     "craft-update": [

diff --git a/cms/config/general.php b/cms/config/general.php
@@ -23,7 +23,7 @@
     'backupOnUpdate' => (bool)App::env('BACKUP_ON_UPDATE'),
     'devMode' => (bool)App::env('DEV_MODE'),
     'enableTemplateCaching' => (bool)App::env('ENABLE_TEMPLATE_CACHING'),
-    'resourceBasePath' => App::env('WEB_ROOT_PATH').'/cpresources',
+    'resourceBasePath' => App::env('WEB_ROOT_PATH') . '/cpresources',
     'runQueueAutomatically' => (bool)App::env('RUN_QUEUE_AUTOMATICALLY'),
     'securityKey' => App::env('SECURITY_KEY'),
     // Craft config settings from constants
@@ -41,5 +41,4 @@
     'omitScriptNameInUrls' => true,
     'useEmailAsUsername' => true,
     'usePathInfo' => true,
-    'useProjectConfigFile' => true,
 ];