Release v4.6.5

userfrosting · Jul 1, 2022 · 12f0ff7 · 12f0ff7
2 parents 91d43fd + 774bc45
commit 12f0ff7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['7.3', '7.4', '8.0']
+        php_versions: ['7.3', '7.4', '8.0', '8.1']
 
     runs-on: ubuntu-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - MySQL
@@ -110,7 +110,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['7.3', '7.4', '8.0']
+          php_versions: ['7.3', '7.4', '8.0', '8.1']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - SQLite
@@ -180,7 +180,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['7.3', '7.4', '8.0']
+          php_versions: ['7.3', '7.4', '8.0', '8.1']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - PostgreSQL
@@ -256,7 +256,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          php_versions: ['7.3', '7.4', '8.0']
+          php_versions: ['7.3', '7.4', '8.0', '8.1']
 
     runs-on: windows-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - Windows

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v4.6.5](https://github.com/userfrosting/UserFrosting/compare/v4.6.4...v4.6.5)
+
+### Fix
+- Fix for FindUniqueTest when class mappings are changed ([#1201](https://github.com/userfrosting/UserFrosting/pull/1201))
+- Allowing no default group on register ([#1202](https://github.com/userfrosting/UserFrosting/pull/1202))
+- Allow Composer plugin by default
+- Add PHP 8.1 version to test suite
+
 ## [v4.6.4](https://github.com/userfrosting/UserFrosting/compare/v4.6.3...v4.6.4)
 
 ### Fix

diff --git a/app/sprinkles/account/src/Account/Registration.php b/app/sprinkles/account/src/Account/Registration.php
@@ -90,17 +90,22 @@ public function register()
         // Validate the userdata
         $this->validate();
 
-        // Set default group
-        $defaultGroup = $this->ci->classMapper->getClassMapping('group')::where('slug', $this->defaultGroup)->first();
+        if ($this->defaultGroup) {
+            // Set default group using the configuration "site.registration.user_defaults.group"
+            $defaultGroup = $this->ci->classMapper->getClassMapping('group')::where('slug', $this->defaultGroup)->first();
 
-        if (!$defaultGroup) {
-            $e = new HttpException("Account registration is not working because the default group '{$this->defaultGroup}' does not exist.");
-            $e->addUserMessage('ACCOUNT.REGISTRATION_BROKEN');
+            if (!$defaultGroup) {
+                $e = new HttpException("Account registration is not working because the default group '{$this->defaultGroup}' does not exist.");
+                $e->addUserMessage('ACCOUNT.REGISTRATION_BROKEN');
 
-            throw $e;
-        }
+                throw $e;
+            }
 
-        $this->setUserProperty('group_id', $defaultGroup->id);
+            $this->setUserProperty('group_id', $defaultGroup->id);
+        } else {
+            // Users default to not being in a group on registration (configuration value === null)
+            $this->setUserProperty('group_id', null);
+        }
 
         // Hash password
         $this->hashPassword();

diff --git a/app/sprinkles/account/tests/Integration/FindUniqueTest.php b/app/sprinkles/account/tests/Integration/FindUniqueTest.php
@@ -37,6 +37,9 @@ public function setUp(): void
         // Setup test database
         $this->setupTestDatabase();
         $this->refreshDatabase();
+
+        $this->ci->classMapper->setClassMapping('user', 'UserFrosting\Sprinkle\Account\Database\Models\User');
+        $this->ci->classMapper->setClassMapping('group', 'UserFrosting\Sprinkle\Account\Database\Models\Group');
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -21,7 +21,11 @@
         }
     ],
     "config": {
-        "vendor-dir": "app/vendor"
+        "vendor-dir": "app/vendor",
+        "allow-plugins": {
+            "composer/installers": true,
+            "wikimedia/composer-merge-plugin": true
+        }
     },
     "require": {
         "php": "^7.3 | ^8.0",