Merge branch 'develop' into 1.2

.editorconfig

@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+
+[.github/workflows/**.{yml,yaml}]
+indent_size = 2

.github/workflows/tests.yml

@@ -56,9 +56,6 @@ jobs:
         with:
           node-version: ${{ env.nodeVersion }}
 
-      - name: Echo branches
-        run: echo "${{ github.ref }} | ${{ github.head_ref }} | ${{ github.ref_name }} | ${{ github.base_ref }}"
-
       - name: Switch library dependency (develop)
         if: github.ref == 'refs/heads/develop' || github.base_ref == 'develop'
         run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.2"
@@ -99,7 +96,7 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['8.0', '8.1']
+        phpVersion: ['8.0', '8.1', '8.2']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "files.associations": {
         "**/modules/*/behaviors/*/partials/*.htm": "php",
+        "**/modules/*/blocks/*.block": "wintercms",
         "**/modules/*/controllers/*/*.htm": "php",
         "**/modules/*/formwidgets/*/partials/*.htm": "php",
         "**/modules/*/layouts/*.htm": "php",
@@ -11,6 +12,7 @@
         "**/modules/*/widgets/*/partials/*.htm": "php",
 
         "**/plugins/*/*/behaviors/*/partials/*.htm": "php",
+        "**/plugins/*/*/blocks/*.block": "wintercms",
         "**/plugins/*/*/components/**/*.htm": "wintercms-twig",
         "**/plugins/*/*/controllers/*/*.htm": "php",
         "**/plugins/*/*/formwidgets/*/partials/*.htm": "php",
@@ -21,11 +23,16 @@
         "**/plugins/*/*/views/mail/*.htm": "wintercms",
         "**/plugins/*/*/widgets/*/partials/*.htm": "php",
 
+        "**/themes/*/blocks/**/*.block": "wintercms",
         "**/themes/*/content/**/*.htm": "wintercms",
         "**/themes/*/layouts/*.htm": "wintercms",
         "**/themes/*/pages/**/*.htm": "wintercms",
         "**/themes/*/partials/**/*.htm": "wintercms"
     },
+    "emmet.includeLanguages": {
+        "wintercms": "html",
+        "wintercms-twig": "html",
+    },
     "eslint.validate": [
         "javascript",
         "vue"

README.md

@@ -7,7 +7,7 @@
 No matter how large or small your project is, Winter provides a rich development environment, regardless of your level of experience.
 
 [![Version](https://img.shields.io/github/v/release/wintercms/winter?sort=semver&style=flat-square)](https://github.com/wintercms/winter/releases)
-[![Tests](https://img.shields.io/github/workflow/status/wintercms/winter/Tests/develop?label=tests&style=flat-square)](https://github.com/wintercms/winter/actions)
+[![Tests](https://img.shields.io/github/actions/workflow/status/wintercms/winter/tests.yml?branch=develop&label=tests&style=flat-square)](https://github.com/wintercms/winter/actions)
 [![License](https://img.shields.io/github/license/wintercms/winter?label=open%20source&style=flat-square)](https://packagist.org/packages/wintercms/winter)
 [![Discord](https://img.shields.io/discord/816852513684193281?label=discord&style=flat-square)](https://discord.gg/D5MFSPH6Ux)
 
@@ -89,8 +89,7 @@ Winter CMS development is financially supported by the generosity of the followi
 
 ### Organizations
 
-[![Spatial Media logo](https://cdn.ca.spatialmedia.io/media/images/sm-logo-dark-full.svg)](https://spatialmedia.io)
-Spatial Media employs two of the core contributors (Luke Towers & Jack Wilkinson) and contributes to the ongoing development of Winter.
+Spatial Media employs one of the core maintainers (Jack Wilkinson) who contributes to the ongoing development of Winter.
 
 [![Froala logo](https://froala.com/wp-content/uploads/2019/10/froala.svg)](https://froala.com/wysiwyg-editor/)
 

composer.json

@@ -35,7 +35,7 @@
         "winter/wn-backend-module": "~1.2.0",
         "winter/wn-cms-module": "~1.2.0",
         "laravel/framework": "^9.1",
-        "wikimedia/composer-merge-plugin": "~2.0.1"
+        "wikimedia/composer-merge-plugin": "~2.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8",
@@ -72,6 +72,7 @@
             ],
             "recurse": true,
             "replace": false,
+            "merge-replace": false,
             "merge-dev": false
         }
     },

config/cms.php

@@ -446,7 +446,7 @@
     |
     */
 
-    'restrictBaseDir' => true,
+    'restrictBaseDir' => env('RESTRICT_BASE_DIR', true),
 
     /*
     |--------------------------------------------------------------------------

config/develop.php

@@ -42,4 +42,17 @@
     */
 
     'allowDeepSymlinks' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Snowboard debugging
+    |--------------------------------------------------------------------------
+    |
+    | By default, Snowboard debugging and client-side logging is disabled.
+    |
+    | If you wish to enable Snowboard debugging, set this value to `true`.
+    |
+    */
+
+    'debugSnowboard' => env('DEBUG_SNOWBOARD', false),
 ];

modules/backend/ServiceProvider.php

@@ -1,6 +1,5 @@
 <?php namespace Backend;
 
-use App;
 use Backend;
 use BackendMenu;
 use BackendAuth;
@@ -20,18 +19,20 @@ class ServiceProvider extends ModuleServiceProvider
      */
     public function register()
     {
+        parent::register();
+
         $this->registerConsole();
         $this->registerMailer();
         $this->registerAssetBundles();
+        $this->registerBackendPermissions();
 
         /*
          * Backend specific
          */
-        if (App::runningInBackend()) {
+        if ($this->app->runningInBackend()) {
             $this->registerBackendNavigation();
             $this->registerBackendReportWidgets();
             $this->registerBackendWidgets();
-            $this->registerBackendPermissions();
             $this->registerBackendSettings();
         }
     }
@@ -90,10 +91,8 @@ protected function registerAssetBundles()
             $combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/nestedform/assets/less/nestedform.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js');
-            $combiner->registerBundle('~/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/sensitive/assets/less/sensitive.less');
 
             /*
              * Rich Editor is protected by DRM
@@ -229,6 +228,7 @@ protected function registerBackendWidgets()
             $manager->registerFormWidget('Backend\FormWidgets\MediaFinder', 'mediafinder');
             $manager->registerFormWidget('Backend\FormWidgets\NestedForm', 'nestedform');
             $manager->registerFormWidget('Backend\FormWidgets\Sensitive', 'sensitive');
+            $manager->registerFormWidget('Backend\FormWidgets\IconPicker', 'iconpicker');
         });
     }