[2.x] Bugfix: Allowing @setup Variables into @servers (#272)

* code & test * changing assert of new test * using Str instead of str helper * fixing tests * remove the usage of Str
laravel · Jan 6, 2024 · 95c6cf2 · 95c6cf2
1 parent e64f6fb
commit 95c6cf2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -272,7 +272,7 @@ public function compileInclude($value)
     protected function compileServers($value)
     {
         $value = preg_replace_callback('/@servers\(\[(.*?)\]\)/s', function ($matches) {
-            return '@servers(['.preg_replace('/\s+/', '', $matches[1]).'])';
+            return '@servers(['.trim(preg_replace('/\s+/', ' ', $matches[1])).'])';
         }, $value);
 
         $pattern = $this->createMatcher('servers');

diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -43,7 +43,7 @@ public function test_it_compiles_server_statement()
         $compiler = new Compiler();
         $result = $compiler->compile($str);
 
-        $this->assertSame($result, "<?php \$__container->servers(['foo'=>'bar']); ?>");
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => 'bar']); ?>");
 
         $str = <<<'EOL'
 @servers([
@@ -57,7 +57,7 @@ public function test_it_compiles_server_statement()
         $compiler = new Compiler();
         $result = $compiler->compile($str);
 
-        $this->assertSame($result, "<?php \$__container->servers(['foo'=>['bar','baz','bah']]); ?>");
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => [ 'bar', 'baz', 'bah' ]]); ?>");
 
         $str = <<<'EOL'
 @servers([
@@ -68,14 +68,33 @@ public function test_it_compiles_server_statement()
         $compiler = new Compiler();
         $result = $compiler->compile($str);
 
-        $this->assertSame($result, "<?php \$__container->servers(['foo'=>['bar'],'bar'=>['baz']]); ?>");
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => ['bar'], 'bar' => ['baz']]); ?>");
 
         $str = <<<'EOL'
 @servers(['foo' => 'bar'])
 EOL;
         $compiler = new Compiler();
         $result = $compiler->compile($str);
 
-        $this->assertSame($result, "<?php \$__container->servers(['foo'=>'bar']); ?>");
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => 'bar']); ?>");
+    }
+
+    public function test_it_compiles_server_statement_with_setup()
+    {
+        $str = <<<'EOL'
+@setup
+    $user = 'foo';
+    $server = 'bar';
+    $port = 22;
+@endsetup
+
+@servers([
+    'foo' => "{$user}@{$server} -p {$port}"
+])
+EOL;
+        $compiler = new Compiler();
+        $result = $compiler->compile($str);
+
+        $this->assertStringContainsString('{$user}@{$server} -p {$port}', $result);
     }
 }