Add proxy, timeout and option to disable to verify SSL in CURL command

vicleca · Jul 27, 2019 · f240ca4 · f240ca4
1 parent c1338ae
commit f240ca4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor/
 composer.lock
+/.idea
diff --git a/composer.json b/composer.json
@@ -24,6 +24,10 @@
         {
             "name": "Nikita Nefedov",
             "email": "[email protected]"
+        },
+        {
+            "name": "Victor Leon",
+            "email": "[email protected]"
         }
     ],
     "extra": {

diff --git a/src/Formatter/CurlFormatter.php b/src/Formatter/CurlFormatter.php
@@ -134,7 +134,7 @@ protected function extractBodyArgument(RequestInterface $request)
 
         if ($contents) {
             // clean input of null bytes
-             $contents = str_replace(chr(0), '', $contents);
+            $contents = str_replace(chr(0), '', $contents);
             $this->addOption('d', $this->escapeShellArgument($contents));
         }
 
@@ -199,6 +199,28 @@ protected function extractHeadersArgument(RequestInterface $request, array $opti
         }
     }
 
+    /**
+     * @param RequestInterface $request
+     * @param array            $options
+     */
+    protected function extractCommonArguments(RequestInterface $request, array $options)
+    {
+        $proxy = isset($options['proxy']) ? $options['proxy'] : '';
+        if(!empty($proxy)) {
+            $this->addOption('x', $this->escapeShellArgument($proxy));
+        }
+
+        $timeout = isset($options['timeout']) ? $options['timeout'] : '';
+        if(!empty($timeout)) {
+            $this->addOption('-connect-timeout', $timeout);
+        }
+
+        $verifySsl = isset($options['verify']) ? $options['verify'] : true;
+        if(!$verifySsl) {
+            $this->addOption('k');
+        }
+    }
+
     protected function addOptionsToCommand()
     {
         ksort($this->options);
@@ -227,6 +249,7 @@ protected function extractArguments(RequestInterface $request, array $options)
         $this->extractCookiesArgument($request, $options);
         $this->extractHeadersArgument($request, $options);
         $this->extractUrlArgument($request);
+        $this->extractCommonArguments($request, $options);
     }
 
     /**
@@ -240,7 +263,6 @@ protected function extractUrlArgument(RequestInterface $request)
     protected function escapeShellArgument($argument)
     {
         $process = new Process([$argument]);
-        $escaped = $process->getCommandLine();
-        return $escaped;
+        return $process->getCommandLine();
     }
 }