fix(directive): Fix condition when passing multiple roles to @role (#…

…98)
Log1x · Jul 30, 2023 · 5ecc337 · 5ecc337
2 parents adf2dde + 0f4120b
commit 5ecc337
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Directives/WordPress.php b/src/Directives/WordPress.php
@@ -3,6 +3,7 @@
 namespace Log1x\SageDirectives\Directives;
 
 use Log1x\SageDirectives\Util;
+use Illuminate\Support\Str;
 
 return [
 
@@ -482,12 +483,14 @@
         $condition = [];
 
         foreach ($expression as $value) {
-            $condition[] = "&& in_array(strtolower({$value}), (array) wp_get_current_user()->roles)";
+            $condition[] = "in_array(strtolower({$value}), (array) wp_get_current_user()->roles) ||";
         }
 
         $conditions = implode(' ', $condition);
 
-        return "<?php if (is_user_logged_in() {$conditions}) : ?>"; // phpcs:ignore
+        $conditions = Str::beforeLast($conditions, ' ||');
+
+        return "<?php if (is_user_logged_in() && ({$conditions})) : ?>";
     },
 
     'endrole' => function () {

diff --git a/tests/Unit/WordPressTest.php b/tests/Unit/WordPressTest.php
@@ -594,15 +594,15 @@
 
         $compiled = $this->compile($directive);
 
-        expect($compiled)->toBe("<?php if (is_user_logged_in() && in_array(strtolower('editor'), (array) wp_get_current_user()->roles)) : ?>");
+        expect($compiled)->toBe("<?php if (is_user_logged_in() && (in_array(strtolower('editor'), (array) wp_get_current_user()->roles))) : ?>");
     });
 
     it('compiles correctly with multiple roles', function () {
         $directive = "@role('editor', 'author', 'contributor')";
 
         $compiled = $this->compile($directive);
 
-        expect($compiled)->toBe("<?php if (is_user_logged_in() && in_array(strtolower('editor'), (array) wp_get_current_user()->roles) && in_array(strtolower('author'), (array) wp_get_current_user()->roles) && in_array(strtolower('contributor'), (array) wp_get_current_user()->roles)) : ?>");
+        expect($compiled)->toBe("<?php if (is_user_logged_in() && (in_array(strtolower('editor'), (array) wp_get_current_user()->roles) || in_array(strtolower('author'), (array) wp_get_current_user()->roles) || in_array(strtolower('contributor'), (array) wp_get_current_user()->roles))) : ?>");
     });
 });