chillerlan / php-curl

src/Traits/RequestTrait.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 /**
  * Trait RequestTrait
  */
-trait RequestTrait{
+trait RequestTrait {
 
 	/**
 	 * Path to the CA cert file
@@ -38,7 +38,7 @@ 
 	 * @return \chillerlan\TinyCurl\Response\ResponseInterface
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
-	protected function fetch($url, array $params = [], array $curl_options = []){
+	protected function fetch($url, array $params = [], array $curl_options = []) {
 		$requestOptions               = new RequestOptions;
 		$requestOptions->curl_options = $curl_options;
 		$requestOptions->ca_info      = $this->ca_info;
@@ -53,7 +53,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function setRequestCA($ca_info){
+	protected function setRequestCA($ca_info) {
 		$this->ca_info = $ca_info;
 
 		return $this;

src/URL.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
  * @property array  params
  * @property array  parsedquery
  */
-class URL{
+class URL {
 
 	/**
 	 * @var string
@@ -84,23 +84,23 @@ 
 	 * @param array  $params
 	 * @param string $method
 	 */
-	public function __construct($url, array $params = [], $method = 'GET'){
+	public function __construct($url, array $params = [], $method = 'GET') {
 		$this->url    = $url;
 		$this->params = $params;
 
-		if(in_array(strtoupper($method), ['GET', 'POST'])){
+		if (in_array(strtoupper($method), ['GET', 'POST'])) {
 			$this->method = $method;
 		}
 
 		$url = parse_url($url);
-		$this->host      = !isset($url['host'])      ? null : $url['host'];
-		$this->port      = !isset($url['port'])      ? null : $url['port'];
-		$this->path      = !isset($url['path'])      ? null : $url['path'];
-		$this->scheme    = !isset($url['scheme'])    ? null : $url['scheme'];
-		$this->query     = !isset($url['query'])     ? null : $url['query'];
-		$this->fragment  = !isset($url['fragment'])  ? null : $url['fragment'];
-
-		if($this->query){
+		$this->host      = !isset($url['host']) ? null : $url['host'];
+		$this->port      = !isset($url['port']) ? null : $url['port'];
+		$this->path      = !isset($url['path']) ? null : $url['path'];
+		$this->scheme    = !isset($url['scheme']) ? null : $url['scheme'];
+		$this->query     = !isset($url['query']) ? null : $url['query'];
+		$this->fragment  = !isset($url['fragment']) ? null : $url['fragment'];
+
+		if ($this->query) {
 			parse_str($this->query, $this->parsedquery);
 		}
 
@@ -111,21 +111,21 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get($name){
+	public function __get($name) {
 		return $this->{$name};
 	}
 
 	/**
 	 * @return string
 	 */
-	public function __toString(){
+	public function __toString() {
 		return $this->mergeParams();
 	}
 
 	/**
 	 * @return string
 	 */
-	public function overrideParams(){
+	public function overrideParams() {
 		$url  = $this->getURL();
 		$url .= '?'.http_build_query($this->params);
 
@@ -135,7 +135,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function mergeParams(){
+	public function mergeParams() {
 		$url  = $this->getURL();
 		$url .= '?'.http_build_query(array_merge($this->parsedquery, $this->params));
 
@@ -145,23 +145,23 @@ 
 	/**
 	 * @return string
 	 */
-	protected function getURL(){
+	protected function getURL() {
 		$url = '';
 
-		if($this->scheme){
+		if ($this->scheme) {
 			$url .= $this->scheme.':';
 		}
 
-		if($this->host){
+		if ($this->host) {
 			$url .= '//'.$this->host;
 
-			if($this->port){
+			if ($this->port) {
 				$url .= ':'.$this->port;
 			}
 
 		}
 
-		if($this->path){
+		if ($this->path) {
 			$url .= $this->path;
 		}
 

tests/RequestTest.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use chillerlan\TinyCurl\RequestOptions;
 use chillerlan\TinyCurl\Response\Response;
 use chillerlan\TinyCurl\URL;
-use stdClass;
 
 class RequestTest extends \PHPUnit_Framework_TestCase{
 

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 use chillerlan\TinyCurl\URL;
 use stdClass;
 
-class RequestTest extends \PHPUnit_Framework_TestCase{
+class RequestTest extends \PHPUnit_Framework_TestCase {
 
 	const GW2_APIKEY = '39519066-20B0-5545-9AE2-71109410A2CAF66348DA-50F7-4ACE-9363-B38FD8EE1881';
 	const GW2_ACC_ID = 'A9EAD53E-4157-E111-BBF3-78E7D1936222';
@@ -39,7 +39,7 @@ 
 	 */
 	protected $response;
 
-	protected function setUp(){
+	protected function setUp() {
 
 		$co = [
 			CURLOPT_HTTPHEADER => ['Authorization: Bearer '.self::GW2_APIKEY]
@@ -55,11 +55,11 @@ 
 		$this->requestNoCA = new Request($o2);
 	}
 
-	public function testInstanceWithoutArgsCoverage(){
+	public function testInstanceWithoutArgsCoverage() {
 		$this->assertInstanceOf(Request::class, new Request); // HA HA.
 	}
 
-	public function fetchDataProvider(){
+	public function fetchDataProvider() {
 		return [
 			['https://api.guildwars2.com/v2/account', []],
 			['https://api.guildwars2.com/v2/account?lang=de', []],
@@ -70,7 +70,7 @@ 
 	/**
 	 * @dataProvider fetchDataProvider
 	 */
-	public function testFetchWithCA($url, array $params){
+	public function testFetchWithCA($url, array $params) {
 		$this->response = $this->requestWithCA->fetch(new URL($url, $params));
 
 		$this->assertEquals(0, $this->response->error->code);
@@ -83,7 +83,7 @@ 
 	/**
 	 * @dataProvider fetchDataProvider
 	 */
-	public function testFetchNoCA($url, array $params){
+	public function testFetchNoCA($url, array $params) {
 		$this->response = $this->requestNoCA->fetch(new URL($url, $params));
 
 		$this->assertEquals(0, $this->response->error->code);
@@ -97,7 +97,7 @@ 
 	 * @expectedException \chillerlan\TinyCurl\RequestException
 	 * @expectedExceptionMessage $url
 	 */
-	public function testFetchUrlSchemeException(){
+	public function testFetchUrlSchemeException() {
 		$this->requestWithCA->fetch(new URL('htps://whatever.wat'));
 	}
 
@@ -105,7 +105,7 @@ 
 	 * @expectedException \chillerlan\TinyCurl\Response\ResponseException
 	 * @expectedExceptionMessage $curl
 	 */
-	public function testResponseNoCurlException(){
+	public function testResponseNoCurlException() {
 		$this->response = new Response(null);
 	}
 
@@ -113,7 +113,7 @@ 
 	 * @expectedException \chillerlan\TinyCurl\Response\ResponseException
 	 * @expectedExceptionMessage !$property: foobar
 	 */
-	public function testResponseGetMagicFieldException(){
+	public function testResponseGetMagicFieldException() {
 		var_dump($this->requestWithCA->fetch(new URL('https://api.guildwars2.com/v2/build'))->foobar);
 	}
 

tests/ExtractUrlTest.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 use chillerlan\TinyCurl\Request;
 use chillerlan\TinyCurl\RequestOptions;
 
-class ExtractUrlTest extends \PHPUnit_Framework_TestCase{
+class ExtractUrlTest extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @var \chillerlan\TinyCurl\Request
@@ -26,7 +26,7 @@ 
 	 */
 	protected $requestNoCA;
 
-	protected function setUp(){
+	protected function setUp() {
 		$co = [CURLOPT_FOLLOWLOCATION => false];
 
 		$o1 = new RequestOptions;
@@ -39,7 +39,7 @@ 
 		$this->requestNoCA = new Request($o2);
 	}
 
-	public function shortURLDataProvider(){
+	public function shortURLDataProvider() {
 		return [
 			[
 				[
@@ -75,14 +75,14 @@ 
 	/**
 	 * @dataProvider shortURLDataProvider
 	 */
-	public function testExtractShortUrlWithCA($expected){
+	public function testExtractShortUrlWithCA($expected) {
 			$this->assertEquals($expected, $this->requestWithCA->extractShortUrl($expected[0]));
 		}
 
 	/**
 	 * @dataProvider shortURLDataProvider
 	 */
-		public function testExtractShortUrlNoCA($expected){
+		public function testExtractShortUrlNoCA($expected) {
 			$this->assertEquals($expected, $this->requestNoCA->extractShortUrl($expected[0]));
 		}
 

tests/MultiRequestTest.php

Spacing +14 added lines, -14 removed lines

@@ -15,19 +15,19 @@ 
 use chillerlan\TinyCurl\MultiRequestOptions;
 use stdClass;
 
-class MultiRequestTest extends \PHPUnit_Framework_TestCase{
+class MultiRequestTest extends \PHPUnit_Framework_TestCase {
 
-	protected function getURLs(){
+	protected function getURLs() {
 
 		$ids = [
-			[1,2,6,11,15,23,24,56,57,58,59,60,61,62,63,64,68,69,70,71,72,73,74,75,76],
-			[77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101],
+			[1, 2, 6, 11, 15, 23, 24, 56, 57, 58, 59, 60, 61, 62, 63, 64, 68, 69, 70, 71, 72, 73, 74, 75, 76],
+			[77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101],
 		];
 
 		$urls = [];
 
-		foreach($ids as $chunk){
-			foreach(['de', 'en', 'es', 'fr', 'zh'] as $lang){
+		foreach ($ids as $chunk) {
+			foreach (['de', 'en', 'es', 'fr', 'zh'] as $lang) {
 				$urls[] = 'lang='.$lang.'&ids='.implode(',', $chunk);
 			}
 		}
@@ -35,7 +35,7 @@ 
 		return $urls;
 	}
 
-	public function testInstance(){
+	public function testInstance() {
 		$options = new MultiRequestOptions;
 		$options->handler     = MultiResponseHandlerTest::class;
 		$options->ca_info     = __DIR__.'/test-cacert.pem';
@@ -45,7 +45,7 @@ 
 		$request = new MultiRequest($options);
 		$request->fetch($this->getURLs());
 
-		foreach($request->getResponseData() as $response){
+		foreach ($request->getResponseData() as $response) {
 
 			$this->assertEquals(0, $response->errorcode);
 			$this->assertEquals(200, $response->statuscode);
@@ -56,7 +56,7 @@ 
 
 	}
 
-	public function testInstanceWindowSize(){
+	public function testInstanceWindowSize() {
 		$options = new MultiRequestOptions;
 		$options->handler     = MultiResponseHandlerTest::class;
 		$options->ca_info     = __DIR__.'/test-cacert.pem';
@@ -71,7 +71,7 @@ 
 	 * @expectedException \chillerlan\TinyCurl\RequestException
 	 * @expectedExceptionMessage empty($urls)
 	 */
-	public function testFetchUrlEmptyException(){
+	public function testFetchUrlEmptyException() {
 		(new MultiRequest)->fetch([]);
 	}
 
@@ -79,9 +79,9 @@ 
 	 * @expectedException \chillerlan\TinyCurl\RequestException
 	 * @expectedExceptionMessage !$this->options->handler
 	 */
-	public function testSetHandlerExistsException(){
+	public function testSetHandlerExistsException() {
 		$options = new MultiRequestOptions;
-		$options->handler     = 'foobar';
+		$options->handler = 'foobar';
 
 		new MultiRequest($options);
 	}
@@ -90,9 +90,9 @@ 
 	 * @expectedException \chillerlan\TinyCurl\RequestException
 	 * @expectedExceptionMessage !is_a($handler)
 	 */
-	public function testSetHandlerImplementsException(){
+	public function testSetHandlerImplementsException() {
 		$options = new MultiRequestOptions;
-		$options->handler     = stdClass::class;
+		$options->handler = stdClass::class;
 
 		new MultiRequest($options);
 	}

tests/MultiResponseHandlerTest.php

Spacing +3 added lines, -3 removed lines

@@ -20,14 +20,14 @@ 
 /**
  *
  */
-class MultiResponseHandlerTest implements MultiResponseHandlerInterface{
+class MultiResponseHandlerTest implements MultiResponseHandlerInterface {
 
 	/**
 	 * @var \chillerlan\TinyCurl\MultiRequest
 	 */
 	protected $request;
 
-	public function __construct(MultiRequest $request){
+	public function __construct(MultiRequest $request) {
 		$this->request = $request;
 	}
 
@@ -36,7 +36,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function handleResponse(ResponseInterface $response){
+	public function handleResponse(ResponseInterface $response) {
 		$data = new stdClass;
 		$data->errorcode             = $response->error->code;
 		$data->statuscode            = $response->info->http_code;