Merge branch 'master' into feature-docker-refinements

Author: Silic0nS0ldier

.github/stale.yml

@@ -0,0 +1,61 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 550
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - "confirmed bug"
+  - security
+  - "long-range planning"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: wontfix
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

CHANGELOG.md

@@ -6,8 +6,23 @@ 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.2.1]
-- Fix Italian translation ([#950])
-- User Registration fails when trying to register two accounts with the same email address ([#953])
+
+### Added
+- `UserFrosting\Sprinkle\Core\Database\Models\Session` model for the `sessions` db table.
+- `TEST_SESSION_HANDLER` environment variable to set the session save handler to use for Testing.
+- `withDatabaseSessionHandler` Trait for testing. Use `$this->useDatabaseSessionHandler()` to use database session handler in tests.
+
+### Fixed
+- Italian translation ([#950])
+- User Registration failing when trying to register two accounts with the same email address ([#953])
+- Bad test case for `CoreController::getAsset`.
+- User Model `forceDelete` doesn't remove the record from the DB ([#951])
+- Fix PHP Fatal error that can be thrown when registering a new User
+- Session not working with database handler ([#952])
+- Remove any persistences when forceDeleting user to prevent Foreign Key Constraints issue ([#963])
+- More helpful error message in checkEnvironment.php (Thanks @amosfolz; [#958])
+- Hide locale select from UI if only one locale is available (Thanks @avsdev-cw; [#968])
+- Download CSV filename error ([#893])
 
 ## [v4.2.0]
 ### Changed Requirements
@@ -706,10 +721,16 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#869]: https://github.com/userfrosting/UserFrosting/issues/869
 [#872]: https://github.com/userfrosting/UserFrosting/issues/872
 [#888]: https://github.com/userfrosting/UserFrosting/issues/888
+[#893]: https://github.com/userfrosting/UserFrosting/issues/893
 [#919]: https://github.com/userfrosting/UserFrosting/issues/919
 [#940]: https://github.com/userfrosting/UserFrosting/issues/940
 [#950]: https://github.com/userfrosting/UserFrosting/issues/950
+[#951]: https://github.com/userfrosting/UserFrosting/issues/951
+[#952]: https://github.com/userfrosting/UserFrosting/issues/952
 [#953]: https://github.com/userfrosting/UserFrosting/issues/953
+[#958]: https://github.com/userfrosting/UserFrosting/issues/958
+[#963]: https://github.com/userfrosting/UserFrosting/issues/963
+[#968]: https://github.com/userfrosting/UserFrosting/issues/968
 
 [v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
 [v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v4.2.1

app/defines.php

@@ -10,7 +10,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.2.0');
+define('UserFrosting\VERSION', '4.2.1');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '5.6');
 define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.1');

app/sprinkles/account/src/Controller/AccountController.php

@@ -509,12 +509,22 @@ public function pageRegister(Request $request, Response $response, $args)
         // Get locale information
         $currentLocales = $localePathBuilder->getLocales();
 
+        // Hide the locale field if there is only 1 locale available
+        $fields = [
+            'hidden'   => [],
+            'disabled' => []
+        ];
+        if (count($config->getDefined('site.locales.available')) <= 1) {
+            $fields['hidden'][] = 'locale';
+        }
+
         return $this->ci->view->render($response, 'pages/register.html.twig', [
             'page' => [
                 'validators' => [
                     'register' => $validatorRegister->rules('json', false)
                 ]
             ],
+            'fields' => $fields,
             'locales' => [
                 'available' => $config['site.locales.available'],
                 'current'   => end($currentLocales)
@@ -658,8 +668,18 @@ public function pageSettings(Request $request, Response $response, $args)
         // Get a list of all locales
         $locales = $config->getDefined('site.locales.available');
 
+        // Hide the locale field if there is only 1 locale available
+        $fields = [
+            'hidden'   => [],
+            'disabled' => []
+        ];
+        if (count($config->getDefined('site.locales.available')) <= 1) {
+            $fields['hidden'][] = 'locale';
+        }
+
         return $this->ci->view->render($response, 'pages/account-settings.html.twig', [
             'locales' => $locales,
+            'fields' => $fields,
             'page'    => [
                 'validators' => [
                     'account_settings'    => $validatorAccountSettings->rules('json', false),
@@ -766,6 +786,11 @@ public function profile(Request $request, Response $response, $args)
 
         $error = false;
 
+        // Ensure that in the case of using a single locale, that the locale is set
+        if (count($config->getDefined('site.locales.available')) <= 1) {
+            $data['locale'] = $currentUser->locale;
+        }
+
         // Validate, and halt on validation errors.
         $validator = new ServerSideValidator($schema, $this->ci->translator);
         if (!$validator->validate($data)) {
@@ -877,6 +902,11 @@ public function register(Request $request, Response $response, $args)
 
         $error = false;
 
+        // Ensure that in the case of using a single locale, that the locale is set
+        if (count($config->getDefined('site.locales.available')) <= 1) {
+            $data['locale'] = $config['site.registration.user_defaults.locale'];
+        }
+
         // Validate request data
         $validator = new ServerSideValidator($schema, $this->ci->translator);
         if (!$validator->validate($data)) {
@@ -1160,6 +1190,11 @@ public function settings(Request $request, Response $response, $args)
 
         $error = false;
 
+        // Ensure that in the case of using a single locale, that the locale is set
+        if (count($config->getDefined('site.locales.available')) <= 1) {
+            $data['locale'] = $currentUser->locale;
+        }
+
         // Validate, and halt on validation errors.
         $validator = new ServerSideValidator($schema, $this->ci->translator);
         if (!$validator->validate($data)) {

app/sprinkles/account/src/Database/Models/User.php

@@ -188,17 +188,18 @@ public function delete($hardDelete = false)
             // Remove all role associations
             $this->roles()->detach();
 
-            // Remove all user activities
-            $classMapper->staticMethod('activity', 'where', 'user_id', $this->id)->delete();
+            // Remove last activity association
+            $this->lastActivity()->dissociate();
+            $this->save();
 
             // Remove all user tokens
-            $classMapper->staticMethod('password_reset', 'where', 'user_id', $this->id)->delete();
+            $this->activities()->delete();
+            $this->passwordResets()->delete();
             $classMapper->staticMethod('verification', 'where', 'user_id', $this->id)->delete();
-
-            // TODO: remove any persistences
+            $classMapper->staticMethod('persistence', 'where', 'user_id', $this->id)->delete();
 
             // Delete the user
-            $result = parent::forceDelete();
+            $result = $this->forceDelete();
         } else {
             // Soft delete the user, leaving all associated records alone
             $result = parent::delete();

app/sprinkles/account/src/Log/UserActivityDatabaseHandler.php

@@ -28,7 +28,7 @@ protected function write(array $record)
 
         if (isset($record['extra']['user_id'])) {
             $user = $this->classMapper->staticMethod('user', 'find', $record['extra']['user_id']);
-            $user->last_activity_id = $log->id;
+            $user->lastActivity()->associate($log);
             $user->save();
         }
     }

app/sprinkles/account/src/Repository/PasswordResetRepository.php

@@ -9,6 +9,7 @@
 
 namespace UserFrosting\Sprinkle\Account\Repository;
 
+use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
 use UserFrosting\Sprinkle\Account\Facades\Password;
 
 /**
@@ -27,7 +28,7 @@ class PasswordResetRepository extends TokenRepository
     /**
      * {@inheritdoc}
      */
-    protected function updateUser($user, $args)
+    protected function updateUser(UserInterface $user, $args)
     {
         $user->password = Password::hash($args['password']);
         // TODO: generate user activity? or do this in controller?

app/sprinkles/account/src/Repository/VerificationRepository.php

@@ -9,6 +9,8 @@
 
 namespace UserFrosting\Sprinkle\Account\Repository;
 
+use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
+
 /**
  * Token repository class for new account verifications.
  *
@@ -25,7 +27,7 @@ class VerificationRepository extends TokenRepository
     /**
      * {@inheritdoc}
      */
-    protected function updateUser($user, $args)
+    protected function updateUser(UserInterface $user, $args)
     {
         $user->flag_verified = 1;
         // TODO: generate user activity? or do this in controller?

app/sprinkles/account/src/ServicesProvider/ServicesProvider.php

@@ -69,6 +69,7 @@ public function register(ContainerInterface $container)
             $classMapper->setClassMapping('activity', 'UserFrosting\Sprinkle\Account\Database\Models\Activity');
             $classMapper->setClassMapping('password_reset', 'UserFrosting\Sprinkle\Account\Database\Models\PasswordReset');
             $classMapper->setClassMapping('verification', 'UserFrosting\Sprinkle\Account\Database\Models\Verification');
+            $classMapper->setClassMapping('persistence', 'UserFrosting\Sprinkle\Account\Database\Models\Persistence');
 
             return $classMapper;
         });

app/sprinkles/account/templates/forms/settings-profile.html.twig

@@ -20,6 +20,7 @@
                 </div>
             </div>
 
+            {% if 'locale' not in fields.hidden %}
             <div class="form-group">
                 <label for="input-locale" class="control-label">{{translate("LOCALE")}}</label>
                 <select id="input-locale" class="form-control js-select2" name="locale" {{page.visibility}}>
@@ -31,6 +32,7 @@
                 </select>
                 <p class="help-block">{{translate("LOCALE.ACCOUNT")}}.</p>
             </div>
+            {% endif %}
         {% endblock %}
     </div>
     <div class="box-footer text-center">