From 58f1004652806dca5dbe37d97b5be7516d4b3d1e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 28 Feb 2018 10:00:10 +0700 Subject: [PATCH] Renamed projects types and build classes: 'remote'/RemoteGitBuild to 'git'/GitBuild, MercurialBuild to HgBuild, SubversionBuild to SvnBuild, 'bitbuckethg' to 'bitbucket-hg'. --- src/PHPCensor/BuildFactory.php | 26 +++++++++---------- .../20180228024622_renamed_build_types.php | 18 +++++++++++++ src/PHPCensor/Model/Build/BitbucketBuild.php | 2 +- .../Model/Build/BitbucketHgBuild.php | 2 +- .../{RemoteGitBuild.php => GitBuild.php} | 2 +- src/PHPCensor/Model/Build/GithubBuild.php | 2 +- src/PHPCensor/Model/Build/GitlabBuild.php | 4 +-- src/PHPCensor/Model/Build/GogsBuild.php | 2 +- .../Build/{MercurialBuild.php => HgBuild.php} | 2 +- .../{SubversionBuild.php => SvnBuild.php} | 6 ++--- 10 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 src/PHPCensor/Migrations/20180228024622_renamed_build_types.php rename src/PHPCensor/Model/Build/{RemoteGitBuild.php => GitBuild.php} (99%) rename src/PHPCensor/Model/Build/{MercurialBuild.php => HgBuild.php} (98%) rename src/PHPCensor/Model/Build/{SubversionBuild.php => SvnBuild.php} (98%) diff --git a/src/PHPCensor/BuildFactory.php b/src/PHPCensor/BuildFactory.php index 95690732..a2ef1af3 100644 --- a/src/PHPCensor/BuildFactory.php +++ b/src/PHPCensor/BuildFactory.php @@ -7,7 +7,7 @@ use PHPCensor\Model\Build; /** * BuildFactory - Takes in a generic "Build" and returns a type-specific build model. - * + * * @author Dan Cryer */ class BuildFactory @@ -43,33 +43,33 @@ class BuildFactory if (!empty($project)) { switch ($project->getType()) { - case 'remote': - $type = 'RemoteGitBuild'; - break; case 'local': $type = 'LocalBuild'; break; + case 'git': + $type = 'GitBuild'; + break; case 'github': $type = 'GithubBuild'; break; case 'bitbucket': $type = 'BitbucketBuild'; break; - case 'bitbuckethg': - $type = 'BitbucketHgBuild'; - break; case 'gitlab': $type = 'GitlabBuild'; break; - case 'hg': - $type = 'MercurialBuild'; - break; - case 'svn': - $type = 'SubversionBuild'; - break; case 'gogs': $type = 'GogsBuild'; break; + case 'hg': + $type = 'HgBuild'; + break; + case 'bitbucket-hg': + $type = 'BitbucketHgBuild'; + break; + case 'svn': + $type = 'SvnBuild'; + break; default: return $build; } diff --git a/src/PHPCensor/Migrations/20180228024622_renamed_build_types.php b/src/PHPCensor/Migrations/20180228024622_renamed_build_types.php new file mode 100644 index 00000000..4cd2255f --- /dev/null +++ b/src/PHPCensor/Migrations/20180228024622_renamed_build_types.php @@ -0,0 +1,18 @@ +execute("UPDATE project SET type = 'git' WHERE type = 'remote'"); + $this->execute("UPDATE project SET type = 'bitbucket-hg' WHERE type = 'bitbuckethg'"); + } + + public function down() + { + $this->execute("UPDATE project SET type = 'remote' WHERE type = 'git'"); + $this->execute("UPDATE project SET type = 'bitbuckethg' WHERE type = 'bitbucket-hg'"); + } +} diff --git a/src/PHPCensor/Model/Build/BitbucketBuild.php b/src/PHPCensor/Model/Build/BitbucketBuild.php index 2e84802f..3b29d38d 100644 --- a/src/PHPCensor/Model/Build/BitbucketBuild.php +++ b/src/PHPCensor/Model/Build/BitbucketBuild.php @@ -15,7 +15,7 @@ use PHPCensor\Model\BuildError; * * @author Dan Cryer */ -class BitbucketBuild extends RemoteGitBuild +class BitbucketBuild extends GitBuild { /** * Get link to commit from another source (i.e. BitBucket) diff --git a/src/PHPCensor/Model/Build/BitbucketHgBuild.php b/src/PHPCensor/Model/Build/BitbucketHgBuild.php index 6be40937..574abf61 100644 --- a/src/PHPCensor/Model/Build/BitbucketHgBuild.php +++ b/src/PHPCensor/Model/Build/BitbucketHgBuild.php @@ -9,7 +9,7 @@ use PHPCensor\Model\Build; * * @author Artem Bochkov */ -class BitbucketHgBuild extends MercurialBuild +class BitbucketHgBuild extends HgBuild { /** * Get link to commit from another source (i.e. BitBucket) diff --git a/src/PHPCensor/Model/Build/RemoteGitBuild.php b/src/PHPCensor/Model/Build/GitBuild.php similarity index 99% rename from src/PHPCensor/Model/Build/RemoteGitBuild.php rename to src/PHPCensor/Model/Build/GitBuild.php index 49753393..40ecf59c 100644 --- a/src/PHPCensor/Model/Build/RemoteGitBuild.php +++ b/src/PHPCensor/Model/Build/GitBuild.php @@ -11,7 +11,7 @@ use Psr\Log\LogLevel; * * @author Dan Cryer */ -class RemoteGitBuild extends Build +class GitBuild extends Build { /** * Get the URL to be used to clone this remote repository. diff --git a/src/PHPCensor/Model/Build/GithubBuild.php b/src/PHPCensor/Model/Build/GithubBuild.php index be2b5d31..b3968b93 100644 --- a/src/PHPCensor/Model/Build/GithubBuild.php +++ b/src/PHPCensor/Model/Build/GithubBuild.php @@ -15,7 +15,7 @@ use PHPCensor\Model\BuildError; * * @author Dan Cryer */ -class GithubBuild extends RemoteGitBuild +class GithubBuild extends GitBuild { /** * Get link to commit from another source (i.e. Github) diff --git a/src/PHPCensor/Model/Build/GitlabBuild.php b/src/PHPCensor/Model/Build/GitlabBuild.php index 35525b37..ad5a30b9 100644 --- a/src/PHPCensor/Model/Build/GitlabBuild.php +++ b/src/PHPCensor/Model/Build/GitlabBuild.php @@ -4,10 +4,10 @@ namespace PHPCensor\Model\Build; /** * Gitlab Build Model - * + * * @author André Cianfarani */ -class GitlabBuild extends RemoteGitBuild +class GitlabBuild extends GitBuild { /** diff --git a/src/PHPCensor/Model/Build/GogsBuild.php b/src/PHPCensor/Model/Build/GogsBuild.php index cab9ad54..9f5d95e6 100644 --- a/src/PHPCensor/Model/Build/GogsBuild.php +++ b/src/PHPCensor/Model/Build/GogsBuild.php @@ -5,7 +5,7 @@ namespace PHPCensor\Model\Build; /** * GogsBuild Build Model */ -class GogsBuild extends RemoteGitBuild +class GogsBuild extends GitBuild { /** * Get link to commit from Gogs repository diff --git a/src/PHPCensor/Model/Build/MercurialBuild.php b/src/PHPCensor/Model/Build/HgBuild.php similarity index 98% rename from src/PHPCensor/Model/Build/MercurialBuild.php rename to src/PHPCensor/Model/Build/HgBuild.php index 4711fbe3..7073144e 100644 --- a/src/PHPCensor/Model/Build/MercurialBuild.php +++ b/src/PHPCensor/Model/Build/HgBuild.php @@ -10,7 +10,7 @@ use PHPCensor\Builder; * * @author Pavel Gopanenko */ -class MercurialBuild extends Build +class HgBuild extends Build { /** * Get the URL to be used to clone this remote repository. diff --git a/src/PHPCensor/Model/Build/SubversionBuild.php b/src/PHPCensor/Model/Build/SvnBuild.php similarity index 98% rename from src/PHPCensor/Model/Build/SubversionBuild.php rename to src/PHPCensor/Model/Build/SvnBuild.php index 68a2ff7d..12fb57a2 100644 --- a/src/PHPCensor/Model/Build/SubversionBuild.php +++ b/src/PHPCensor/Model/Build/SvnBuild.php @@ -7,10 +7,10 @@ use PHPCensor\Builder; /** * Remote Subversion Build Model - * + * * @author Nadir Dzhilkibaev */ -class SubversionBuild extends Build +class SvnBuild extends Build { protected $svnCommand = 'svn export -q --non-interactive '; @@ -21,7 +21,7 @@ class SubversionBuild extends Build { $url = rtrim($this->getProject()->getReference(), '/') . '/'; $branch = ltrim($this->getBranch(), '/'); - + // For empty default branch or default branch name like "/trunk" or "trunk" (-> "trunk") if (empty($branch) || $branch == 'trunk') { $url .= 'trunk';