Small refactor

Author: pascalbaljet

app/tests/Unit/BladeDirectivesTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Unit;
+
+use ProtoneMedia\Splade\Http\BladeDirectives;
+use Tests\TestCase;
+
+class BladeDirectivesTest extends TestCase
+{
+    /** @test */
+    public function it_parses_the_expression_into_a_name_and_function()
+    {
+        [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression("'action', \$user");
+
+        $this->assertEquals('action', $name);
+        $this->assertEquals('function ($user) use ($__env)', $function);
+    }
+
+    /** @test */
+    public function it_parses_the_expression_into_a_name_and_function_and_you_can_use_the_key()
+    {
+        [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression("'action', \$user, \$key");
+
+        $this->assertEquals('action', $name);
+        $this->assertEquals('function ($user, $key) use ($__env)', $function);
+    }
+
+    /** @test */
+    public function it_parses_the_expression_into_a_name_and_function_and_use_a_variable_from_outside_the_scope()
+    {
+        [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression("'action', [\$user], \$account");
+
+        $this->assertEquals('action', $name);
+        $this->assertEquals('function ($user) use ($__env, $account)', $function);
+
+        [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression("'action', [\$user], [\$account]");
+
+        $this->assertEquals('action', $name);
+        $this->assertEquals('function ($user) use ($__env, $account)', $function);
+
+        [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression("'action', [\$user], [\$account, \$page]");
+
+        $this->assertEquals('action', $name);
+        $this->assertEquals('function ($user) use ($__env, $account, $page)', $function);
+    }
+}

src/Http/BladeDirectives.php

@@ -30,27 +30,33 @@ public function spladeHead()
         return '{{ app(\'laravel-splade-seo\')->renderHead() }}';
     }
 
-    public function registerTableCellDirective()
+    public static function parseTableCellDirectiveExpression($expression): array
     {
-        $cellDirectiveName = config('splade.blade.table_cell_directive');
+        preg_match("/('|\")(\w+)('|\")(,)(\s*)(.*)/", $expression, $matches);
 
-        Blade::directive($cellDirectiveName, function ($expression) {
-            preg_match("/('|\")(\w+)('|\")(,)(\s*)(.*)/", $expression, $matches);
+        $name = trim($matches[2]);
+
+        $arguments = trim($matches[6], '\[\]');
+
+        $splitted = preg_split('/\],(\s*)/', $arguments);
 
-            $name = trim($matches[2]);
+        $slotArguments = trim($splitted[0] ?? '');
+        $slotUses      = trim(ltrim($splitted[1] ?? '', '['));
 
-            $arguments = trim($matches[6], '\[\]');
+        $slotUses = $slotUses ? "\$__env, {$slotUses}" : "\$__env";
 
-            $splitted = preg_split('/\],(\s*)/', $arguments);
+        $function = "function ({$slotArguments})";
+        $function .= " use ({$slotUses})";
 
-            $slotArguments = trim($splitted[0] ?? '');
-            $slotUses      = trim(ltrim($splitted[1] ?? '', '['));
+        return [$name, $function];
+    }
 
-            $function = "function ({$slotArguments})";
+    public function registerTableCellDirective()
+    {
+        $cellDirectiveName = config('splade.blade.table_cell_directive');
 
-            if ($slotUses) {
-                $function .= " use ({$slotUses})";
-            }
+        Blade::directive($cellDirectiveName, function ($expression) {
+            [$name, $function] = BladeDirectives::parseTableCellDirectiveExpression($expression);
 
             return "<?php \$__env->slot('spladeTableCell{$name}', {$function} { ?>";
         });