diff --git a/composer.json b/composer.json index f66bb27..434123a 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,9 @@ "deployment" ], "support": { + "email": "info@fortrabbit.com", "docs": "https://github.com/fortrabbit/craft-copy/blob/master/README.md", + "source": "https://github.com/fortrabbit/craft-copy", "issues": "https://github.com/fortrabbit/craft-copy/issues" }, "license": "MIT", @@ -24,13 +26,13 @@ "php": "^8.0.2", "albertofem/rsync-lib": "^1.0.0", "composer/composer": "^2.7", - "craftcms/cms": "^5.0.0", + "craftcms/cms": "^4.6 | ^5.0", "craftcms/plugin-installer": "^1.5.6", "fortrabbit/craft-auto-migrate": "^2.5.0", "gitonomy/gitlib": "^1.3", - "ostark/yii2-artisan-bridge": "^1.4.0", + "fortrabbit/yii2-artisan-bridge": "^1.5.1", "symfony/process": "^5.0 | ^6.0", - "symfony/yaml": "^4.2 | ^5.0", + "symfony/yaml": "^4.2 | ^5.0 | ^6.0", "vlucas/phpdotenv": "^3.4.0 | ^5.4" }, "require-dev": { @@ -56,7 +58,6 @@ "bin/craft-copy-import-db.php", "bin/craft-copy-env.php" ], - "config": { "allow-plugins": { "yiisoft/yii2-composer": true, diff --git a/phpstan.neon b/phpstan.neon index 59557d2..b24b348 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -11,4 +11,4 @@ parameters: ignoreErrors: - '#Constant CRAFT_BASE_PATH not found#' - - '#Call to an undefined method ostark\\Yii2ArtisanBridge\\ConsoleOutput::setInteractive\(\).#' + - '#Call to an undefined method fortrabbit\\Yii2ArtisanBridge\\ConsoleOutput::setInteractive\(\).#' diff --git a/src/Actions/CodeUpAction.php b/src/Actions/CodeUpAction.php index 2a11965..27940f7 100644 --- a/src/Actions/CodeUpAction.php +++ b/src/Actions/CodeUpAction.php @@ -5,14 +5,12 @@ namespace fortrabbit\Copy\Actions; use Composer\Factory; -use Craft; use craft\helpers\App; use craft\helpers\FileHelper; use Exception; -use fortrabbit\Copy\Exceptions\GitException; use fortrabbit\Copy\Services\Git; use fortrabbit\Copy\Services\LocalFilesystem; -use ostark\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\base\Commands; use Throwable; use yii\console\ExitCode; diff --git a/src/Actions/DbExportAction.php b/src/Actions/DbExportAction.php index 9e18655..922b6c5 100644 --- a/src/Actions/DbExportAction.php +++ b/src/Actions/DbExportAction.php @@ -4,11 +4,10 @@ namespace fortrabbit\Copy\Actions; -use Craft; use craft\errors\ShellCommandException; use fortrabbit\Copy\Helpers\MysqlConfigFile; use fortrabbit\Copy\Plugin; -use ostark\Yii2ArtisanBridge\base\Action; +use fortrabbit\Yii2ArtisanBridge\base\Action; use yii\base\Exception; use yii\console\ExitCode; diff --git a/src/Actions/DbImportAction.php b/src/Actions/DbImportAction.php index 857fa50..7def867 100644 --- a/src/Actions/DbImportAction.php +++ b/src/Actions/DbImportAction.php @@ -8,7 +8,7 @@ use craft\helpers\FileHelper; use fortrabbit\Copy\Helpers\MysqlConfigFile; use fortrabbit\Copy\Plugin; -use ostark\Yii2ArtisanBridge\base\Action; +use fortrabbit\Yii2ArtisanBridge\base\Action; use yii\base\Exception; use yii\console\ExitCode; diff --git a/src/Actions/NitroDebugAction.php b/src/Actions/NitroDebugAction.php index bc4c838..a16aa77 100644 --- a/src/Actions/NitroDebugAction.php +++ b/src/Actions/NitroDebugAction.php @@ -4,12 +4,9 @@ namespace fortrabbit\Copy\Actions; -use Craft; use fortrabbit\Copy\Exceptions\RemoteException; use fortrabbit\Copy\Helpers\ConsoleOutputHelper; use fortrabbit\Copy\Plugin; -use ostark\Yii2ArtisanBridge\base\Action; -use Symfony\Component\Process\Process; use yii\console\ExitCode; class NitroDebugAction extends StageAwareBaseAction diff --git a/src/Actions/NitroSetupAction.php b/src/Actions/NitroSetupAction.php index 4ccae52..03fa5ec 100644 --- a/src/Actions/NitroSetupAction.php +++ b/src/Actions/NitroSetupAction.php @@ -6,7 +6,7 @@ use Craft; use fortrabbit\Copy\Helpers\ConsoleOutputHelper; -use ostark\Yii2ArtisanBridge\base\Action; +use fortrabbit\Yii2ArtisanBridge\base\Action; use yii\console\ExitCode; class NitroSetupAction extends Action diff --git a/src/Actions/SetupAction.php b/src/Actions/SetupAction.php index dd5e7ed..640d6fe 100644 --- a/src/Actions/SetupAction.php +++ b/src/Actions/SetupAction.php @@ -9,7 +9,7 @@ use fortrabbit\Copy\Helpers\PathHelper; use fortrabbit\Copy\Models\StageConfig; use fortrabbit\Copy\Plugin; -use ostark\Yii2ArtisanBridge\base\Action; +use fortrabbit\Yii2ArtisanBridge\base\Action; use Symfony\Component\Process\Process; use yii\console\ExitCode; use yii\helpers\Inflector; diff --git a/src/Actions/StageAwareBaseAction.php b/src/Actions/StageAwareBaseAction.php index fe99112..ad7794e 100644 --- a/src/Actions/StageAwareBaseAction.php +++ b/src/Actions/StageAwareBaseAction.php @@ -9,8 +9,8 @@ use fortrabbit\Copy\Models\StageConfig; use fortrabbit\Copy\Plugin; use InvalidArgumentException; -use ostark\Yii2ArtisanBridge\base\Action; -use ostark\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\base\Action; +use fortrabbit\Yii2ArtisanBridge\base\Commands; use ReflectionClass; use Yii; use yii\base\ActionEvent; diff --git a/src/Actions/VolumesDownAction.php b/src/Actions/VolumesDownAction.php index 3f1c582..1feca56 100644 --- a/src/Actions/VolumesDownAction.php +++ b/src/Actions/VolumesDownAction.php @@ -8,7 +8,7 @@ use fortrabbit\Copy\Helpers\ConsoleOutputHelper; use fortrabbit\Copy\Helpers\PathHelper; use fortrabbit\Copy\Services\LocalFilesystem; -use ostark\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\base\Commands; use yii\console\ExitCode; class VolumesDownAction extends StageAwareBaseAction diff --git a/src/Actions/VolumesUpAction.php b/src/Actions/VolumesUpAction.php index 7d0abe0..ae02cf3 100644 --- a/src/Actions/VolumesUpAction.php +++ b/src/Actions/VolumesUpAction.php @@ -8,7 +8,7 @@ use fortrabbit\Copy\Helpers\ConsoleOutputHelper; use fortrabbit\Copy\Helpers\PathHelper; use fortrabbit\Copy\Services\LocalFilesystem; -use ostark\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\base\Commands; use yii\console\ExitCode; class VolumesUpAction extends StageAwareBaseAction diff --git a/src/EventHandlers/CommandOutputFormatHandler.php b/src/EventHandlers/CommandOutputFormatHandler.php index 2d1f0a5..2b60cba 100644 --- a/src/EventHandlers/CommandOutputFormatHandler.php +++ b/src/EventHandlers/CommandOutputFormatHandler.php @@ -14,7 +14,7 @@ class CommandOutputFormatHandler { public function __invoke(ActionEvent $event): void { - /** @var \ostark\Yii2ArtisanBridge\base\Action $action */ + /** @var \fortrabbit\Yii2ArtisanBridge\base\Action $action */ $action = $event->action; $style = new OutputFormatterStyle('blue'); diff --git a/src/Helpers/ArtisanStyleCommands.php b/src/Helpers/ArtisanStyleCommands.php index 3be92e0..77553a1 100644 --- a/src/Helpers/ArtisanStyleCommands.php +++ b/src/Helpers/ArtisanStyleCommands.php @@ -4,7 +4,7 @@ namespace fortrabbit\Copy\Helpers; -use ostark\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\base\Commands; /** * Class ArtisanStyleCommands diff --git a/src/Helpers/ConsoleOutputHelper.php b/src/Helpers/ConsoleOutputHelper.php index 64c1d6b..68ed443 100644 --- a/src/Helpers/ConsoleOutputHelper.php +++ b/src/Helpers/ConsoleOutputHelper.php @@ -4,7 +4,7 @@ namespace fortrabbit\Copy\Helpers; -use ostark\Yii2ArtisanBridge\OutputStyle; +use fortrabbit\Yii2ArtisanBridge\OutputStyle; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Helper\TableSeparator; diff --git a/src/Plugin.php b/src/Plugin.php index d96575a..1573817 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -17,7 +17,6 @@ use fortrabbit\Copy\Actions\DbUpAction; use fortrabbit\Copy\Actions\FolderDownAction; use fortrabbit\Copy\Actions\FolderUpAction; -use fortrabbit\Copy\Actions\InfoAction; use fortrabbit\Copy\Actions\NitroSetupAction; use fortrabbit\Copy\Actions\NitroDebugAction; use fortrabbit\Copy\Actions\SetupAction; @@ -30,9 +29,9 @@ use fortrabbit\Copy\Services\Rsync as RsyncService; use fortrabbit\Copy\Services\Ssh as SshService; use fortrabbit\Copy\Services\StageConfigAccess; -use ostark\Yii2ArtisanBridge\ActionGroup; -use ostark\Yii2ArtisanBridge\base\Commands; -use ostark\Yii2ArtisanBridge\Bridge; +use fortrabbit\Yii2ArtisanBridge\ActionGroup; +use fortrabbit\Yii2ArtisanBridge\base\Commands; +use fortrabbit\Yii2ArtisanBridge\Bridge; use yii\base\Event; use yii\console\Application as ConsoleApplication;