Skip to content

Commit

Permalink
Release 4.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette authored Apr 22, 2021
2 parents cf651f3 + ab9a5a9 commit c92bf0b
Show file tree
Hide file tree
Showing 120 changed files with 1,294 additions and 1,021 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
38 changes: 19 additions & 19 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_versions: ['7.1', '7.2', '7.3', '7.4']
php_versions: ['7.2', '7.3', '7.4']

runs-on: ubuntu-latest
name: PHPUnit - PHP ${{ matrix.php_versions }} - MySQL
Expand All @@ -38,11 +38,11 @@ jobs:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
coverage: xdebug
tools: pecl, composer:v1
tools: pecl, composer

- uses: actions/setup-node@v2
with:
node-version: 10
node-version: 14

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"

- name: Install Dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress

- name: Bakery Debug
run: php bakery debug
Expand All @@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_versions: ['7.1', '7.2', '7.3', '7.4']
php_versions: ['7.2', '7.3', '7.4']

runs-on: ubuntu-latest
name: PHPUnit - PHP ${{ matrix.php_versions }} - SQLite
Expand All @@ -129,11 +129,11 @@ jobs:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
coverage: xdebug
tools: pecl, composer:v1
tools: pecl, composer

- uses: actions/setup-node@v2
with:
node-version: 10
node-version: 14

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand All @@ -147,7 +147,7 @@ jobs:
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"

- name: Install Dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress

- name: Create SQLite Database
run: |
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_versions: ['7.1', '7.2', '7.3', '7.4']
php_versions: ['7.2', '7.3', '7.4']

runs-on: ubuntu-latest
name: PHPUnit - PHP ${{ matrix.php_versions }} - PostgreSQL
Expand All @@ -202,7 +202,7 @@ jobs:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite, pdo_pgsql
coverage: xdebug
tools: pecl, composer:v1
tools: pecl, composer

- name: Setup PostgreSQL
uses: harmon758/postgresql-action@v1
Expand All @@ -213,7 +213,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 10
node-version: 14

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand All @@ -227,7 +227,7 @@ jobs:
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"

- name: Install Dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress

- name: Bakery Debug
run: php bakery debug
Expand All @@ -253,7 +253,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_versions: ['7.1', '7.2', '7.3', '7.4']
php_versions: ['7.2', '7.3', '7.4']

runs-on: windows-latest
name: PHPUnit - PHP ${{ matrix.php_versions }} - Windows
Expand All @@ -273,17 +273,17 @@ jobs:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, pdo, sqlite, pdo_sqlite
coverage: xdebug
tools: pecl, composer:v1
tools: pecl, composer

- uses: actions/setup-node@v2
with:
node-version: 10
node-version: 14

- name: Copy .env
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"

- name: Install Dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress

- name: Create SQLite Database
run: |
Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:
fail-fast: false
matrix:
php_versions: ['7.4']
node_versions: ['10', '12', '14']
node_versions: ['12.17.0', '14', '15']
os: [ubuntu-latest, windows-latest]

runs-on: ${{ matrix.os }}
Expand All @@ -329,7 +329,7 @@ jobs:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd
coverage: xdebug
tools: pecl, composer:v1
tools: pecl, composer

- uses: actions/setup-node@v2
with:
Expand All @@ -339,7 +339,7 @@ jobs:
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"

- name: Install Dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress

- name: Execute build
run: php bakery build-assets
69 changes: 69 additions & 0 deletions .lando.dist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Lando is a development tool, do not use it hosting a production website

name: userfrosting
recipe: lamp
config:
webroot: ./public
php: '7.4'
composer_version: '2-latest'
database: mariadb
xdebug: true

services:
appserver:
build_as_root:
- apt-get update -y
- apt-get install -my wget gnupg
- a2enmod headers
# Patch to bring NodeJS into app server container
# https://docs.lando.dev/guides/installing-node-in-your-lando-php-service.html
- curl -sL https://deb.nodesource.com/setup_14.x | bash -
- apt-get install -y nodejs
overrides:
environment:
PHP_IDE_CONFIG: "serverName=userfrosting.lndo.site"
MAIL_MAILER: "mail"
DB_DRIVER: "mysql"
DB_HOST: "database"
DB_PORT: "3306"
DB_NAME: "lamp"
DB_USER: "lamp"
DB_PASSWORD: "lamp"
ssl: true

# Redis cache
cache:
type: redis

# phpMyAdmin
pma:
type: phpmyadmin
hosts:
- database

# MailHog
mh:
type: mailhog:v1.0.0
portforward: false
hogfrom:
# Set UF mailer config to 'mail' complete integration
- appserver

proxy:
pma:
- pma.userfrosting.lndo.site
mh:
- mh.userfrosting.lndo.site

tooling:
phpunit:
service: appserver
description: "Run PHP Unit tests"
cmd: app/vendor/bin/phpunit
redis-cli:
service: cache
description: "Redis cache CLI"
bakery:
service: appserver
description: "UserFrosting CLI"
cmd: php bakery
9 changes: 5 additions & 4 deletions .php_cs → .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ $rules = [
];

