Merge branch '2.x' into develop

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 /phpunit.xml
 .phpunit.result.cache
+.idea

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/envoy/compare/v2.8.6...2.x)
+## [Unreleased](https://github.com/laravel/envoy/compare/v2.8.7...2.x)
+
+## [v2.8.7](https://github.com/laravel/envoy/compare/v2.8.6...v2.8.7) - 2024-01-09
+
+* [2.x] Compile `[@servers](https://github.com/servers)` When Array is in Multiple Lines by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/envoy/pull/270
+* [2.x] Bugfix: Allowing `[@setup](https://github.com/setup)` Variables into `[@servers](https://github.com/servers)` by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/envoy/pull/272
 
 ## [v2.8.6](https://github.com/laravel/envoy/compare/v2.8.5...v2.8.6) - 2023-01-10
 

bin/envoy

@@ -7,7 +7,7 @@ if (file_exists(__DIR__.'/../vendor/autoload.php')) {
     require __DIR__.'/../../../autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('Laravel Envoy', '2.8.6');
+$app = new Symfony\Component\Console\Application('Laravel Envoy', '2.8.7');
 
 $app->add(new Laravel\Envoy\Console\RunCommand);
 $app->add(new Laravel\Envoy\Console\SshCommand);

src/Compiler.php

@@ -271,6 +271,10 @@ public function compileInclude($value)
      */
     protected function compileServers($value)
     {
+        $value = preg_replace_callback('/@servers\(\[(.*?)\]\)/s', function ($matches) {
+            return '@servers(['.trim(preg_replace('/\s+/', ' ', $matches[1])).'])';
+        }, $value);
+
         $pattern = $this->createMatcher('servers');
 
         return preg_replace($pattern, '$1<?php $__container->servers$2; ?>', $value);

tests/CompilerTest.php

@@ -32,4 +32,69 @@ public function test_compile_before_statement()
 
         $this->assertSame(1, preg_match('/\$__container->before\(.*?\}\);/s', $result, $matches));
     }
+
+    public function test_it_compiles_server_statement()
+    {
+        $str = <<<'EOL'
+@servers([
+    'foo' => 'bar'
+])
+EOL;
+        $compiler = new Compiler();
+        $result = $compiler->compile($str);
+
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => 'bar']); ?>");
+
+        $str = <<<'EOL'
+@servers([
+    'foo' => [
+        'bar',
+        'baz',
+        'bah'
+    ]
+])
+EOL;
+        $compiler = new Compiler();
+        $result = $compiler->compile($str);
+
+        $this->assertSame($result, "<?php \$__container->servers(['foo' => [ 'bar', 'baz', 'bah' ]]); ?>");
+
+        $str = <<<'EOL'
+@servers([
+    'foo' => ['bar'],
+    'bar' => ['baz']
+])
+EOL;
+        $compiler = new Compiler();
+        $result = $compiler->compile($str);
+
+        $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']); ?>");
+    }
+
+    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);
+    }
 }