diff --git a/composer.json b/composer.json index ad32d89..1042957 100644 --- a/composer.json +++ b/composer.json @@ -27,11 +27,13 @@ }, "autoload": { "psr-4": { - "Mage\\": "src/Mage/" - }, - "exclude-from-classmap": [ - "**/Tests/" - ] + "Mage\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Mage\\Tests\\": "tests/" + } }, "bin": ["bin/mage"], "extra": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5174ac2..0635ab2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,7 +15,7 @@ - ./src/Mage/Tests/ + ./tests/ @@ -30,7 +30,7 @@ ./src/Mage/ - ./src/Mage/Tests/ + ./tests/ diff --git a/src/Mage/Command/AbstractCommand.php b/src/Command/AbstractCommand.php similarity index 100% rename from src/Mage/Command/AbstractCommand.php rename to src/Command/AbstractCommand.php diff --git a/src/Mage/Command/BuiltIn/Config/DumpCommand.php b/src/Command/BuiltIn/Config/DumpCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/Config/DumpCommand.php rename to src/Command/BuiltIn/Config/DumpCommand.php diff --git a/src/Mage/Command/BuiltIn/Config/EnvironmentsCommand.php b/src/Command/BuiltIn/Config/EnvironmentsCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/Config/EnvironmentsCommand.php rename to src/Command/BuiltIn/Config/EnvironmentsCommand.php diff --git a/src/Mage/Command/BuiltIn/DeployCommand.php b/src/Command/BuiltIn/DeployCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/DeployCommand.php rename to src/Command/BuiltIn/DeployCommand.php diff --git a/src/Mage/Command/BuiltIn/Releases/ListCommand.php b/src/Command/BuiltIn/Releases/ListCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/Releases/ListCommand.php rename to src/Command/BuiltIn/Releases/ListCommand.php diff --git a/src/Mage/Command/BuiltIn/Releases/RollbackCommand.php b/src/Command/BuiltIn/Releases/RollbackCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/Releases/RollbackCommand.php rename to src/Command/BuiltIn/Releases/RollbackCommand.php diff --git a/src/Mage/Command/BuiltIn/VersionCommand.php b/src/Command/BuiltIn/VersionCommand.php similarity index 100% rename from src/Mage/Command/BuiltIn/VersionCommand.php rename to src/Command/BuiltIn/VersionCommand.php diff --git a/src/Mage/Mage.php b/src/Mage.php similarity index 100% rename from src/Mage/Mage.php rename to src/Mage.php diff --git a/src/Mage/MageApplication.php b/src/MageApplication.php similarity index 100% rename from src/Mage/MageApplication.php rename to src/MageApplication.php diff --git a/src/Mage/Runtime/Exception/RuntimeException.php b/src/Runtime/Exception/RuntimeException.php similarity index 100% rename from src/Mage/Runtime/Exception/RuntimeException.php rename to src/Runtime/Exception/RuntimeException.php diff --git a/src/Mage/Runtime/Runtime.php b/src/Runtime/Runtime.php similarity index 100% rename from src/Mage/Runtime/Runtime.php rename to src/Runtime/Runtime.php diff --git a/src/Mage/Task/AbstractTask.php b/src/Task/AbstractTask.php similarity index 100% rename from src/Mage/Task/AbstractTask.php rename to src/Task/AbstractTask.php diff --git a/src/Mage/Task/BuiltIn/Composer/DumpAutoloadTask.php b/src/Task/BuiltIn/Composer/DumpAutoloadTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Composer/DumpAutoloadTask.php rename to src/Task/BuiltIn/Composer/DumpAutoloadTask.php diff --git a/src/Mage/Task/BuiltIn/Composer/InstallTask.php b/src/Task/BuiltIn/Composer/InstallTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Composer/InstallTask.php rename to src/Task/BuiltIn/Composer/InstallTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/Release/CleanupTask.php b/src/Task/BuiltIn/Deploy/Release/CleanupTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/Release/CleanupTask.php rename to src/Task/BuiltIn/Deploy/Release/CleanupTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/Release/PrepareTask.php b/src/Task/BuiltIn/Deploy/Release/PrepareTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/Release/PrepareTask.php rename to src/Task/BuiltIn/Deploy/Release/PrepareTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/ReleaseTask.php b/src/Task/BuiltIn/Deploy/ReleaseTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/ReleaseTask.php rename to src/Task/BuiltIn/Deploy/ReleaseTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/RsyncTask.php b/src/Task/BuiltIn/Deploy/RsyncTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/RsyncTask.php rename to src/Task/BuiltIn/Deploy/RsyncTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/TarGz/CleanupTask.php b/src/Task/BuiltIn/Deploy/TarGz/CleanupTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/TarGz/CleanupTask.php rename to src/Task/BuiltIn/Deploy/TarGz/CleanupTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/TarGz/CopyTask.php b/src/Task/BuiltIn/Deploy/TarGz/CopyTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/TarGz/CopyTask.php rename to src/Task/BuiltIn/Deploy/TarGz/CopyTask.php diff --git a/src/Mage/Task/BuiltIn/Deploy/TarGz/PrepareTask.php b/src/Task/BuiltIn/Deploy/TarGz/PrepareTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Deploy/TarGz/PrepareTask.php rename to src/Task/BuiltIn/Deploy/TarGz/PrepareTask.php diff --git a/src/Mage/Task/BuiltIn/FS/AbstractFileTask.php b/src/Task/BuiltIn/FS/AbstractFileTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/FS/AbstractFileTask.php rename to src/Task/BuiltIn/FS/AbstractFileTask.php diff --git a/src/Mage/Task/BuiltIn/FS/CopyTask.php b/src/Task/BuiltIn/FS/CopyTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/FS/CopyTask.php rename to src/Task/BuiltIn/FS/CopyTask.php diff --git a/src/Mage/Task/BuiltIn/FS/LinkTask.php b/src/Task/BuiltIn/FS/LinkTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/FS/LinkTask.php rename to src/Task/BuiltIn/FS/LinkTask.php diff --git a/src/Mage/Task/BuiltIn/FS/MoveTask.php b/src/Task/BuiltIn/FS/MoveTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/FS/MoveTask.php rename to src/Task/BuiltIn/FS/MoveTask.php diff --git a/src/Mage/Task/BuiltIn/FS/RemoveTask.php b/src/Task/BuiltIn/FS/RemoveTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/FS/RemoveTask.php rename to src/Task/BuiltIn/FS/RemoveTask.php diff --git a/src/Mage/Task/BuiltIn/Git/ChangeBranchTask.php b/src/Task/BuiltIn/Git/ChangeBranchTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Git/ChangeBranchTask.php rename to src/Task/BuiltIn/Git/ChangeBranchTask.php diff --git a/src/Mage/Task/BuiltIn/Git/UpdateTask.php b/src/Task/BuiltIn/Git/UpdateTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Git/UpdateTask.php rename to src/Task/BuiltIn/Git/UpdateTask.php diff --git a/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php b/src/Task/BuiltIn/Symfony/AsseticDumpTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php rename to src/Task/BuiltIn/Symfony/AsseticDumpTask.php diff --git a/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php b/src/Task/BuiltIn/Symfony/AssetsInstallTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php rename to src/Task/BuiltIn/Symfony/AssetsInstallTask.php diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php b/src/Task/BuiltIn/Symfony/CacheClearTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php rename to src/Task/BuiltIn/Symfony/CacheClearTask.php diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php b/src/Task/BuiltIn/Symfony/CacheWarmupTask.php similarity index 100% rename from src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php rename to src/Task/BuiltIn/Symfony/CacheWarmupTask.php diff --git a/src/Mage/Task/Exception/ErrorException.php b/src/Task/Exception/ErrorException.php similarity index 100% rename from src/Mage/Task/Exception/ErrorException.php rename to src/Task/Exception/ErrorException.php diff --git a/src/Mage/Task/Exception/SkipException.php b/src/Task/Exception/SkipException.php similarity index 100% rename from src/Mage/Task/Exception/SkipException.php rename to src/Task/Exception/SkipException.php diff --git a/src/Mage/Task/ExecuteOnRollbackInterface.php b/src/Task/ExecuteOnRollbackInterface.php similarity index 100% rename from src/Mage/Task/ExecuteOnRollbackInterface.php rename to src/Task/ExecuteOnRollbackInterface.php diff --git a/src/Mage/Task/TaskFactory.php b/src/Task/TaskFactory.php similarity index 100% rename from src/Mage/Task/TaskFactory.php rename to src/Task/TaskFactory.php diff --git a/src/Mage/Utils.php b/src/Utils.php similarity index 100% rename from src/Mage/Utils.php rename to src/Utils.php diff --git a/src/Mage/Tests/Command/BuiltIn/Config/DumpCommandTest.php b/tests/Command/BuiltIn/Config/DumpCommandTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/Config/DumpCommandTest.php rename to tests/Command/BuiltIn/Config/DumpCommandTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/Config/EnvironmentsCommandTest.php b/tests/Command/BuiltIn/Config/EnvironmentsCommandTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/Config/EnvironmentsCommandTest.php rename to tests/Command/BuiltIn/Config/EnvironmentsCommandTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/DeployCommandMiscTasksTest.php b/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/DeployCommandMiscTasksTest.php rename to tests/Command/BuiltIn/DeployCommandMiscTasksTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/DeployCommandMiscTest.php b/tests/Command/BuiltIn/DeployCommandMiscTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/DeployCommandMiscTest.php rename to tests/Command/BuiltIn/DeployCommandMiscTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/DeployCommandWithReleasesTest.php b/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/DeployCommandWithReleasesTest.php rename to tests/Command/BuiltIn/DeployCommandWithReleasesTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php b/tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php rename to tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php b/tests/Command/BuiltIn/Releases/ListCommandTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php rename to tests/Command/BuiltIn/Releases/ListCommandTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php b/tests/Command/BuiltIn/Releases/RollbackCommandTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php rename to tests/Command/BuiltIn/Releases/RollbackCommandTest.php diff --git a/src/Mage/Tests/Command/BuiltIn/VersionCommandTest.php b/tests/Command/BuiltIn/VersionCommandTest.php similarity index 100% rename from src/Mage/Tests/Command/BuiltIn/VersionCommandTest.php rename to tests/Command/BuiltIn/VersionCommandTest.php diff --git a/src/Mage/Tests/MageApplicationMockup.php b/tests/MageApplicationMockup.php similarity index 100% rename from src/Mage/Tests/MageApplicationMockup.php rename to tests/MageApplicationMockup.php diff --git a/src/Mage/Tests/MageApplicationTest.php b/tests/MageApplicationTest.php similarity index 100% rename from src/Mage/Tests/MageApplicationTest.php rename to tests/MageApplicationTest.php diff --git a/src/Mage/Tests/Resources/basic.yml b/tests/Resources/basic.yml similarity index 100% rename from src/Mage/Tests/Resources/basic.yml rename to tests/Resources/basic.yml diff --git a/src/Mage/Tests/Resources/broken-git-branch.yml b/tests/Resources/broken-git-branch.yml similarity index 100% rename from src/Mage/Tests/Resources/broken-git-branch.yml rename to tests/Resources/broken-git-branch.yml diff --git a/src/Mage/Tests/Resources/composer.yml b/tests/Resources/composer.yml similarity index 100% rename from src/Mage/Tests/Resources/composer.yml rename to tests/Resources/composer.yml diff --git a/src/Mage/Tests/Resources/invalid-task.yml b/tests/Resources/invalid-task.yml similarity index 100% rename from src/Mage/Tests/Resources/invalid-task.yml rename to tests/Resources/invalid-task.yml diff --git a/src/Mage/Tests/Resources/invalid-yaml.yml b/tests/Resources/invalid-yaml.yml similarity index 100% rename from src/Mage/Tests/Resources/invalid-yaml.yml rename to tests/Resources/invalid-yaml.yml diff --git a/src/Mage/Tests/Resources/invalid.yml b/tests/Resources/invalid.yml similarity index 100% rename from src/Mage/Tests/Resources/invalid.yml rename to tests/Resources/invalid.yml diff --git a/src/Mage/Tests/Resources/no-hosts.yml b/tests/Resources/no-hosts.yml similarity index 100% rename from src/Mage/Tests/Resources/no-hosts.yml rename to tests/Resources/no-hosts.yml diff --git a/src/Mage/Tests/Resources/symfony-envconf.yml b/tests/Resources/symfony-envconf.yml similarity index 100% rename from src/Mage/Tests/Resources/symfony-envconf.yml rename to tests/Resources/symfony-envconf.yml diff --git a/src/Mage/Tests/Resources/testhost-custom-task.yml b/tests/Resources/testhost-custom-task.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-custom-task.yml rename to tests/Resources/testhost-custom-task.yml diff --git a/src/Mage/Tests/Resources/testhost-fail-copy-tar.yml b/tests/Resources/testhost-fail-copy-tar.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-fail-copy-tar.yml rename to tests/Resources/testhost-fail-copy-tar.yml diff --git a/src/Mage/Tests/Resources/testhost-fail-get-current.yml b/tests/Resources/testhost-fail-get-current.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-fail-get-current.yml rename to tests/Resources/testhost-fail-get-current.yml diff --git a/src/Mage/Tests/Resources/testhost-fail-get-releases.yml b/tests/Resources/testhost-fail-get-releases.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-fail-get-releases.yml rename to tests/Resources/testhost-fail-get-releases.yml diff --git a/src/Mage/Tests/Resources/testhost-force-release.yml b/tests/Resources/testhost-force-release.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-force-release.yml rename to tests/Resources/testhost-force-release.yml diff --git a/src/Mage/Tests/Resources/testhost-force-tar1.yml b/tests/Resources/testhost-force-tar1.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-force-tar1.yml rename to tests/Resources/testhost-force-tar1.yml diff --git a/src/Mage/Tests/Resources/testhost-force-tar2.yml b/tests/Resources/testhost-force-tar2.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-force-tar2.yml rename to tests/Resources/testhost-force-tar2.yml diff --git a/src/Mage/Tests/Resources/testhost-force-tar3.yml b/tests/Resources/testhost-force-tar3.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-force-tar3.yml rename to tests/Resources/testhost-force-tar3.yml diff --git a/src/Mage/Tests/Resources/testhost-no-hosts.yml b/tests/Resources/testhost-no-hosts.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-no-hosts.yml rename to tests/Resources/testhost-no-hosts.yml diff --git a/src/Mage/Tests/Resources/testhost-no-releases.yml b/tests/Resources/testhost-no-releases.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-no-releases.yml rename to tests/Resources/testhost-no-releases.yml diff --git a/src/Mage/Tests/Resources/testhost-not-have-release.yml b/tests/Resources/testhost-not-have-release.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-not-have-release.yml rename to tests/Resources/testhost-not-have-release.yml diff --git a/src/Mage/Tests/Resources/testhost-skipping.yml b/tests/Resources/testhost-skipping.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-skipping.yml rename to tests/Resources/testhost-skipping.yml diff --git a/src/Mage/Tests/Resources/testhost-sudo.yml b/tests/Resources/testhost-sudo.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-sudo.yml rename to tests/Resources/testhost-sudo.yml diff --git a/src/Mage/Tests/Resources/testhost-with-error.yml b/tests/Resources/testhost-with-error.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-with-error.yml rename to tests/Resources/testhost-with-error.yml diff --git a/src/Mage/Tests/Resources/testhost-with-postdeploy-error.yml b/tests/Resources/testhost-with-postdeploy-error.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-with-postdeploy-error.yml rename to tests/Resources/testhost-with-postdeploy-error.yml diff --git a/src/Mage/Tests/Resources/testhost-without-releases.yml b/tests/Resources/testhost-without-releases.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost-without-releases.yml rename to tests/Resources/testhost-without-releases.yml diff --git a/src/Mage/Tests/Resources/testhost.yml b/tests/Resources/testhost.yml similarity index 100% rename from src/Mage/Tests/Resources/testhost.yml rename to tests/Resources/testhost.yml diff --git a/src/Mage/Tests/Runtime/ProcessMockup.php b/tests/Runtime/ProcessMockup.php similarity index 100% rename from src/Mage/Tests/Runtime/ProcessMockup.php rename to tests/Runtime/ProcessMockup.php diff --git a/src/Mage/Tests/Runtime/RuntimeMockup.php b/tests/Runtime/RuntimeMockup.php similarity index 100% rename from src/Mage/Tests/Runtime/RuntimeMockup.php rename to tests/Runtime/RuntimeMockup.php diff --git a/src/Mage/Tests/Runtime/RuntimeTest.php b/tests/Runtime/RuntimeTest.php similarity index 100% rename from src/Mage/Tests/Runtime/RuntimeTest.php rename to tests/Runtime/RuntimeTest.php diff --git a/src/Mage/Tests/Task/AbstractTaskTest.php b/tests/Task/AbstractTaskTest.php similarity index 100% rename from src/Mage/Tests/Task/AbstractTaskTest.php rename to tests/Task/AbstractTaskTest.php diff --git a/src/Mage/Tests/Task/BuiltIn/FileSystemTaskTest.php b/tests/Task/BuiltIn/FileSystemTaskTest.php similarity index 100% rename from src/Mage/Tests/Task/BuiltIn/FileSystemTaskTest.php rename to tests/Task/BuiltIn/FileSystemTaskTest.php diff --git a/src/Mage/Tests/Task/CustomTask.php b/tests/Task/CustomTask.php similarity index 100% rename from src/Mage/Tests/Task/CustomTask.php rename to tests/Task/CustomTask.php diff --git a/src/Mage/Tests/Task/TaskFactoryTest.php b/tests/Task/TaskFactoryTest.php similarity index 100% rename from src/Mage/Tests/Task/TaskFactoryTest.php rename to tests/Task/TaskFactoryTest.php diff --git a/src/Mage/Tests/Task/TestCaseFailTask.php b/tests/Task/TestCaseFailTask.php similarity index 100% rename from src/Mage/Tests/Task/TestCaseFailTask.php rename to tests/Task/TestCaseFailTask.php diff --git a/src/Mage/Tests/Task/TestCaseTask.php b/tests/Task/TestCaseTask.php similarity index 100% rename from src/Mage/Tests/Task/TestCaseTask.php rename to tests/Task/TestCaseTask.php diff --git a/src/Mage/Tests/UtilsTest.php b/tests/UtilsTest.php similarity index 100% rename from src/Mage/Tests/UtilsTest.php rename to tests/UtilsTest.php