Merge pull request #11 from reallyli/upgrade-support-laravel6.x

Support Laravel6.x
reallyli · Nov 7, 2019 · 841d257 · 841d257
2 parents f382dad + 29f7d2f
commit 841d257
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
  "php": "^7.1.3",
  "deployer/deployer": "^6.1",
  "deployer/recipes": "^6.0",
- "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*"
+ "illuminate/support": "^5.5"
  },
  "require-dev": {
  "orchestra/testbench": "^3.5",

diff --git a/src/LaravelDeployer/Commands/BaseCommand.php b/src/LaravelDeployer/Commands/BaseCommand.php
@@ -3,12 +3,12 @@
 namespace Reallyli\LaravelDeployer\Commands;
 
 use Illuminate\Console\Command;
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Process\Process;
-use Reallyli\LaravelDeployer\ConfigFile;
 use Reallyli\LaravelDeployer\Concerns\DeployBuilder;
-use Reallyli\LaravelDeployer\LaravelDeployerException;
 use Reallyli\LaravelDeployer\Concerns\ParsesCliParameters;
+use Reallyli\LaravelDeployer\ConfigFile;
+use Reallyli\LaravelDeployer\LaravelDeployerException;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Yaml\Yaml;
 
 class BaseCommand extends Command
 {

diff --git a/src/LaravelDeployer/ConfigFile.php b/src/LaravelDeployer/ConfigFile.php
@@ -2,11 +2,11 @@
 
 namespace Reallyli\LaravelDeployer;
 
-use Symfony\Component\Yaml\Yaml;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\Support\Arrayable;
-use Reallyli\LaravelDeployer\Concerns\RendersCode;
+use Illuminate\Filesystem\Filesystem;
 use Reallyli\LaravelDeployer\Concerns\DeployBuilder;
+use Reallyli\LaravelDeployer\Concerns\RendersCode;
+use Symfony\Component\Yaml\Yaml;
 
 class ConfigFile implements Arrayable
 {

diff --git a/src/LaravelDeployer/DeployFile.php b/src/LaravelDeployer/DeployFile.php
@@ -3,8 +3,8 @@
 namespace Reallyli\LaravelDeployer;
 
 use Illuminate\Filesystem\Filesystem;
-use Reallyli\LaravelDeployer\Concerns\RendersCode;
 use Reallyli\LaravelDeployer\Concerns\DeployBuilder;
+use Reallyli\LaravelDeployer\Concerns\RendersCode;
 
 class DeployFile
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,10 +8,10 @@
 
 namespace Reallyli\LaravelDeployer\Tests;
 
-use Symfony\Component\Yaml\Yaml;
 use Illuminate\Filesystem\Filesystem;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Reallyli\LaravelDeployer\Concerns\DeployBuilder;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class TestCase.

diff --git a/tests/YamlParseTest.php b/tests/YamlParseTest.php
@@ -2,9 +2,9 @@
 
 namespace Reallyli\LaravelDeployer\Tests;
 
-use Symfony\Component\Yaml\Yaml;
 use Illuminate\Filesystem\Filesystem;
 use Reallyli\LaravelDeployer\ConfigFile;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class YamlParseTest.