Skip to content

Commit 81ef53a

Browse files
nophaanophaa
authored
Merge pull request #1 from nophaa/analysis-zO43WR
Apply fixes from StyleCI
2 parents e98a8d5 + 91ed342 commit 81ef53a

27 files changed

+437
-386
lines changed

‎lib/Sipwise/Api/AbstractApi.php

+53-41
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
<?php namespace Sipwise\Api;
1+
<?php
2+
3+
namespace Sipwise\Api;
24

3-
use Sipwise\Client;
4-
use Sipwise\HttpClient\Message\QueryStringBuilder;
5-
use Sipwise\HttpClient\Message\ResponseMediator;
65
use Http\Discovery\StreamFactoryDiscovery;
76
use Http\Message\StreamFactory;
87
use Psr\Http\Message\ResponseInterface;
98
use Psr\Http\Message\StreamInterface;
9+
use Sipwise\Client;
10+
use Sipwise\HttpClient\Message\QueryStringBuilder;
11+
use Sipwise\HttpClient\Message\ResponseMediator;
1012
use Symfony\Component\OptionsResolver\OptionsResolver;
1113

1214
/**
13-
* Abstract class for Api classes
15+
* Abstract class for Api classes.
1416
*
1517
* @author Joseph Bielawski <stloyd@gmail.com>
1618
* @author Matt Humphrey <matt@m4tt.co>
@@ -20,7 +22,7 @@
2022
abstract class AbstractApi implements ApiInterface
2123
{
2224
/**
23-
* The client
25+
* The client.
2426
*
2527
* @var Client
2628
*/
@@ -32,7 +34,7 @@ abstract class AbstractApi implements ApiInterface
3234
private $streamFactory;
3335

3436
/**
35-
* @param Client $client
37+
* @param Client $client
3638
* @param StreamFactory|null $streamFactory
3739
*/
3840
public function __construct(Client $client, StreamFactory $streamFactory = null)
@@ -54,36 +56,39 @@ public function configure()
5456
* Performs a GET query and returns the response as a PSR-7 response object.
5557
*
5658
* @param string $path
57-
* @param array $parameters
58-
* @param array $requestHeaders
59+
* @param array $parameters
60+
* @param array $requestHeaders
61+
*
5962
* @return ResponseInterface
6063
*/
61-
protected function getAsResponse($path, array $parameters = array(), $requestHeaders = array())
64+
protected function getAsResponse($path, array $parameters = [], $requestHeaders = [])
6265
{
6366
$preparedPath = $this->preparePath($path, $parameters);
64-
67+
6568
return $this->client->getHttpClient()->get($preparedPath, $requestHeaders);
6669
}
6770

6871
/**
6972
* @param string $path
70-
* @param array $parameters
71-
* @param array $requestHeaders
73+
* @param array $parameters
74+
* @param array $requestHeaders
75+
*
7276
* @return mixed
7377
*/
74-
protected function get($path, array $parameters = array(), $requestHeaders = array())
78+
protected function get($path, array $parameters = [], $requestHeaders = [])
7579
{
7680
return ResponseMediator::getContent($this->getAsResponse($path, $parameters, $requestHeaders));
7781
}
7882

7983
/**
8084
* @param string $path
81-
* @param array $parameters
82-
* @param array $requestHeaders
83-
* @param array $files
85+
* @param array $parameters
86+
* @param array $requestHeaders
87+
* @param array $files
88+
*
8489
* @return mixed
8590
*/
86-
protected function post($path, array $parameters = array(), $requestHeaders = array())
91+
protected function post($path, array $parameters = [], $requestHeaders = [])
8792
{
8893
$preparedPath = $this->preparePath($path);
8994

@@ -95,20 +100,22 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
95100
}
96101

97102
$response = $this->client->getHttpClient()->post($preparedPath, $requestHeaders, $body);
98-
99-
if (empty(ResponseMediator::getContent($response))){
103+
104+
if (empty(ResponseMediator::getContent($response))) {
100105
return ResponseMediator::getHeaders($response);
101106
}
107+
102108
return ResponseMediator::getContent($response);
103109
}
104110

