Merge pull request #1 from acseo/upgrade-2x

sabrineferchichi · web-flow · commit 8acc568be6c5 · 2025-05-21T14:34:45.000+02:00
Upgrape to 2x
diff --git a/composer.json b/composer.json
@@ -1,12 +1,11 @@
 {
-    "name": "bitbag/acl-plugin",
+    "name": "acseo/acl-plugin",
     "type": "sylius-plugin",
     "description": "ACL plugin for Sylius.",
     "license": "MIT",
     "require": {
         "php": "^8.0",
-        "sylius/sylius": "^1.12",
-        "symfony/webpack-encore-bundle": "^1.15"
+        "sylius/sylius": "^2.0"
     },
     "require-dev": {
         "behat/behat": "^3.7",
diff --git a/src/Cache/Warmer/PrivilegesCacheWarmer.php b/src/Cache/Warmer/PrivilegesCacheWarmer.php
@@ -27,7 +27,7 @@ public function isOptional(): bool
         return false;
     }
 
-    public function warmUp(string $cacheDir): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $this->filesystemCache->deleteItems(PrivilegeInterface::CACHE_CLEARER_KEYS);
 
diff --git a/src/Form/Transformer/FormTransformer.php b/src/Form/Transformer/FormTransformer.php
@@ -27,7 +27,7 @@ public function __construct(
     /**
      * @throws InvalidArgumentException
      */
-    public function transform($value)
+    public function transform(mixed $value): mixed
     {
         Assert::nullOrIsArray($value);
         $tree = $this->compositePrivilege->getSupportedRouteMap([], true);
@@ -47,7 +47,7 @@ public function transform($value)
     /**
      * @throws InvalidArgumentException
      */
-    public function reverseTransform($value)
+    public function reverseTransform(mixed $value): mixed
     {
         Assert::isArray($value, Collection::class);
 
diff --git a/src/Resources/config/Templating/Helper/AclHelper.php b/src/Resources/config/Templating/Helper/AclHelper.php
diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml
@@ -3,3 +3,4 @@ imports:
     - { resource: "@BitBagSyliusAclPlugin/Resources/config/resources.yml" }
     - { resource: "@BitBagSyliusAclPlugin/Resources/config/grids.yml" }
     - { resource: "@BitBagSyliusAclPlugin/Resources/config/permissions.yml" }
+    - { resource: "@BitBagSyliusAclPlugin/Resources/config/twig_hooks.yml" }
diff --git a/src/Resources/config/routing.yml b/src/Resources/config/routing.yml
@@ -2,7 +2,7 @@ bitbag_sylius_acl_admin_role:
     resource: |
         alias: bitbag_sylius_acl_plugin.role
         section: admin
-        templates: "@SyliusAdmin\\Crud"
+        templates: "@SyliusAdmin\\shared\\crud"
         redirect: update
         grid: bitbag_sylius_acl_plugin_admin_role
         except: ['show']
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -22,7 +22,7 @@ services:
             - "@request_stack"
 
     bitbag_sylius_acl_plugin.request_matcher.admin:
-        class: Symfony\Component\HttpFoundation\RequestMatcher
+        class: Symfony\Component\HttpFoundation\RequestMatcher\ExpressionRequestMatcher
         arguments:
-            - "%sylius.security.admin_regex%"
-
+            $language: '@validator.expression_language'
+            $expression: "path matches '#%sylius.security.admin_regex%#'"
diff --git a/src/Resources/config/services/twig.yml b/src/Resources/config/services/twig.yml
@@ -1,14 +1,7 @@
 services:
-    bitbag_sylius_acl_plugin.templating.helper.acl:
-        class: BitBag\SyliusAclPlugin\Templating\Helper\AclHelper
-        arguments:
-            - "@bitbag_sylius_acl_plugin.resolver.admin_permission"
-        tags:
-            - { name: templating.helper, alias: bitbag_acl }
-
     bitbag_sylius_acl_plugin.twig.extension.acl:
         class: BitBag\SyliusAclPlugin\Twig\AclExtension
         arguments:
-            - "@bitbag_sylius_acl_plugin.templating.helper.acl"
+            - "@bitbag_sylius_acl_plugin.resolver.admin_permission"
         tags:
             - { name: twig.extension }
diff --git a/src/Resources/config/twig_hooks.yml b/src/Resources/config/twig_hooks.yml
@@ -0,0 +1,10 @@
+sylius_twig_hooks:
+    hooks:
+        'sylius_admin.admin_user.update.content.form.sections#left':
+            account:
+                template: '@SyliusAdmin/admin_user/form/sections/account.html.twig'
+                priority: 0
+            roles:
+                template: '@BitBagSyliusAclPlugin/Admin/roles.html.twig'
+                priority: -100
+#                enabled: false
diff --git a/src/Resources/views/Admin/roles.html.twig b/src/Resources/views/Admin/roles.html.twig
@@ -0,0 +1,15 @@
+{% set form =  hookable_metadata.context.form %}
+    <div class="card-header">
+        <div class="card-title">
+            {{ 'sylius.ui.roles'|trans }}
+        </div>
+    </div>
+    <div class="card-body">
+        <div class="mb-3 field">
+            {{ form_row(form.rolesResources) }}
+        </div>
+        <div class="mb-3 field">
+                {{ form_row(form.enablePermissionChecker) }}
+        </div>
+        </div>
+    </div>
diff --git a/src/Twig/AclExtension.php b/src/Twig/AclExtension.php
@@ -1,32 +1,75 @@
 <?php
 
-/*
- * This file has been created by developers from BitBag.
- * Feel free to contact us once you face any issues or want to start
- * You can find more information about us on https://bitbag.io and write us
- * an email on hello@bitbag.io.
- */
-
-declare(strict_types=1);
-
 namespace BitBag\SyliusAclPlugin\Twig;
 
-use BitBag\SyliusAclPlugin\Templating\Helper\AclHelper;
+use BitBag\SyliusAclPlugin\Resolver\AdminPermissionResolverInterface;
+use Sylius\Bundle\ResourceBundle\Grid\View\ResourceGridView;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 final class AclExtension extends AbstractExtension
 {
     public function __construct(
-        private AclHelper $aclHelper,
+        private AdminPermissionResolverInterface $adminPermissionResolver,
     ) {
     }
 
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('bitbag_acl_get_available_grid_actions', [$this->aclHelper, 'getAvailableGridActions']),
-            new TwigFunction('bitbag_acl_has_permission', [$this->aclHelper, 'hasPermission']),
+            new TwigFunction('bitbag_acl_get_available_grid_actions', [$this, 'getAvailableGridActions']),
+            new TwigFunction('bitbag_acl_has_permission', [$this, 'hasPermission']),
         ];
     }
+
+    public function getAvailableGridActions(
+        ResourceGridView $resourceGridView,
+        array $actions,
+        bool $bulkAction = false,
+    ): array {
+        $requestConfiguration = $resourceGridView->getRequestConfiguration();
+
+        foreach ($actions as $key => &$action) {
+            if ('links' !== $action->getType()) {
+                if (!isset($action->getOptions()['link']['route'])) {
+                    $name = $bulkAction ? 'bulk_' . $action->getType() : $action->getType();
+                    $permission = $requestConfiguration->getRouteName($name);
+                } else {
+                    $permission = $action->getOptions()['link']['route'];
+                }
+
+                if (!$this->adminPermissionResolver->resolvePermission($permission)) {
+                    unset($actions[$key]);
+                }
+
+                continue;
+            }
+
+            $options = $action->getOptions();
+
+            foreach ($options['links'] as $name => $link) {
+                if (!isset($link['route'])) {
+                    continue;
+                }
+
+                if (!$this->adminPermissionResolver->resolvePermission($link['route'])) {
+                    unset($options['links'][$name]);
+                }
+            }
+
+            $action->setOptions($options);
+
+            if (0 === count($options['links'])) {
+                unset($actions[$key]);
+            }
+        }
+
+        return $actions;
+    }
+
+    public function hasPermission(string $permission): bool
+    {
+        return $this->adminPermissionResolver->resolvePermission($permission);
+    }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function isOptional(): bool`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function warmUp(string $cacheDir): array`
	`30`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`31`	`31`	`{`
`32`	`32`	`$this->filesystemCache->deleteItems(PrivilegeInterface::CACHE_CLEARER_KEYS);`
`33`	`33`