From 98ad7492f8c762a9f681c76fbd3a573ea2ad4cda Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Mon, 29 Jun 2020 21:14:30 +0200 Subject: [PATCH 1/2] Fix ensureKnownHosts --- src/Method/ArtifactsBaseMethod.php | 3 ++- src/Method/GitMethod.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Method/ArtifactsBaseMethod.php b/src/Method/ArtifactsBaseMethod.php index 150ff3d5..41e6db94 100644 --- a/src/Method/ArtifactsBaseMethod.php +++ b/src/Method/ArtifactsBaseMethod.php @@ -16,6 +16,7 @@ use Phabalicious\Exception\TaskNotFoundInMethodException; use Phabalicious\ShellProvider\ShellProviderInterface; use Phabalicious\Utilities\AppDefaultStages; +use Phabalicious\Utilities\EnsureKnownHosts; use Phabalicious\Validation\ValidationErrorBagInterface; use Phabalicious\Validation\ValidationService; use Psr\Log\LoggerInterface; @@ -146,7 +147,7 @@ protected function buildArtifact( $context->set('outerShell', $shell); $context->set('installDir', $install_dir); - $this->ensureKnownHosts( + EnsureKnownHosts::ensureKnownHosts( $context->getConfigurationService(), $this->getKnownHosts($host_config, $context), $shell diff --git a/src/Method/GitMethod.php b/src/Method/GitMethod.php index 891d5a11..e35522bd 100644 --- a/src/Method/GitMethod.php +++ b/src/Method/GitMethod.php @@ -6,6 +6,7 @@ use Phabalicious\Configuration\HostConfig; use Phabalicious\Exception\EarlyTaskExitException; use Phabalicious\ShellProvider\ShellProviderInterface; +use Phabalicious\Utilities\EnsureKnownHosts; use Phabalicious\Utilities\Utilities; use Phabalicious\Validation\ValidationErrorBagInterface; use Phabalicious\Validation\ValidationService; @@ -184,7 +185,7 @@ public function appCreate(HostConfig $host_config, TaskContextInterface $context $cwd = $shell->getWorkingDir(); $shell->cd(dirname($install_dir)); - $this->ensureKnownHosts( + EnsureKnownHosts::ensureKnownHosts( $context->getConfigurationService(), $this->getKnownHosts($host_config, $context), $shell @@ -211,7 +212,7 @@ public function preflightTask(string $task, HostConfig $config, TaskContextInter { parent::preflightTask($task, $config, $context); // TODO: Change the autogenerated stub if (in_array($task, ['deploy'])) { - $this->ensureKnownHosts( + EnsureKnownHosts::ensureKnownHosts( $context->getConfigurationService(), $this->getKnownHosts($config, $context), $config->shell() From 69ebcfe2fed7c54b9707fde76b0d299609b4c090 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Mon, 29 Jun 2020 21:15:40 +0200 Subject: [PATCH 2/2] Update changelog, bump version number --- Changelog.md | 6 ++++++ src/Utilities/Utilities.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 8ba87e15..368b6393 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,11 @@ # Changelog +## 3.4.7 / 2020-06-29 + +### Fixed: + + * Fix ensureKnownHosts + ## 3.4.6 / 2020-06-29 ### Fixed: diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php index 428fca46..895dd5a9 100644 --- a/src/Utilities/Utilities.php +++ b/src/Utilities/Utilities.php @@ -8,7 +8,7 @@ class Utilities { - const FALLBACK_VERSION = '3.4.6'; + const FALLBACK_VERSION = '3.4.7'; const COMBINED_ARGUMENTS = 'combined'; const UNNAMED_ARGUMENTS = 'unnamedArguments';