Merge branch 'master' into dev

flextype-plugins · Aug 25, 2020 · 17f1b33 · 17f1b33
2 parents 97a6b6f + f417c83
commit 17f1b33
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/flextype-plugins/accounts) (2020-08-25)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.11
+
 <a name="1.3.0"></a>
 # [1.3.0](https://github.com/flextype-plugins/accounts) (2020-08-19)
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Accounts Plugin for <a href="http://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/accounts/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/accounts.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/accounts"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/accounts"><img src="https://img.shields.io/github/downloads/flextype-plugins/accounts/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.10-green.svg" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/accounts/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/accounts.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/accounts"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/accounts"><img src="https://img.shields.io/github/downloads/flextype-plugins/accounts/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.11-green.svg" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 ## Features
@@ -14,7 +14,7 @@ The following dependencies need to be downloaded and installed for Accounts Plug
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.10 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [download](https://github.com/flextype/flextype/releases) |
 | [site](https://github.com/flextype-plugins/site) | >=1.0.0 | [download](https://github.com/flextype-plugins/site/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [acl](https://github.com/flextype-plugins/acl) | >=1.0.0 | [download](https://github.com/flextype-plugins/acl/releases) |

diff --git a/app/Controllers/AccountsController.php b/app/Controllers/AccountsController.php
diff --git a/composer.json b/composer.json
@@ -16,14 +16,14 @@
       "issues": "https://github.com/flextype-plugins/accounts/issues"
     },
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.3.0",
         "ext-json": "*"
     },
     "config": {
         "apcu-autoloader": true,
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.2.5"
+            "php": "7.3.0"
         }
     },
     "autoload": {

diff --git a/dependencies.php b/dependencies.php
@@ -16,6 +16,6 @@
 /**
  * Add accounts controller to Flextype container
  */
-$flextype->container()['AccountsController'] = static function () use ($flextype) {
-    return new AccountsController($flextype);
+flextype()->container()['AccountsController'] = static function () {
+    return new AccountsController();
 };
diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Accounts
-version: 1.3.0
+version: 1.4.0
 description: Accounts plugins for Flextype.
 icon: fas fa-users
 author:
@@ -12,7 +12,7 @@ keywords: accounts, login, authentication
 license: MIT
 
 dependencies:
-  flextype: 0.9.10
+  flextype: 0.9.11
   site: '>=1.0.0'
   twig: '>=1.0.0'
   form: '>=1.0.0'

diff --git a/routes/web.php b/routes/web.php
@@ -11,20 +11,20 @@
 
 use Flextype\Plugin\Acl\Middlewares\AclIsUserLoggedInMiddleware;
 
-$flextype->group('/accounts', function () use ($flextype) {
-    $flextype->get('', 'AccountsController:index')->setName('accounts.index');
-    $flextype->get('/login', 'AccountsController:login')->setName('accounts.login');
-    $flextype->post('/login', 'AccountsController:loginProcess')->setName('accounts.loginProcess');
-    $flextype->get('/reset-password', 'AccountsController:resetPassword')->setName('accounts.resetPassword');
-    $flextype->post('/reset-password', 'AccountsController:resetPasswordProcess')->setName('accounts.resetPasswordProcess');
-    $flextype->get('/new-password/{email}/{hash}', 'AccountsController:newPasswordProcess')->setName('accounts.newPasswordProcess');
-    $flextype->get('/registration', 'AccountsController:registration')->setName('accounts.registration');
-    $flextype->post('/registration', 'AccountsController:registrationProcess')->setName('accounts.registrationProcess');
-    $flextype->get('/profile/{email}', 'AccountsController:profile')->setName('accounts.profile');
+flextype()->group('/accounts', function () {
+    flextype()->get('', 'AccountsController:index')->setName('accounts.index');
+    flextype()->get('/login', 'AccountsController:login')->setName('accounts.login');
+    flextype()->post('/login', 'AccountsController:loginProcess')->setName('accounts.loginProcess');
+    flextype()->get('/reset-password', 'AccountsController:resetPassword')->setName('accounts.resetPassword');
+    flextype()->post('/reset-password', 'AccountsController:resetPasswordProcess')->setName('accounts.resetPasswordProcess');
+    flextype()->get('/new-password/{email}/{hash}', 'AccountsController:newPasswordProcess')->setName('accounts.newPasswordProcess');
+    flextype()->get('/registration', 'AccountsController:registration')->setName('accounts.registration');
+    flextype()->post('/registration', 'AccountsController:registrationProcess')->setName('accounts.registrationProcess');
+    flextype()->get('/profile/{email}', 'AccountsController:profile')->setName('accounts.profile');
 })->add('csrf');
 
-$flextype->group('/accounts', function () use ($flextype) {
-    $flextype->post('/logout', 'AccountsController:logoutProcess')->setName('accounts.logoutProcess');
-    $flextype->get('/profile/{email}/edit', 'AccountsController:profileEdit')->setName('accounts.profileEdit');
-    $flextype->post('/profile/{email}/edit', 'AccountsController:profileEditProcess')->setName('accounts.profileEditProcess');
-})->add(new AclIsUserLoggedInMiddleware($flextype, ['redirect' => 'accounts.login']))->add('csrf');
+flextype()->group('/accounts', function () {
+    flextype()->post('/logout', 'AccountsController:logoutProcess')->setName('accounts.logoutProcess');
+    flextype()->get('/profile/{email}/edit', 'AccountsController:profileEdit')->setName('accounts.profileEdit');
+    flextype()->post('/profile/{email}/edit', 'AccountsController:profileEditProcess')->setName('accounts.profileEditProcess');
+})->add(new AclIsUserLoggedInMiddleware(['redirect' => 'accounts.login']))->add('csrf');