Merge branch 'hotfix/3.4.7'

factorial-io · Jun 29, 2020 · cf9ec67 · cf9ec67
2 parents 262480a + 69ebcfe
commit cf9ec67
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git 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/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
@@ -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()

diff --git 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';