Refactor #1

hadefication · hadefication · commit 2be86469ee81 · 2023-05-18T13:02:37.000+08:00
diff --git a/devstack b/devstack
@@ -8,16 +8,16 @@ if (file_exists($autoload = __DIR__ . '/vendor/autoload.php')) {
 }
 
 use Webteractive\Devstack\App;
+use Webteractive\Devstack\Commands\MySql;
+use Webteractive\Devstack\Commands\Redis;
+use Webteractive\Devstack\Commands\Shell;
 use Webteractive\Devstack\Commands\Config;
 use Webteractive\Devstack\Commands\InitStack;
-use Webteractive\Devstack\RegisterDockerComposeCommands;
+use Webteractive\Devstack\Commands\RunPHPCommand;
 use Webteractive\Devstack\Commands\DownloadRuntimes;
-use Webteractive\Devstack\Commands\MySql;
-use Webteractive\Devstack\Commands\Redis;
 use Webteractive\Devstack\Commands\RunComposerCommands;
+use Webteractive\Devstack\RegisterDockerComposeCommands;
 use Webteractive\Devstack\Commands\RunLaravelArtisanCommand;
-use Webteractive\Devstack\Commands\RunPHPCommand;
-use Webteractive\Devstack\Commands\Shell;
 
 $app = new App('Devstack', '1.0.0');
 
diff --git a/src/CommandSignature.php b/src/CommandSignature.php
@@ -4,8 +4,8 @@
 
 use Illuminate\Support\Str;
 use InvalidArgumentException;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
 
 class CommandSignature
 {
diff --git a/src/Commands/Base.php b/src/Commands/Base.php
@@ -2,12 +2,11 @@
 
 namespace Webteractive\Devstack\Commands;
 
-use Dotenv\Dotenv;
+use Webteractive\Devstack\CommandSignature;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\Question;
-use Webteractive\Devstack\CommandSignature;
 
 abstract class Base extends Command
 {
diff --git a/src/Commands/Config.php b/src/Commands/Config.php
@@ -2,13 +2,7 @@
 
 namespace Webteractive\Devstack\Commands;
 
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Webteractive\Devstack\ShouldConfigure;
-use Webteractive\Devstack\WithStorage;
 
 class Config extends Base
 {
diff --git a/src/Commands/DownloadRuntimes.php b/src/Commands/DownloadRuntimes.php
@@ -2,8 +2,8 @@
 
 namespace Webteractive\Devstack\Commands;
 
-use Webteractive\Devstack\RuntimeDownloader;
 use Webteractive\Devstack\ShouldConfigure;
+use Webteractive\Devstack\RuntimeDownloader;
 
 class DownloadRuntimes extends Base
 {
diff --git a/src/Commands/InitStack.php b/src/Commands/InitStack.php
@@ -2,10 +2,10 @@
 
 namespace Webteractive\Devstack\Commands;
 
-use Webteractive\Devstack\RuntimeDownloader;
 use Webteractive\Devstack\File;
-use Webteractive\Devstack\PublicRuntimeDownloader;
 use Webteractive\Devstack\ShouldConfigure;
+use Webteractive\Devstack\RuntimeDownloader;
+use Webteractive\Devstack\PublicRuntimeDownloader;
 
 class InitStack extends Base
 {
diff --git a/src/Commands/MySql.php b/src/Commands/MySql.php
@@ -2,12 +2,9 @@
 
 namespace Webteractive\Devstack\Commands;
 
-use Dotenv\Dotenv;
 use Webteractive\Devstack\Env;
 use Webteractive\Devstack\Process;
-use Webteractive\Devstack\WithEnv;
 use Webteractive\Devstack\WithSignalHandlers;
-use Webteractive\Devstack\WithStorage;
 
 class MySql extends Base
 {
diff --git a/src/Fs.php b/src/Fs.php
@@ -2,7 +2,6 @@
 
 namespace Webteractive\Devstack;
 
-use League\Flysystem\DirectoryListing;
 use League\Flysystem\Filesystem;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 
diff --git a/src/Helpers.php b/src/Helpers.php

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Support\Str;`
`6`	`6`	`use InvalidArgumentException;`
`7`		`-use Symfony\Component\Console\Input\InputArgument;`
`8`	`7`	`use Symfony\Component\Console\Input\InputOption;`
	`8`	`+use Symfony\Component\Console\Input\InputArgument;`
`9`	`9`
`10`	`10`	`class CommandSignature`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Webteractive\Devstack\Commands;`
`4`	`4`
`5`		`-use Webteractive\Devstack\RuntimeDownloader;`
`6`	`5`	`use Webteractive\Devstack\ShouldConfigure;`
	`6`	`+use Webteractive\Devstack\RuntimeDownloader;`
`7`	`7`
`8`	`8`	`class DownloadRuntimes extends Base`
`9`	`9`	`{`