Merge branch 'master' into dev

flextype-plugins · Dec 29, 2020 · 42262c3 · 42262c3
2 parents 6c6aaee + 340bc2b
commit 42262c3
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 193 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="1.7.0"></a>
+# [1.7.0](https://github.com/flextype-plugins/acl) (2020-12-29)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.14
+* **core** Moving to PHP 7.4
+* **core** use new TWIG Plugin 1.7.0
+
+<a name="1.6.0"></a>
+# [1.6.0](https://github.com/flextype-plugins/acl) (2020-12-20)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.13
+
 <a name="1.5.0"></a>
 # [1.5.0](https://github.com/flextype-plugins/acl) (2020-12-06)
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-<h1 align="center">ACL Plugin for <a href="http://flextype.org/">Flextype</a></h1>
+<h1 align="center">ACL Plugin for <a href="https://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/acl/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/acl.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/acl"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/acl"><img src="https://img.shields.io/github/downloads/flextype-plugins/acl/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>
+<a href="https://github.com/flextype-plugins/acl/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/flextype.acl.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/acl"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/acl"><img src="https://img.shields.io/github/downloads/flextype-plugins/acl/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.14-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
@@ -15,7 +15,7 @@ The following dependencies need to be downloaded and installed for ACL Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.12 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.14 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 
 ## Installation
@@ -447,7 +447,7 @@ You may restrict access for specific users to your specific content inside the T
 #### Show private content for logged in users
 
 ```
-{% if acl.isUserLoggedIn() %}
+{% if flextype.acl.isUserLoggedIn() %}
  Private content here..
 {% else %}
  Public content for users is here...
@@ -457,7 +457,7 @@ You may restrict access for specific users to your specific content inside the T
 #### Show private content for users with roles: admin and student
 
 ```
-{% if acl.isUserLoggedInRolesIn('admin, student') %}
+{% if flextype.acl.isUserLoggedInRolesIn('admin, student') %}
  Private content here..
 {% else %}
  Public content for users is here...
@@ -467,7 +467,7 @@ You may restrict access for specific users to your specific content inside the T
 #### Show private content for users with uuids ea7432a3-b2d5-4b04-b31d-1c5acc7a55e2 and d549af27-79a0-44f2-b9b1-e82b47bf87e2
 
 ```
-{% if acl.isUserLoggedInUuidIn('ea7432a3-b2d5-4b04-b31d-1c5acc7a55e2, d549af27-79a0-44f2-b9b1-e82b47bf87e2') %}
+{% if flextype.acl.isUserLoggedInUuidIn('ea7432a3-b2d5-4b04-b31d-1c5acc7a55e2, d549af27-79a0-44f2-b9b1-e82b47bf87e2') %}
  Private content here..
 {% else %}
  Public content for users is here...
@@ -477,7 +477,7 @@ You may restrict access for specific users to your specific content inside the T
 #### Show private content for users with emails jack@flextype.org, sam@flextype.org
 
 ```
-{% if acl.isUserLoggedInEmailIn('jack@flextype.org, sam@flextype.org') %}
+{% if flextype.acl.isUserLoggedInEmailIn('jack@flextype.org, sam@flextype.org') %}
  Public content for users is here...
 {% else %}
  Public content for users is here...
@@ -487,22 +487,22 @@ You may restrict access for specific users to your specific content inside the T
 #### Show logged in email
 
 ```
-Hello {{ acl.getUserLoggedInEmail() }}
+Hello {{ flextype.acl.getUserLoggedInEmail() }}
 ```
 
 #### Show logged in uuid
 
 ```
-Hello {{ acl.getUserLoggedInEmail() }},
-your uuid: {{ acl.getUserLoggedInUuid() }}
+Hello {{ flextype.acl.getUserLoggedInEmail() }},
+your uuid: {{ flextype.acl.getUserLoggedInUuid() }}
 ```
 
 #### Show logged in roles
 
 ```
-Hello {{ acl.getUserLoggedInEmail() }},
-your uuid: {{ acl.getUserLoggedInUuid() }}
-and your roles: {{ acl.getUserLoggedInRoles() }}
+Hello {{ flextype.acl.getUserLoggedInEmail() }},
+your uuid: {{ flextype.acl.getUserLoggedInUuid() }}
+and your roles: {{ flextype.acl.getUserLoggedInRoles() }}
 ```
 
 ### Restrict access in the PHP
