Merge remote-tracking branch 'upstream/develop' into issue-#867

Author: amosfolz

.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

.php_cs

@@ -16,6 +16,7 @@ $rules = [
     'braces'                                      => true,
     'cast_spaces'                                 => true,
     'class_definition'                            => true,
+    'concat_space'                                => ['spacing' => 'one'],
     'declare_equal_normalize'                     => true,
     'elseif'                                      => true,
     'encoding'                                    => true,
@@ -89,15 +90,14 @@ $rules = [
     'switch_case_semicolon_to_colon'              => true,
     'switch_case_space'                           => true,
     'ternary_operator_spaces'                     => true,
+    'trailing_comma_in_multiline_array'           => true,
     'trim_array_spaces'                           => true,
     'unary_operator_spaces'                       => true,
     'visibility_required'                         => true,
     'whitespace_after_comma_in_array'             => true,
 
     'header_comment' => [
-        'header'       => $header,
-        'separate'     => 'bottom',
-        'comment_type' => 'PHPDoc',
+        'header'       => $header
     ]
 ];
 

.styleci.yml

@@ -0,0 +1,13 @@
+finder:
+  exclude:
+    - "tests"
+  name: "*.php"
+  not-name:
+    - "*Stub.php"
+    - "*Test.php"
+
+enabled:
+  - concat_with_spaces
+
+disabled:
+  - concat_without_spaces

.travis.yml

@@ -5,10 +5,10 @@ language: php
 services:
   - mysql
   - postgresql
+  - memcached
+  - redis-server
 
 php:
-  - 5.6
-  - 7
   - 7.1
   - 7.2
   - 7.3
@@ -18,18 +18,22 @@ env:
     - DB=mysql
     - DB=sqlite
     - DB=pgsql
+    - DB=memory
 
 cache:
   directories:
     - $HOME/.composer/cache
-    
+
 before_install:
   # copy sprinkles.json
   - cp app/sprinkles.example.json app/sprinkles.json
   # set up db
   - bash build/before_install.sh $DB
   # update node
   - nvm install 10.12.0
+  # Install Redis and Memcached
+  - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - printf "\n" | pecl install -f redis
 
 before_script:
   # install deps and UF

CHANGELOG.md

@@ -5,6 +5,59 @@ 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.3.0]
+
+### Changed Requirements
+- Changed minimum PHP Version to 7.1
+
+### Added
+- Separated `BakeCommand` class into multiple methods to make it easier for sprinkle to add custom command to the `bake` command.
+
+### Fix
+- `bake` command return error if account sprinkle is not included ([#944])
+
+### Changed
+- Account sprinkle now extend the Core `BakeCommand` class to add the `create-admin` to the general bake command. Any sprinkle already extending the Core `BakeCommand` might need adjustments.
+- Updated custom Eloquent relations (`belongsToManyThrough`, `morphToManyUnique`, `belongsToManyUnique`, `morphToManyUnique`, etc.) to support Laravel 5.8. See [The `belongsToMany` Method](https://laravel.com/docs/5.5/upgrade#upgrade-5.5.0).
+
+### Removed
+- Removed `belongsToManyConstrained` (deprecated in 4.1.6)
+
+## [v4.2.3]
+
+### Added
+- Config to set Domain of RememberMe Cookie ([#990]; [#991]; Thanks @xrobau!)
+- Config settings for password min/max length ([#993])
+
+### Fixed
+- [PHPMailer] Turn off opportunistic TLS when disabled ([#986]; [#987])
+- Migrator now ignore files that don't end in `.php` ([#965]; Temporary fix for [#998])
+
+## [v4.2.2]
+
+### Added
+- New group factory (`'UserFrosting\Sprinkle\Account\Database\Models\Group'`)
+- New `withController` Trait, as an alternative for deprecated `ControllerTestCase`
+- StyleCI config
+- [Travis] SQLite in-memory DB testing
+- [Travis] enabled memcache & Redis service
+
+### Fixed
+- DefaultPermissions seed results in SQL errors ([#981]; [#983])
+- Make group & role schema consistent between creation and edition. Prevents group and role without a name or slug to be created during edition.
+- Factories changed to make sure slugs are unique
+- Fix `WithTestUser` Trait returning a user with id of zero or reserve master id when a non-master user was asked. If master user already exist, will return it instead of trying to create a new one (with the same id)
+- Force close db connection on test `tearDown` procedure
+
+### Changed
+- Recommended PHP version is now 7.2, as 7.1 will be EOL in less than 6 months
+- Added tests coverage for all build-in controllers
+- Applied styling rules from StyleCI & updated php-cs-fixer rules to match StyleCI config
+
+### Deprecated
+- `ControllerTestCase`. Use `withController` Trait instead.
+
+
 ## [v4.2.1]
 
 ### Added
@@ -730,7 +783,18 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#953]: https://github.com/userfrosting/UserFrosting/issues/953
 [#958]: https://github.com/userfrosting/UserFrosting/issues/958
 [#963]: https://github.com/userfrosting/UserFrosting/issues/963
+[#965]: https://github.com/userfrosting/UserFrosting/issues/965
 [#968]: https://github.com/userfrosting/UserFrosting/issues/968
+[#981]: https://github.com/userfrosting/UserFrosting/issues/981
+[#983]: https://github.com/userfrosting/UserFrosting/issues/983
+[#986]: https://github.com/userfrosting/UserFrosting/issues/986
+[#987]: https://github.com/userfrosting/UserFrosting/issues/987
+[#990]: https://github.com/userfrosting/UserFrosting/issues/990
+[#991]: https://github.com/userfrosting/UserFrosting/issues/991
+[#993]: https://github.com/userfrosting/UserFrosting/issues/993
+[#998]: https://github.com/userfrosting/UserFrosting/issues/998
 
 [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
+[v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1
+[v4.2.2]: https://github.com/userfrosting/UserFrosting/compare/v.4.2.1...v4.2.2
+[v4.2.3]: https://github.com/userfrosting/UserFrosting/compare/v4.2.2...v4.2.3

README.md

@@ -1,16 +1,29 @@
 # UserFrosting 4.2
 
 [![Latest Version](https://img.shields.io/github/release/userfrosting/UserFrosting.svg)](https://github.com/userfrosting/UserFrosting/releases)
+![PHP Version](https://img.shields.io/packagist/php-v/userfrosting/userfrosting.svg?color=brightgreen)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
 [![Join the chat at https://chat.userfrosting.com/channel/support](https://demo.rocket.chat/images/join-chat.svg)](https://chat.userfrosting.com/channel/support)
 [![Backers on Open Collective](https://opencollective.com/userfrosting/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/userfrosting/sponsors/badge.svg)](#sponsors)
 [![Donate](https://img.shields.io/badge/Open%20Collective-Donate-blue.svg)](https://opencollective.com/userfrosting#backer)
 
-| Branch | Status |
-| ------ | ------ |
-| master | [![Build Status](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=master)](https://travis-ci.org/userfrosting/UserFrosting) [![codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/master/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting/branch/master) |
-| develop | [![Build Status](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=develop)](https://travis-ci.org/userfrosting/UserFrosting) [![codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/develop/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting/branch/develop) |
+| Branch | Version | Build | Coverage | Style |
+| ------ |:-------:|:-----:|:--------:|:-----:|
+| [master] | ![](https://img.shields.io/github/release/userfrosting/userfrosting.svg?color=success&label=Version) | [![](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=master)][UF-Travis] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/master/graph/badge.svg)][UF-Codecov] | [![][style-master]][style] |
+| [hotfix] | ![](https://img.shields.io/badge/Version-v4.2.x-yellow.svg) | [![](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=hotfix)][UF-Travis] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/hotfix/graph/badge.svg)][UF-Codecov] | [![][style-hotfix]][style] |
+| [develop] | ![](https://img.shields.io/badge/Version-v4.3.x-orange.svg) | [![](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=develop)][UF-Travis] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/develop/graph/badge.svg)][UF-Codecov] | [![][style-develop]][style] |
+
+<!-- Links -->
+[master]: https://github.com/userfrosting/UserFrosting
+[hotfix]: https://github.com/userfrosting/UserFrosting/tree/hotfix
+[develop]: https://github.com/userfrosting/UserFrosting/tree/develop
+[UF-Travis]: https://travis-ci.org/userfrosting/UserFrosting
+[UF-Codecov]: https://codecov.io/gh/userfrosting/userfrosting
+[style-master]: https://github.styleci.io/repos/18148206/shield?branch=master&style=flat
+[style-hotfix]: https://github.styleci.io/repos/18148206/shield?branch=hotfix&style=flat
+[style-develop]: https://github.styleci.io/repos/18148206/shield?branch=develop&style=flat
+[style]: https://github.styleci.io/repos/18148206
 
 [https://www.userfrosting.com](https://www.userfrosting.com)
 
@@ -20,7 +33,7 @@ If you simply want to show that you like this project, or want to remember it fo
 
 Copyright (c) 2019, free to use in personal and commercial software as per the [license](LICENSE.md).
 
-UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.4/eloquent#introduction) ORM.
+UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.8/eloquent#introduction) ORM.
 
 ## Features
 

app/defines.php

@@ -1,5 +1,6 @@
 <?php
-/**
+
+/*
  * UserFrosting (http://www.userfrosting.com)
  *
  * @link      https://github.com/userfrosting/UserFrosting
@@ -10,10 +11,10 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.2.1');
+define('UserFrosting\VERSION', '4.3.0-dev');
 define('UserFrosting\DS', '/');
-define('UserFrosting\PHP_MIN_VERSION', '5.6');
-define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.1');
+define('UserFrosting\PHP_MIN_VERSION', '7.1');
+define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.2');
 define('UserFrosting\NODE_MIN_VERSION', 'v10.12.0');
 define('UserFrosting\NPM_MIN_VERSION', '6.0.0');
 

app/sprinkles/account/composer.json

@@ -13,8 +13,7 @@
     ],
     "require": {
         "birke/rememberme" : "^2.0",
-        "nikic/php-parser" : "^1",
-        "php": ">=5.6"
+        "nikic/php-parser" : "^1"
     },
     "autoload": {
         "psr-4": {

app/sprinkles/account/config/debug.php

@@ -1,5 +1,6 @@
 <?php
-/**
+
+/*
  * UserFrosting (http://www.userfrosting.com)
  *
  * @link      https://github.com/userfrosting/UserFrosting
@@ -12,6 +13,6 @@
  */
 return [
     'debug' => [
-        'auth' => true
+        'auth' => true,
     ],
 ];