Add execCreate() params instead of config object

Author: clue

examples/benchmark-exec.php

@@ -23,7 +23,7 @@
 $factory = new Factory($loop);
 $client = $factory->createClient();
 
-$client->execCreate($container, array('Cmd' => $cmd, 'AttachStdout' => true, 'AttachStderr' => true))->then(function ($info) use ($client) {
+$client->execCreate($container, $cmd)->then(function ($info) use ($client) {
     $stream = $client->execStartStream($info['Id'], true);
 
     $start = microtime(true);

examples/exec-inspect.php

@@ -23,7 +23,7 @@
 $factory = new Factory($loop);
 $client = $factory->createClient();
 
-$client->execCreate($container, array('Cmd' => $cmd, 'AttachStdout' => true, 'AttachStderr' => true, 'Tty' => true))->then(function ($info) use ($client) {
+$client->execCreate($container, $cmd, true)->then(function ($info) use ($client) {
     echo 'Created with info: ' . json_encode($info) . PHP_EOL;
 
     return $client->execInspect($info['Id']);

examples/exec-stream.php

@@ -27,7 +27,7 @@
 $out = new Stream(STDOUT, $loop);
 $out->pause();
 
-$client->execCreate($container, array('Cmd' => $cmd, 'AttachStdout' => true, 'AttachStderr' => true, 'Tty' => true))->then(function ($info) use ($client, $out) {
+$client->execCreate($container, $cmd, true)->then(function ($info) use ($client, $out) {
     $stream = $client->execStartStream($info['Id'], true);
     $stream->pipe($out);
 

src/Client.php

@@ -882,12 +882,16 @@ public function imageSearch($term)
     /**
      * Sets up an exec instance in a running container id
      *
-     * @param string $container container ID
-     * @param array  $config    `array('Cmd' => 'date')` (see link)
+     * @param string  $container container ID
+     * @param string  $cmd       Command to run specified as an array of strings
+     * @param boolean $tty       TTY mode
+     * @param boolean $stdin     attaches to STDIN of the exec command
+     * @param boolean $stdout    attaches to STDOUT of the exec command
+     * @param boolean $stderr    attaches to STDERR of the exec command
      * @return PromiseInterface Promise<array> with exec ID in the form of `array("Id" => $execId)`
      * @link https://docs.docker.com/reference/api/docker_remote_api_v1.15/#exec-create
      */
-    public function execCreate($container, $config)
+    public function execCreate($container, $cmd, $tty = false, $stdin = false, $stdout = true, $stderr = true)
     {
         return $this->postJson(
             $this->uri->expand(
@@ -896,7 +900,13 @@ public function execCreate($container, $config)
                     'container' => $container
                 )
             ),
-            $config
+            array(
+                'Cmd' => $cmd,
+                'Tty' => !!$tty,
+                'AttachStdin' => !!$stdin,
+                'AttachStdout' => !!$stdout,
+                'AttachStderr' => !!$stderr,
+            )
         )->then(array($this->parser, 'expectJson'));
     }
 

tests/ClientTest.php

@@ -379,10 +379,9 @@ public function testImageSearch()
     public function testExecCreate()
     {
         $json = array();
-        $config = array();
         $this->expectRequestFlow('post', '/containers/123/exec', $this->createResponseJson($json), 'expectJson');
 
-        $this->expectPromiseResolveWith($json, $this->client->execCreate(123, $config));
+        $this->expectPromiseResolveWith($json, $this->client->execCreate(123, array('env')));
     }
 
     public function testExecDetached()

tests/FunctionalClientTest.php

@@ -104,12 +104,7 @@ public function testStartRunning()
      */
     public function testExecCreateWhileRunning($container)
     {
-        $promise = $this->client->execCreate($container, array(
-            'Cmd' => array('echo', '-n', 'hello', 'world'),
-            'AttachStdout' => true,
-            'AttachStderr' => true,
-            'Tty' => true
-        ));
+        $promise = $this->client->execCreate($container, array('echo', '-n', 'hello', 'world'));
         $exec = Block\await($promise, $this->loop);
 
         $this->assertTrue(is_array($exec));
@@ -164,12 +159,7 @@ public function testExecInspectAfterRunning($exec)
      */
     public function testExecStreamEmptyOutputWhileRunning($container)
     {
-        $promise = $this->client->execCreate($container, array(
-            'Cmd' => array('true'),
-            'AttachStdout' => true,
-            'AttachStderr' => true,
-            'Tty' => true
-        ));
+        $promise = $this->client->execCreate($container, array('true'));
         $exec = Block\await($promise, $this->loop);
 
         $this->assertTrue(is_array($exec));
@@ -189,12 +179,7 @@ public function testExecStreamEmptyOutputWhileRunning($container)
      */
     public function testExecDetachedWhileRunning($container)
     {
-        $promise = $this->client->execCreate($container, array(
-            'Cmd' => array('sleep', '10'),
-            'AttachStdout' => true,
-            'AttachStderr' => true,
-            'Tty' => true
-        ));
+        $promise = $this->client->execCreate($container, array('sleep', '10'));
         $exec = Block\await($promise, $this->loop);
 
         $this->assertTrue(is_array($exec));