@@ -564,4 +564,4 @@ echo 'and your roles: ' . flextype('acl')->getUserLoggedInRoles();
 
 ## LICENSE
 [The MIT License (MIT)](https://github.com/flextype-plugins/acl/blob/master/LICENSE.txt)
-Copyright (c) 2020 [Sergey Romanenko](https://github.com/Awilum)
+Copyright (c) 2021 [Sergey Romanenko](https://github.com/Awilum)
diff --git a/app/Models/Acl.php b/app/Models/Acl.php
@@ -19,14 +19,6 @@
 
 class Acl
 {
- /**
- * __construct
- */
- public function __construct()
- {
-
- }
-
  /**
  * Check is user logged in
  *

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
  "issues": "https://github.com/flextype-plugins/acl/issues"
  },
  "require": {
- "php": ">=7.3.0",
+ "php": ">=7.4.0",
  "ext-json": "*",
  "flextype-components/arrays" : "3.0.1",
  "flextype-components/filesystem": "2.0.8"
@@ -25,7 +25,7 @@
  "apcu-autoloader": true,
  "optimize-autoloader": true,
  "platform": {
- "php": "7.3.0"
+ "php": "7.4.0"
  }
  },
  "autoload": {

diff --git a/dependencies.php b/dependencies.php
@@ -13,15 +13,18 @@
 
 use Flextype\Plugin\Acl\Models\Acl;
 use Flextype\Plugin\Acl\Twig\AclTwigExtension;
+use Flextype\Plugin\Twig\Twig\FlextypeTwig;
+use Flextype\Foundation\Entries\Entries;
+use Flextype\Plugin\Twig\Twig\FlextypeEntriesTwig;
+
 
 /**
  * Add ACL Model to Flextype container
  */
-flextype()->container()['acl'] = static function () {
- return new Acl();
-};
+flextype()->container()['acl'] = fn() => new Acl();
+
 
 /**
- * Add ACL Twig Extension to Flextype container
+ * Add ACL Model to Flextype Twig
  */
-flextype('twig')->addExtension(new AclTwigExtension());
+FlextypeTwig::macro('acl', fn() => flextype('acl'));
diff --git a/entries_acl.php b/entries_acl.php
@@ -4,7 +4,7 @@
 
 
 
-flextype('emitter')->addListener('onEntryAfterInitialized', function() {
+flextype('emitter')->addListener('onEntriesFetchSingleHasResult', function() {
 
  // Get current entry
  $entry = flextype('entries')->getStorage('fetch.data');

diff --git a/middlewares/AclIsUserLoggedInEmailInMiddleware.php b/middlewares/AclIsUserLoggedInEmailInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInEmailNotInMiddleware.php b/middlewares/AclIsUserLoggedInEmailNotInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInMiddleware.php b/middlewares/AclIsUserLoggedInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInRolesInMiddleware.php b/middlewares/AclIsUserLoggedInRolesInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInRolesNotInMiddleware.php b/middlewares/AclIsUserLoggedInRolesNotInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInUuidInMiddleware.php b/middlewares/AclIsUserLoggedInUuidInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserLoggedInUuidNotInMiddleware.php b/middlewares/AclIsUserLoggedInUuidNotInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/middlewares/AclIsUserNotLoggedInMiddleware.php b/middlewares/AclIsUserNotLoggedInMiddleware.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 

diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: ACL
-version: 1.5.0
+version: 1.7.0
 description: ACL plugin for Flextype.
 icon: fas fa-users-cog
 author:
@@ -11,5 +11,5 @@ bugs: https://github.com/flextype-plugins/acl/issues
 license: MIT
 
 dependencies:
- flextype: 0.9.12
+ flextype: 0.9.14
  twig: '>=1.0.0'
diff --git a/settings.yaml b/settings.yaml
@@ -2,4 +2,4 @@
 enabled: true
 
 # ACL plugin priority
-priority: 95
+priority: 40
diff --git a/shortcodes/AclShortcodesExtension.php b/shortcodes/AclShortcodesExtension.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Flextype (http://flextype.org)
+ * Flextype (https://flextype.org)
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
@@ -12,7 +12,7 @@
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
 
 // Shortcode: [userLoggedInEmail]
-flextype('shortcode')->addHandler('userLoggedInEmail', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInEmail', static function (ShortcodeInterface $s) {
  if (flextype('acl')->getUserLoggedInEmail()) {
  return flextype('acl')->getUserLoggedInEmail();
  }
@@ -21,7 +21,7 @@
 });
 
 // Shortcode: [userLoggedInUuid]
-flextype('shortcode')->addHandler('userLoggedInUuid', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInUuid', static function (ShortcodeInterface $s) {
  if (flextype('acl')->getUserLoggedInUuid()) {
  return flextype('acl')->getUserLoggedInUuid();
  }
@@ -30,7 +30,7 @@
 });
 
 // Shortcode: [userLoggedInRoles]
-flextype('shortcode')->addHandler('userLoggedInRoles', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInRoles', static function (ShortcodeInterface $s) {
  if (flextype('acl')->getUserLoggedInRoles()) {
  return flextype('acl')->getUserLoggedInRoles();
  }
@@ -39,7 +39,7 @@
 });
 
 // Shortcode: [userLoggedIn]Private content here..[/userLoggedIn]
-flextype('shortcode')->addHandler('userLoggedIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedIn', static function (ShortcodeInterface $s) {
  if (flextype('acl')->isUserLoggedIn()) {
  return $s->getContent();
  }
@@ -48,7 +48,7 @@
 });
 
 // Shortcode: [userLoggedInRolesIn roles="admin, student"]Private content here..[/userLoggedInRolesIn]
-flextype('shortcode')->addHandler('userLoggedInRolesIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInRolesIn', static function (ShortcodeInterface $s) {
  if (flextype('acl')->isUserLoggedInRolesIn($s->getParameter('roles'))) {
  return $s->getContent();
  }
@@ -57,7 +57,7 @@
 });
 
 // Shortcode: [userLoggedInUuidIn uuids="ea7432a3-b2d5-4b04-b31d-1c5acc7a55e2, d549af27-79a0-44f2-b9b1-e82b47bf87e2"]Private content here..[/userLoggedInUuidOneOf]
-flextype('shortcode')->addHandler('userLoggedInUuidIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInUuidIn', static function (ShortcodeInterface $s) {
  if (flextype('acl')->isUserLoggedInUuidIn($s->getParameter('uuids'))) {
  return $s->getContent();
  }
@@ -66,7 +66,7 @@
 });
 
 // Shortcode: [userLoggedInEmailIn emails="jack@flexype.org, sam@flextype.org"]Private content here..[/userLoggedInUsernameOneOf]
-flextype('shortcode')->addHandler('userLoggedInEmailIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInEmailIn', static function (ShortcodeInterface $s) {
  if (flextype('acl')->isUserLoggedInEmailIn($s->getParameter('emails'))) {
  return $s->getContent();
  }
@@ -75,7 +75,7 @@
 });
 
 // Shortcode: [userNotLoggedIn]Content for not logged in user here..[/userNotLoggedIn]
-flextype('shortcode')->addHandler('userNotLoggedIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userNotLoggedIn', static function (ShortcodeInterface $s) {
  if (! flextype('acl')->isUserLoggedIn()) {
  return $s->getContent();
  }
@@ -84,7 +84,7 @@
 });
 
 // Shortcode: [userLoggedInRolesNotIn roles="admin, student"]Private content here..[/userLoggedInRolesNotIn]
-flextype('shortcode')->addHandler('userLoggedInRolesNotIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInRolesNotIn', static function (ShortcodeInterface $s) {
  if (! flextype('acl')->isUserLoggedInRolesNotIn($s->getParameter('roles'))) {
  return $s->getContent();
  }
@@ -93,7 +93,7 @@
 });
 
 // Shortcode: [userLoggedInUuidNotIn uuids="ea7432a3-b2d5-4b04-b31d-1c5acc7a55e2, d549af27-79a0-44f2-b9b1-e82b47bf87e2"]Private content here..[/userLoggedInUuidNotIn]
-flextype('shortcode')->addHandler('userLoggedInUuidNotIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInUuidNotIn', static function (ShortcodeInterface $s) {
  if (! flextype('acl')->isUserLoggedInUuidNotIn($s->getParameter('uuids'))) {
  return $s->getContent();
  }
@@ -102,7 +102,7 @@
 });
 
 // Shortcode: [userLoggedInEmailNotIn emails="jack@flexype.org, sam@flextype.org"]Private content here..[/userLoggedInEmailNotIn]
-flextype('shortcode')->addHandler('userLoggedInEmailNotIn', static function (ShortcodeInterface $s) {
+flextype('parsers')->shortcode()->addHandler('userLoggedInEmailNotIn', static function (ShortcodeInterface $s) {
  if (! flextype('acl')->isUserLoggedInEmailsNotIn($s->getParameter('emails'))) {
  return $s->getContent();
  }