Allow SymfonyHttpClient config in file (#177)

gordalina · May 11, 2021 · 9f44d97 · 9f44d97
1 parent 816b5a2
commit 9f44d97
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -183,6 +183,16 @@ fastcgi: /var/run/php5-fpm.sock
 temp_dir: /dev/shm/cachetool
 ```
 
+Example for the web adapter:
+
+```yml
+adapter: web
+webClient: SymfonyHttpClient # defaults to FileGetContents
+webUrl: http://example.com
+webPath: /var/www/example.com/current/web
+webBasicAuth: user:password
+```
+
 You can define the supported extensions in the config file. By default, `apcu`,
 and `opcache` are enabled. To disable `apcu`, add this to your config file:
 

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -196,22 +196,27 @@ private function parseConfiguration(InputInterface $input)
             }
         } elseif ($input->hasParameterOption('--web')) {
             $this->config['adapter'] = 'web';
+            $this->config['webClient'] = $input->hasParameterOption('--web') ?? 'FileGetContents';
             $this->config['webPath'] = $input->getParameterOption('--web-path');
             $this->config['webUrl'] = $input->getParameterOption('--web-url');
+            if($this->config['webClient'] === 'SymfonyHttpClient') {
+                if ($input->hasParameterOption('--web-allow-insecure')) {
+                    $this->config['webAllowInsecure'] = true;
+                }
+
+                if ($input->hasParameterOption('--web-basic-auth')) {
+                    $this->config['webBasicAuth'] = $input->getParameterOption('--web-basic-auth');
+                }
+            }
+        }
 
-            switch ($input->getParameterOption('--web') ?? 'FileGetContents') {
+        if ($this->config['adapter'] === 'web') {
+            switch ($this->config['webClient']) {
                 case 'FileGetContents':
                     $this->config['http'] = new FileGetContents($this->config['webUrl']);
                     break;
 
                 case 'SymfonyHttpClient':
-                    if ($input->hasParameterOption('--web-allow-insecure')) {
-                        $this->config['webAllowInsecure'] = true;
-                    }
-
-                    if ($input->hasParameterOption('--web-basic-auth')) {
-                        $this->config['webBasicAuth'] = $input->getParameterOption('--web-basic-auth');
-                    }
 
                     $symfonyHttpClientConfig = [];
 
@@ -228,8 +233,6 @@ private function parseConfiguration(InputInterface $input)
                     break;
 
                 default:
-                    var_dump($this->config);
-                    var_dump($input->getParameterOption('--web', "LOL"));
                     throw new \RuntimeException("{$this->config["web"]} is not a valid adapter. Possible adapters: FileGetContents or SymfonyHttpClient");
             }
         }

diff --git a/tests/Console/ApplicationTest.php b/tests/Console/ApplicationTest.php
@@ -112,6 +112,27 @@ public function testWithCustomConfigFile()
         $this->assertSame(42, $code);
     }
 
+    public function testWebSymfonyHttpClientCustomConfigFile()
+    {
+        $temp = tempnam(sys_get_temp_dir(), "cfg");
+        file_put_contents($temp, '
+adapter: web
+webClient: SymfonyHttpClient
+webUrl: http://example.com
+webPath: /var/www/example.com/current/web
+webBasicAuth: user:password
+');
+
+        $app = new Application(new Config());
+        $app->add(new DummyCommand);
+        $app->setAutoExit(false);
+
+        $output = new BufferedOutput();
+        $code = $app->run(new StringInput("dummy --config=$temp"), $output);
+
+        $this->assertSame(42, $code);
+    }
+
     public function testNoSupportedExtensions()
     {
         $app = new Application(new Config(['extensions' => []]));