Skip to content
This repository was archived by the owner on Oct 26, 2019. It is now read-only.

Commit ae9671d

Browse files
joelwurtzjoelwurtz
committed
Update lib to use last version of jane
1 parent 6343bbb commit ae9671d

26 files changed

+409
-404
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
vendor/
22
composer.lock
3+
.php_cs.cache

‎src/Client.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public static function create($httpClient = null)
2929
{
3030
if (null === $httpClient) {
3131
$httpClient = \Http\Discovery\HttpClientDiscovery::find();
32+
$plugins = [];
33+
$uri = \Http\Discovery\UriFactoryDiscovery::find()->createUri('v1.25');
34+
$plugins[] = new \Http\Client\Common\Plugin\AddPathPlugin($uri);
35+
$httpClient = new \Http\Client\Common\PluginClient($httpClient, $plugins);
3236
}
3337
$messageFactory = \Http\Discovery\MessageFactoryDiscovery::find();
3438
$serializer = new \Symfony\Component\Serializer\Serializer(\Docker\API\Normalizer\NormalizerFactory::create(), [new \Symfony\Component\Serializer\Encoder\JsonEncoder(new \Symfony\Component\Serializer\Encoder\JsonEncode(), new \Symfony\Component\Serializer\Encoder\JsonDecode())]);

‎src/Resource/ContainerAsyncResourceTrait.php‎

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎src/Resource/ContainerResourceTrait.php‎

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎src/Resource/ExecAsyncResourceTrait.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ trait ExecAsyncResourceTrait
1717
/**
1818
* Run a command inside a running container.
1919
*
20-
* @param string $id ID or name of container
2120
* @param \Docker\API\Model\ContainersIdExecPostBody $execConfig Exec configuration
21+
* @param string $id ID or name of container
2222
* @param array $parameters List of parameters
2323
* @param string $fetch Fetch mode (object or response)
2424
* @param \Amp\CancellationToken $cancellationToken Token to cancel the request
@@ -29,14 +29,14 @@ trait ExecAsyncResourceTrait
2929
*
3030
* @return \Amp\Promise<\Amp\Artax\Response|\Docker\API\Model\IdResponse>
3131
*/
32-
public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPostBody $execConfig, array $parameters = [], string $fetch = self::FETCH_OBJECT, \Amp\CancellationToken $cancellationToken = null): \Amp\Promise
32+
public function containerExec(\Docker\API\Model\ContainersIdExecPostBody $execConfig, string $id, array $parameters = [], string $fetch = self::FETCH_OBJECT, \Amp\CancellationToken $cancellationToken = null): \Amp\Promise
3333
{
34-
return \Amp\call(function () use ($id, $execConfig, $parameters, $fetch, $cancellationToken) {
34+
return \Amp\call(function () use ($execConfig, $id, $parameters, $fetch, $cancellationToken) {
3535
$queryParam = new QueryParam();
36-
$url = '/v1.25/containers/{id}/exec';
36+
$url = '/containers/{id}/exec';
3737
$url = str_replace('{id}', urlencode($id), $url);
3838
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
39-
$headers = array_merge(['Host' => 'localhost', 'Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
39+
$headers = array_merge(['Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
4040
$body = $this->serializer->serialize($execConfig, 'json');
4141
$request = new \Amp\Artax\Request($url, 'POST');
4242
$request = $request->withHeaders($headers);
@@ -64,8 +64,8 @@ public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPost
6464
/**
6565
* Starts a previously set up exec instance. If detach is true, this endpoint returns immediately after starting the command. Otherwise, it sets up an interactive session with the command.
6666
*
67-
* @param string $id Exec instance ID
6867
* @param \Docker\API\Model\ExecIdStartPostBody $execStartConfig
68+
* @param string $id Exec instance ID
6969
* @param array $parameters List of parameters
7070
* @param string $fetch Fetch mode (object or response)
7171
* @param \Amp\CancellationToken $cancellationToken Token to cancel the request
@@ -75,14 +75,14 @@ public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPost
7575
*
7676
* @return \Amp\Promise<\Amp\Artax\Response|null>
7777
*/
78-
public function execStart(string $id, \Docker\API\Model\ExecIdStartPostBody $execStartConfig, array $parameters = [], string $fetch = self::FETCH_OBJECT, \Amp\CancellationToken $cancellationToken = null): \Amp\Promise
78+
public function execStart(\Docker\API\Model\ExecIdStartPostBody $execStartConfig, string $id, array $parameters = [], string $fetch = self::FETCH_OBJECT, \Amp\CancellationToken $cancellationToken = null): \Amp\Promise
7979
{
80-
return \Amp\call(function () use ($id, $execStartConfig, $parameters, $fetch, $cancellationToken) {
80+
return \Amp\call(function () use ($execStartConfig, $id, $parameters, $fetch, $cancellationToken) {
8181
$queryParam = new QueryParam();
82-
$url = '/v1.25/exec/{id}/start';
82+
$url = '/exec/{id}/start';
8383
$url = str_replace('{id}', urlencode($id), $url);
8484
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
85-
$headers = array_merge(['Host' => 'localhost'], $queryParam->buildHeaders($parameters));
85+
$headers = array_merge(['Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
8686
$body = $this->serializer->serialize($execStartConfig, 'json');
8787
$request = new \Amp\Artax\Request($url, 'POST');
8888
$request = $request->withHeaders($headers);
@@ -127,10 +127,10 @@ public function execResize(string $id, array $parameters = [], string $fetch = s
127127
$queryParam = new QueryParam();
128128
$queryParam->setDefault('h', null);
129129
$queryParam->setDefault('w', null);
130-
$url = '/v1.25/exec/{id}/resize';
130+
$url = '/exec/{id}/resize';
131131
$url = str_replace('{id}', urlencode($id), $url);
132132
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
133-
$headers = array_merge(['Host' => 'localhost'], $queryParam->buildHeaders($parameters));
133+
$headers = array_merge(['Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
134134
$body = $queryParam->buildFormDataString($parameters);
135135
$request = new \Amp\Artax\Request($url, 'POST');
136136
$request = $request->withHeaders($headers);
@@ -166,10 +166,10 @@ public function execInspect(string $id, array $parameters = [], string $fetch =
166166
{
167167
return \Amp\call(function () use ($id, $parameters, $fetch, $cancellationToken) {
168168
$queryParam = new QueryParam();
169-
$url = '/v1.25/exec/{id}/json';
169+
$url = '/exec/{id}/json';
170170
$url = str_replace('{id}', urlencode($id), $url);
171171
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
172-
$headers = array_merge(['Host' => 'localhost', 'Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
172+
$headers = array_merge(['Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
173173
$body = $queryParam->buildFormDataString($parameters);
174174
$request = new \Amp\Artax\Request($url, 'GET');
175175
$request = $request->withHeaders($headers);

‎src/Resource/ExecResourceTrait.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ trait ExecResourceTrait
1717
/**
1818
* Run a command inside a running container.
1919
*
20-
* @param string $id ID or name of container
2120
* @param \Docker\API\Model\ContainersIdExecPostBody $execConfig Exec configuration
21+
* @param string $id ID or name of container
2222
* @param array $parameters List of parameters
2323
* @param string $fetch Fetch mode (object or response)
2424
*
@@ -28,13 +28,13 @@ trait ExecResourceTrait
2828
*
2929
* @return \Psr\Http\Message\ResponseInterface|\Docker\API\Model\IdResponse
3030
*/
31-
public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPostBody $execConfig, array $parameters = [], string $fetch = self::FETCH_OBJECT)
31+
public function containerExec(\Docker\API\Model\ContainersIdExecPostBody $execConfig, string $id, array $parameters = [], string $fetch = self::FETCH_OBJECT)
3232
{
3333
$queryParam = new QueryParam();
34-
$url = '/v1.25/containers/{id}/exec';
34+
$url = '/containers/{id}/exec';
3535
$url = str_replace('{id}', urlencode($id), $url);
3636
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
37-
$headers = array_merge(['Host' => 'localhost', 'Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
37+
$headers = array_merge(['Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
3838
$body = $this->serializer->serialize($execConfig, 'json');
3939
$request = $this->messageFactory->createRequest('POST', $url, $headers, $body);
4040
$response = $this->httpClient->sendRequest($request);
@@ -59,8 +59,8 @@ public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPost
5959
/**
6060
* Starts a previously set up exec instance. If detach is true, this endpoint returns immediately after starting the command. Otherwise, it sets up an interactive session with the command.
6161
*
62-
* @param string $id Exec instance ID
6362
* @param \Docker\API\Model\ExecIdStartPostBody $execStartConfig
63+
* @param string $id Exec instance ID
6464
* @param array $parameters List of parameters
6565
* @param string $fetch Fetch mode (object or response)
6666
*
@@ -69,13 +69,13 @@ public function containerExec(string $id, \Docker\API\Model\ContainersIdExecPost
6969
*
7070
* @return \Psr\Http\Message\ResponseInterface|null
7171
*/
72-
public function execStart(string $id, \Docker\API\Model\ExecIdStartPostBody $execStartConfig, array $parameters = [], string $fetch = self::FETCH_OBJECT)
72+
public function execStart(\Docker\API\Model\ExecIdStartPostBody $execStartConfig, string $id, array $parameters = [], string $fetch = self::FETCH_OBJECT)
7373
{
7474
$queryParam = new QueryParam();
75-
$url = '/v1.25/exec/{id}/start';
75+
$url = '/exec/{id}/start';
7676
$url = str_replace('{id}', urlencode($id), $url);
7777
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
78-
$headers = array_merge(['Host' => 'localhost'], $queryParam->buildHeaders($parameters));
78+
$headers = array_merge(['Accept' => ['application/json'], 'Content-Type' => 'application/json'], $queryParam->buildHeaders($parameters));
7979
$body = $this->serializer->serialize($execStartConfig, 'json');
8080
$request = $this->messageFactory->createRequest('POST', $url, $headers, $body);
8181
$response = $this->httpClient->sendRequest($request);
@@ -115,10 +115,10 @@ public function execResize(string $id, array $parameters = [], string $fetch = s
115115
$queryParam = new QueryParam();
116116
$queryParam->setDefault('h', null);
117117
$queryParam->setDefault('w', null);
118-
$url = '/v1.25/exec/{id}/resize';
118+
$url = '/exec/{id}/resize';
119119
$url = str_replace('{id}', urlencode($id), $url);
120120
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
121-
$headers = array_merge(['Host' => 'localhost'], $queryParam->buildHeaders($parameters));
121+
$headers = array_merge(['Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
122122
$body = $queryParam->buildFormDataString($parameters);
123123
$request = $this->messageFactory->createRequest('POST', $url, $headers, $body);
124124
$response = $this->httpClient->sendRequest($request);
@@ -149,10 +149,10 @@ public function execResize(string $id, array $parameters = [], string $fetch = s
149149
public function execInspect(string $id, array $parameters = [], string $fetch = self::FETCH_OBJECT)
150150
{
151151
$queryParam = new QueryParam();
152-
$url = '/v1.25/exec/{id}/json';
152+
$url = '/exec/{id}/json';
153153
$url = str_replace('{id}', urlencode($id), $url);
154154
$url = $url . ('?' . $queryParam->buildQueryString($parameters));
155-
$headers = array_merge(['Host' => 'localhost', 'Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
155+
$headers = array_merge(['Accept' => ['application/json']], $queryParam->buildHeaders($parameters));
156156
$body = $queryParam->buildFormDataString($parameters);
157157
$request = $this->messageFactory->createRequest('GET', $url, $headers, $body);
158158
$response = $this->httpClient->sendRequest($request);

0 commit comments

Comments
 (0)