@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | protected $accessToken; |
| 117 | 117 | |
| 118 | 118 | |
| 119 | - public function __construct($baseUrl,array $options = array()){ |
|
| 119 | + public function __construct($baseUrl, array $options = array()){ |
|
| 120 | 120 | $this->baseUrl = $baseUrl; |
| 121 | 121 | |
| 122 | - if (!empty($options)) { |
|
| 122 | + if (!empty($options)){ |
|
| 123 | 123 | $this->setOptions($options); |
| 124 | 124 | } |
| 125 | 125 | $this->configureURL(); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | /** |
| 147 | 147 | * @inheritdoc |
| 148 | 148 | */ |
| 149 | - public function setAuth($accessToken) { |
|
| 149 | + public function setAuth($accessToken){ |
|
| 150 | 150 | $this->accessToken = $accessToken; |
| 151 | 151 | return $this; |
| 152 | 152 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | /** |
| 155 | 155 | * @inheritdoc |
| 156 | 156 | */ |
| 157 | - public function setUrl($url) { |
|
| 157 | + public function setUrl($url){ |
|
| 158 | 158 | $this->Url = $url; |
| 159 | 159 | return $this; |
| 160 | 160 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | /** |
| 163 | 163 | * @inheritdoc |
| 164 | 164 | */ |
| 165 | - public function setRequest(RequestInterface $Request) { |
|
| 165 | + public function setRequest(RequestInterface $Request){ |
|
| 166 | 166 | $this->Request = $Request; |
| 167 | 167 | return $this; |
| 168 | 168 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | /** |
| 171 | 171 | * @inheritdoc |
| 172 | 172 | */ |
| 173 | - public function setResponse(ResponseInterface $Response) { |
|
| 173 | + public function setResponse(ResponseInterface $Response){ |
|
| 174 | 174 | $this->Response = $Response; |
| 175 | 175 | return $this; |
| 176 | 176 | } |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | * @throws InvalidURLException |
| 219 | 219 | */ |
| 220 | 220 | public function execute($data = NULL){ |
| 221 | - $data = ($data === NULL?$this->Data:$data); |
|
| 221 | + $data = ($data===NULL?$this->Data:$data); |
|
| 222 | 222 | $this->configureData($data); |
| 223 | - if ($this->verifyOptions() && is_object($this->Request)) { |
|
| 223 | + if ($this->verifyOptions() && is_object($this->Request)){ |
|
| 224 | 224 | $this->configureRequest(); |
| 225 | 225 | $this->Request->send(); |
| 226 | 226 | }else{ |
| 227 | - throw new InvalidRequestException(get_called_class(),"Request property not configured"); |
|
| 227 | + throw new InvalidRequestException(get_called_class(), "Request property not configured"); |
|
| 228 | 228 | } |
| 229 | 229 | return $this; |
| 230 | 230 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | /** |
| 233 | 233 | * @inheritdoc |
| 234 | 234 | */ |
| 235 | - public function authRequired() { |
|
| 235 | + public function authRequired(){ |
|
| 236 | 236 | return $this->_AUTH_REQUIRED; |
| 237 | 237 | } |
| 238 | 238 | |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | * @throws RequiredDataException |
| 243 | 243 | */ |
| 244 | 244 | protected function configureRequest(){ |
| 245 | - if ($this->verifyUrl()) { |
|
| 245 | + if ($this->verifyUrl()){ |
|
| 246 | 246 | $this->Request->setURL($this->Url); |
| 247 | 247 | } |
| 248 | - if ($this->verifyData() && !empty($this->Data)) { |
|
| 248 | + if ($this->verifyData() && !empty($this->Data)){ |
|
| 249 | 249 | $this->Request->setBody($this->Data); |
| 250 | 250 | } |
| 251 | 251 | $this->configureAuth(); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * Configures the authentication header on the Request object |
| 256 | 256 | */ |
| 257 | 257 | protected function configureAuth(){ |
| 258 | - if ($this->authRequired()) { |
|
| 258 | + if ($this->authRequired()){ |
|
| 259 | 259 | $this->Request->addHeader('OAuth-Token', $this->accessToken); |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * @var $data |
| 266 | 266 | */ |
| 267 | 267 | protected function configureData($data){ |
| 268 | - if (!empty($this->_REQUIRED_DATA)&&is_array($data)){ |
|
| 268 | + if (!empty($this->_REQUIRED_DATA) && is_array($data)){ |
|
| 269 | 269 | $data = $this->configureDefaultData($data); |
| 270 | 270 | } |
| 271 | 271 | $this->setData($data); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * @return array |
| 278 | 278 | */ |
| 279 | 279 | protected function configureDefaultData(array $data){ |
| 280 | - foreach($this->_REQUIRED_DATA as $property => $value){ |
|
| 280 | + foreach ($this->_REQUIRED_DATA as $property => $value){ |
|
| 281 | 281 | if (!isset($data[$property]) && $value!==NULL){ |
| 282 | 282 | $data[$property] = $value; |
| 283 | 283 | } |
@@ -292,18 +292,18 @@ discard block |
||
| 292 | 292 | */ |
| 293 | 293 | protected function configureURL(){ |
| 294 | 294 | $url = $this->_URL; |
| 295 | - if ($this->requiresOptions()) { |
|
| 295 | + if ($this->requiresOptions()){ |
|
| 296 | 296 | $urlParts = explode("/", $this->_URL); |
| 297 | 297 | $o = 0; |
| 298 | - foreach ($urlParts as $key => $part) { |
|
| 299 | - if (strpos($part, "$") !== FALSE) { |
|
| 300 | - if (isset($this->Options[$o])) { |
|
| 298 | + foreach ($urlParts as $key => $part){ |
|
| 299 | + if (strpos($part, "$")!==FALSE){ |
|
| 300 | + if (isset($this->Options[$o])){ |
|
| 301 | 301 | $urlParts[$key] = $this->Options[$o]; |
| 302 | 302 | $o++; |
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | - $url = implode($urlParts,"/"); |
|
| 306 | + $url = implode($urlParts, "/"); |
|
| 307 | 307 | } |
| 308 | 308 | $url = $this->baseUrl.$url; |
| 309 | 309 | $this->setUrl($url); |
@@ -315,9 +315,9 @@ discard block |
||
| 315 | 315 | * @throws InvalidURLException |
| 316 | 316 | */ |
| 317 | 317 | protected function verifyUrl(){ |
| 318 | - $UrlArray = explode("?",$this->Url); |
|
| 319 | - if (strpos($UrlArray[0],"$") !== FALSE){ |
|
| 320 | - throw new InvalidURLException(get_called_class(),"Configured URL is ".$this->Url); |
|
| 318 | + $UrlArray = explode("?", $this->Url); |
|
| 319 | + if (strpos($UrlArray[0], "$")!==FALSE){ |
|
| 320 | + throw new InvalidURLException(get_called_class(), "Configured URL is ".$this->Url); |
|
| 321 | 321 | } |
| 322 | 322 | return true; |
| 323 | 323 | } |
@@ -328,11 +328,11 @@ discard block |
||
| 328 | 328 | * @throws RequiredOptionsException |
| 329 | 329 | */ |
| 330 | 330 | protected function verifyOptions(){ |
| 331 | - $urlVarCount = substr_count($this->_URL,"$"); |
|
| 331 | + $urlVarCount = substr_count($this->_URL, "$"); |
|
| 332 | 332 | $optionCount = 0; |
| 333 | 333 | $optionCount += count($this->Options); |
| 334 | 334 | if ($urlVarCount>$optionCount){ |
| 335 | - throw new RequiredOptionsException(get_called_class(),"URL requires $urlVarCount options, only $optionCount provided."); |
|
| 335 | + throw new RequiredOptionsException(get_called_class(), "URL requires $urlVarCount options, only $optionCount provided."); |
|
| 336 | 336 | } |
| 337 | 337 | return true; |
| 338 | 338 | } |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | * @throws RequiredDataException |
| 344 | 344 | */ |
| 345 | 345 | protected function verifyData(){ |
| 346 | - if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)) { |
|
| 346 | + if (isset($this->_DATA_TYPE) || !empty($this->_DATA_TYPE)){ |
|
| 347 | 347 | $this->verifyDataType(); |
| 348 | 348 | } |
| 349 | 349 | if (!empty($this->_REQUIRED_DATA)){ |
@@ -358,8 +358,8 @@ discard block |
||
| 358 | 358 | * @throws RequiredDataException |
| 359 | 359 | */ |
| 360 | 360 | protected function verifyDataType(){ |
| 361 | - if (gettype($this->Data) !== $this->_DATA_TYPE) { |
|
| 362 | - throw new RequiredDataException(get_called_class(),"Valid DataType is {$this->_DATA_TYPE}"); |
|
| 361 | + if (gettype($this->Data)!==$this->_DATA_TYPE){ |
|
| 362 | + throw new RequiredDataException(get_called_class(), "Valid DataType is {$this->_DATA_TYPE}"); |
|
| 363 | 363 | } |
| 364 | 364 | return true; |
| 365 | 365 | } |
@@ -371,13 +371,13 @@ discard block |
||
| 371 | 371 | */ |
| 372 | 372 | protected function verifyRequiredData(){ |
| 373 | 373 | $errors = array(); |
| 374 | - foreach($this->_REQUIRED_DATA as $property => $defaultValue){ |
|
| 374 | + foreach ($this->_REQUIRED_DATA as $property => $defaultValue){ |
|
| 375 | 375 | if (!isset($this->Data[$property])){ |
| 376 | 376 | $errors[] = $property; |
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | 379 | if (count($errors)>0){ |
| 380 | - throw new RequiredDataException(get_called_class(),"Missing data for ".implode(",",$errors)); |
|
| 380 | + throw new RequiredDataException(get_called_class(), "Missing data for ".implode(",", $errors)); |
|
| 381 | 381 | } |
| 382 | 382 | return true; |
| 383 | 383 | } |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | * @return bool |
| 388 | 388 | */ |
| 389 | 389 | protected function requiresOptions(){ |
| 390 | - return strpos($this->_URL,"$") === FALSE?FALSE:TRUE; |
|
| 390 | + return strpos($this->_URL, "$")===FALSE?FALSE:TRUE; |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | } |
| 394 | 394 | \ No newline at end of file |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | public function __construct($baseUrl,array $options = array()){ |
| 120 | 120 | $this->baseUrl = $baseUrl; |
| 121 | 121 | |
| 122 | - if (!empty($options)) { |
|
| 122 | + if (!empty($options)){ |
|
| 123 | 123 | $this->setOptions($options); |
| 124 | 124 | } |
| 125 | 125 | $this->configureURL(); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | /** |
| 147 | 147 | * @inheritdoc |
| 148 | 148 | */ |
| 149 | - public function setAuth($accessToken) { |
|
| 149 | + public function setAuth($accessToken){ |
|
| 150 | 150 | $this->accessToken = $accessToken; |
| 151 | 151 | return $this; |
| 152 | 152 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | /** |
| 155 | 155 | * @inheritdoc |
| 156 | 156 | */ |
| 157 | - public function setUrl($url) { |
|
| 157 | + public function setUrl($url){ |
|
| 158 | 158 | $this->Url = $url; |
| 159 | 159 | return $this; |
| 160 | 160 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | /** |
| 163 | 163 | * @inheritdoc |
| 164 | 164 | */ |
| 165 | - public function setRequest(RequestInterface $Request) { |
|
| 165 | + public function setRequest(RequestInterface $Request){ |
|
| 166 | 166 | $this->Request = $Request; |
| 167 | 167 | return $this; |
| 168 | 168 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | /** |
| 171 | 171 | * @inheritdoc |
| 172 | 172 | */ |
| 173 | - public function setResponse(ResponseInterface $Response) { |
|
| 173 | + public function setResponse(ResponseInterface $Response){ |
|
| 174 | 174 | $this->Response = $Response; |
| 175 | 175 | return $this; |
| 176 | 176 | } |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | public function execute($data = NULL){ |
| 221 | 221 | $data = ($data === NULL?$this->Data:$data); |
| 222 | 222 | $this->configureData($data); |
| 223 | - if ($this->verifyOptions() && is_object($this->Request)) { |
|
| 223 | + if ($this->verifyOptions() && is_object($this->Request)){ |
|
| 224 | 224 | $this->configureRequest(); |
| 225 | 225 | $this->Request->send(); |
| 226 | - }else{ |
|
| 226 | + } else{ |
|
| 227 | 227 | throw new InvalidRequestException(get_called_class(),"Request property not configured"); |
| 228 | 228 | } |
| 229 | 229 | return $this; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | /** |
| 233 | 233 | * @inheritdoc |
| 234 | 234 | */ |
| 235 | - public function authRequired() { |
|
| 235 | + public function authRequired(){ |
|
| 236 | 236 | return $this->_AUTH_REQUIRED; |
| 237 | 237 | } |
| 238 | 238 | |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | * @throws RequiredDataException |
| 243 | 243 | */ |
| 244 | 244 | protected function configureRequest(){ |
| 245 | - if ($this->verifyUrl()) { |
|
| 245 | + if ($this->verifyUrl()){ |
|
| 246 | 246 | $this->Request->setURL($this->Url); |
| 247 | 247 | } |
| 248 | - if ($this->verifyData() && !empty($this->Data)) { |
|
| 248 | + if ($this->verifyData() && !empty($this->Data)){ |
|
| 249 | 249 | $this->Request->setBody($this->Data); |
| 250 | 250 | } |
| 251 | 251 | $this->configureAuth(); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * Configures the authentication header on the Request object |
| 256 | 256 | */ |
| 257 | 257 | protected function configureAuth(){ |
| 258 | - if ($this->authRequired()) { |
|
| 258 | + if ($this->authRequired()){ |
|
| 259 | 259 | $this->Request->addHeader('OAuth-Token', $this->accessToken); |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -292,12 +292,12 @@ discard block |
||
| 292 | 292 | */ |
| 293 | 293 | protected function configureURL(){ |
| 294 | 294 | $url = $this->_URL; |
| 295 | - if ($this->requiresOptions()) { |
|
| 295 | + if ($this->requiresOptions()){ |
|
| 296 | 296 | $urlParts = explode("/", $this->_URL); |
| 297 | 297 | $o = 0; |
| 298 | - foreach ($urlParts as $key => $part) { |
|
| 299 | - if (strpos($part, "$") !== FALSE) { |
|
| 300 | - if (isset($this->Options[$o])) { |
|
| 298 | + foreach ($urlParts as $key => $part){ |
|
| 299 | + if (strpos($part, "$") !== FALSE){ |
|
| 300 | + if (isset($this->Options[$o])){ |
|
| 301 | 301 | $urlParts[$key] = $this->Options[$o]; |
| 302 | 302 | $o++; |
| 303 | 303 | } |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | * @throws RequiredDataException |
| 344 | 344 | */ |
| 345 | 345 | protected function verifyData(){ |
| 346 | - if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)) { |
|
| 346 | + if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)){ |
|
| 347 | 347 | $this->verifyDataType(); |
| 348 | 348 | } |
| 349 | 349 | if (!empty($this->_REQUIRED_DATA)){ |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | * @throws RequiredDataException |
| 359 | 359 | */ |
| 360 | 360 | protected function verifyDataType(){ |
| 361 | - if (gettype($this->Data) !== $this->_DATA_TYPE) { |
|
| 361 | + if (gettype($this->Data) !== $this->_DATA_TYPE){ |
|
| 362 | 362 | throw new RequiredDataException(get_called_class(),"Valid DataType is {$this->_DATA_TYPE}"); |
| 363 | 363 | } |
| 364 | 364 | return true; |