105111
/**
106112
* @param string $path
107-
* @param array $parameters
108-
* @param array $requestHeaders
113+
* @param array $parameters
114+
* @param array $requestHeaders
115+
*
109116
* @return mixed
110117
*/
111-
protected function put($path, array $parameters = array(), $requestHeaders = array())
118+
protected function put($path, array $parameters = [], $requestHeaders = [])
112119
{
113120
$preparedPath = $this->preparePath($path);
114121

@@ -123,14 +130,15 @@ protected function put($path, array $parameters = array(), $requestHeaders = arr
123130

124131
return ResponseMediator::getContent($response);
125132
}
126-
133+
127134
/**
128135
* @param string $path
129-
* @param array $parameters
130-
* @param array $requestHeaders
136+
* @param array $parameters
137+
* @param array $requestHeaders
138+
*
131139
* @return mixed
132140
*/
133-
protected function patch($path, array $parameters = array(), $requestHeaders = array())
141+
protected function patch($path, array $parameters = [], $requestHeaders = [])
134142
{
135143
$preparedPath = $this->preparePath($path);
136144

@@ -148,11 +156,12 @@ protected function patch($path, array $parameters = array(), $requestHeaders = a
148156

149157
/**
150158
* @param string $path
151-
* @param array $parameters
152-
* @param array $requestHeaders
159+
* @param array $parameters
160+
* @param array $requestHeaders
161+
*
153162
* @return mixed
154163
*/
155-
protected function delete($path, array $parameters = array(), $requestHeaders = array())
164+
protected function delete($path, array $parameters = [], $requestHeaders = [])
156165
{
157166
$preparedPath = $this->preparePath($path, $parameters);
158167

@@ -163,6 +172,7 @@ protected function delete($path, array $parameters = array(), $requestHeaders =
163172

164173
/**
165174
* @param string $path
175+
*
166176
* @return string
167177
*/
168178
protected function encodePath($path)
@@ -180,9 +190,9 @@ protected function encodePath($path)
180190
protected function createOptionsResolver(array $parameters = [])
181191
{
182192
$resolver = new OptionsResolver();
183-
193+
184194
$resolver->setDefined(array_keys($parameters));
185-
195+
186196
$resolver->setDefined('page')
187197
->setAllowedTypes('page', 'int')
188198
->setAllowedValues('page', function ($value) {
@@ -193,30 +203,30 @@ protected function createOptionsResolver(array $parameters = [])
193203
->setAllowedValues('rows', function ($value) {
194204
return $value > 0 && $value <= 100;
195205
});
196-
206+
197207
$resolver->setDefined('order_by')
198208
->setAllowedTypes('order_by', 'string');
199-
209+
200210
$resolver->setDefined('order_by_direction')
201211
->setAllowedTypes('order_by_direction', 'string');
202212

203213
return $resolver;
204214
}
205-
215+
206216
protected function createEditOptionsResolver(array $parameters = [])
207217
{
208218
$resolver = new OptionsResolver();
209219

210220
$resolver->setDefined('op')
211-
->setAllowedTypes('op', 'string')->setAllowedValues('op',['remove', 'add', 'replace', 'move', 'copy']);
212-
221+
->setAllowedTypes('op', 'string')->setAllowedValues('op', ['remove', 'add', 'replace', 'move', 'copy']);
222+
213223
$resolver->setDefined('path')
214224
->setAllowedTypes('path', 'string');
215-
225+
216226
$resolver->setDefined('value')
217-
->setAllowedTypes('value', ['integer','string', 'bool']);
218-
219-
foreach($parameters as $parameter){
227+
->setAllowedTypes('value', ['integer', 'string', 'bool']);
228+
229+
foreach ($parameters as $parameter) {
220230
$resolver->resolve($parameter);
221231
}
222232

@@ -225,12 +235,14 @@ protected function createEditOptionsResolver(array $parameters = [])
225235

226236
/**
227237
* @param array $parameters
238+
*
228239
* @return StreamInterface
229240
*/
230241
private function prepareBody(array $parameters = [])
231242
{
232243
$raw = json_encode($parameters);
233244
$stream = $this->streamFactory->createStream($raw);
245+
234246
return $stream;
235247
}
236248

‎lib/Sipwise/Api/ApiInterface.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
<?php namespace Sipwise\Api;
1+
<?php
2+
3+
namespace Sipwise\Api;
24

35
use Sipwise\Client;
46

57
/**
6-
* Api interface
8+
* Api interface.
79
*/
810
interface ApiInterface
911
{
1012
public function __construct(Client $client);
11-
}
13+
}

0 commit comments

Comments
 (0)