$finder = PhpCsFixer\Finder::create()
->exclude([
'vendor',
])
->in([__DIR__ . '/app', __DIR__ . '/public']);
->in([
__DIR__ . '/app/sprinkles',
__DIR__ . '/app/system',
__DIR__ . '/public'
]);

return PhpCsFixer\Config::create()
->setRules($rules)
Expand Down
56 changes: 55 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,53 @@ 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.5.0]

### Changed Requirements
- Drop PHP 7.1 support. PHP 7.4 is now recommended.
- Raised NodeJS version requirement from `>=10.12.0` to `^12.17.0 || >=14.0.0` ([#1138]).
- Raised NPM version requirement from `>=6.0.0` to `>=6.14.4` ([#1138]).

### Changed Composer Dependencies
- Updated `wikimedia/composer-merge-plugin` from `^1.4.0` to `^2.1.0` ([#1117]).

### Added
- Composer 2 support ([#1117]).
- [Lando](https://lando.dev) support.
- Added more SMTP options in env and setup:smtp bakery command ([#1077]),
- Added new `MAIL_MAILER` environment variable to set mailer type.
- Added "Native mail" to `setup:mail` bakery command.

### Changed
- Implement findInt ([#1117]).
- Replace `getenv()` with `env()` ([#1121]).
- Replaced `UserFrosting\Sprinkle\Core\Bakery\Helper\NodeVersionCheck` with new `UserFrosting\Sprinkle\Core\Util\VersionValidator` class.
- Bakery command `setup:smtp` renamed to `setup:mail`. The old command is still available as an alias for backward compatibility.
- Changed `.php_cs` to `.php_cs.dist`.
- Changed `phpunit.xml` to `phpunit.xml.dist`.

### Fixed
- Replaced AdminLTE credit in default footer (old link was dead).
- Issue with path slashes on Windows ([#1133]).

### Removed
- Removed deprecated `UserFrosting\System\Bakery\Migration` (deprecated in 4.2.0).
- Removed deprecated `UserFrosting\Tests\DatabaseTransactions` (deprecated in 4.2.0).
- Removed deprecated `UserFrosting\Sprinkle\Core\Tests\ControllerTestCase` (deprecated in 4.2.2).
- Removed deprecated `UserFrosting\Sprinkle\Core\Model\UFModel` (deprecated in 4.1).
- Removed deprecated `UserFrosting\Sprinkle\Core\Sprunje\Sprunje::getResults` (deprecated in 4.1.7).
- Removed deprecated `UserFrosting\Sprinkle\Account\Database\Models\User::exists` (deprecated in 4.1.7).
- Removed deprecated `UserFrosting\Sprinkle\Core\Database\Models\Model::export` (deprecated in 4.1.8).
- Removed deprecated `UserFrosting\Sprinkle\Core\Database\Models\Model::queryBuilder` (deprecated in 4.1.8).
- Removed deprecated `UserFrosting\Sprinkle\Core\Database\Relations\Concerns\Unique::withLimit` (deprecated in 4.1.7).
- Removed deprecated `UserFrosting\Sprinkle\Core\Database\Relations\Concerns\Unique::withOffset` (deprecated in 4.1.7).
- Removed deprecated `UserFrosting\Sprinkle\Core\Error\RendererWhoopsRenderer::getResourcesPath`.
- Removed deprecated `UserFrosting\Sprinkle\Core\Error\RendererWhoopsRenderer::setResourcesPath`.
- Removed deprecated Handlebar `ifCond` (Deprecated in 4.1).
- Removed migration seed.
- Removed support for migration with non static `$dependencies` properties.
- Removed support for deprecated `determineRedirectOnLogin` service (deprecated in 4.1.10).

## [v4.4.5]

### Changed
Expand Down Expand Up @@ -85,7 +132,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Improve ordering by activity date ([#1061] & [#1062]; Thanks @ktecho!)
- Updated Vagrant config and documentation
- Fixed a bug where `withTrashed` in `findUnique` was not available when `SoftDeletes` trait is not included in a model.
- CSRF global middleware is not loaded anymore if in a CLI envrionement. This will avoid sessions to be created for bakery and tests by default.
- CSRF global middleware is not loaded anymore if in a CLI environment. This will avoid sessions to be created for bakery and tests by default.
- Browserified node modules not being correctly loaded.
- Browserified node modules potentially colliding with real entrypoints.

Expand Down Expand Up @@ -994,6 +1041,12 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
[#1114]: https://github.com/userfrosting/UserFrosting/pull/1114
[#1126]: https://github.com/userfrosting/UserFrosting/pull/1126
[#1128]: https://github.com/userfrosting/UserFrosting/pull/1128
[#1117]: https://github.com/userfrosting/UserFrosting/issues/1117
[#1138]: https://github.com/userfrosting/UserFrosting/pull/1138
[#1124]: https://github.com/userfrosting/UserFrosting/pull/1124
[#1121]: https://github.com/userfrosting/UserFrosting/pull/1121
[#1077]: https://github.com/userfrosting/UserFrosting/pull/1077
[#1133]: https://github.com/userfrosting/UserFrosting/issues/1133

[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...v.4.2.1
Expand All @@ -1009,3 +1062,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
[v4.4.3]: https://github.com/userfrosting/UserFrosting/compare/v4.4.2...v4.4.3
[v4.4.4]: https://github.com/userfrosting/UserFrosting/compare/v4.4.3...v4.4.4
[v4.4.5]: https://github.com/userfrosting/UserFrosting/compare/v4.4.4...v4.4.5
[v4.5.0]: https://github.com/userfrosting/UserFrosting/compare/v4.4.5...v4.5.0
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# UserFrosting 4.4
# UserFrosting 4.5

[![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)
Expand All @@ -11,8 +11,8 @@
| Branch | Version | Build | Coverage | Style |
| ------ |:-------:|:-----:|:--------:|:-----:|
| [master] | ![](https://img.shields.io/github/release/userfrosting/userfrosting.svg?color=success&label=Version) | [![](https://github.com/userfrosting/userfrosting/workflows/Build/badge.svg?branch=master)][UF-Build] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/master/graph/badge.svg)][UF-Codecov] | [![][style-master]][style] |
| [hotfix] | ![](https://img.shields.io/badge/Version-v4.4.x-yellow.svg) | [![](https://github.com/userfrosting/userfrosting/workflows/Build/badge.svg?branch=hotfix)][UF-Build] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/hotfix/graph/badge.svg)][UF-Codecov] | [![][style-hotfix]][style] |
| [develop] | ![](https://img.shields.io/badge/Version-v4.5.x-orange.svg) | [![](https://github.com/userfrosting/userfrosting/workflows/Build/badge.svg?branch=develop)][UF-Build] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/develop/graph/badge.svg)][UF-Codecov] | [![][style-develop]][style] |
| [hotfix] | ![](https://img.shields.io/badge/Version-v4.5.x-yellow.svg) | [![](https://github.com/userfrosting/userfrosting/workflows/Build/badge.svg?branch=hotfix)][UF-Build] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/hotfix/graph/badge.svg)][UF-Codecov] | [![][style-hotfix]][style] |
| [develop] | ![](https://img.shields.io/badge/Version-v4.6.x-orange.svg) | [![](https://github.com/userfrosting/userfrosting/workflows/Build/badge.svg?branch=develop)][UF-Build] | [![](https://codecov.io/gh/userfrosting/userfrosting/branch/develop/graph/badge.svg)][UF-Codecov] | [![][style-develop]][style] |

<!-- Links -->
[master]: https://github.com/userfrosting/UserFrosting
Expand All @@ -38,13 +38,13 @@ UserFrosting is a secure, modern user management system written in PHP and built
## Features

### User login screen
![User login script](screenshots/login.png)
![User login script](.github/screenshots/login.png)

### User management page
![PHP user management script](screenshots/users.png)
![PHP user management script](.github/screenshots/users.png)

### Permissions management page
![UserFrosting permissions management](screenshots/permissions.png)
![UserFrosting permissions management](.github/screenshots/permissions.png)

## [Demo](https://demo.userfrosting.com)

Expand Down Expand Up @@ -93,7 +93,7 @@ Louis's a civil engineer in Montréal, Québec who also has a passion for coding

### Jordan Mele

Jordan's an Australian PHP Developer at [4mation](https://www.4mation.com.au) in Surry Hills, NSW. His passion is creating simple yet intuitive software-based solutions for problems that would otherwise be tedious and overcomplicated to address, while keeping the user in control.
Jordan's an Australian Software Engineer at [Canva](https://canva.com). His passion is creating simple yet intuitive software-based solutions for problems that would otherwise be tedious and/or difficult to solve, while keeping the user in control.

### Sarah Baghdadi

Expand Down Expand Up @@ -139,5 +139,5 @@ Backers help us continue to develop UserFrosting by pledging a regular monthly c

Support this project by becoming a sponsor. Sponsors have contributed a total of $500 or more to UserFrosting (either as an ongoing backer or one-time contributions). Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/userfrosting#sponsor)]

[![USOR Games](sponsors/usor.png)](https://usorgames.com)
[![Next Generation Internet](sponsors/nextgi.png)](https://nextgi.com)
[![USOR Games](.github/sponsors/usor.png)](https://usorgames.com)
[![Next Generation Internet](.github/sponsors/nextgi.png)](https://nextgi.com)
4 changes: 4 additions & 0 deletions app/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ DB_PORT="3306"
DB_NAME="userfrosting"
DB_USER="userfrosting"
DB_PASSWORD="password"
MAIL_MAILER="smtp" # Set to one of 'smtp', 'mail', 'qmail', 'sendmail'
SMTP_HOST="host.example.com"
SMTP_USER="[email protected]"
SMTP_PASSWORD="password"
SMTP_PORT="587"
SMTP_AUTH="true"
SMTP_SECURE="tls"
Loading

0 comments on commit c92bf0b

Please sign in to comment.