@@ -29,6 +29,9 @@ |
||
29 | 29 | */ |
30 | 30 | protected $reason = 'Unknown'; |
31 | 31 | |
32 | + /** |
|
33 | + * @param string $message |
|
34 | + */ |
|
32 | 35 | public function __construct($message, $type, $data = null, $code = 0) { |
33 | 36 | if ($type !== null) { |
34 | 37 | $this->type = $type; |
@@ -30,15 +30,15 @@ |
||
30 | 30 | protected $reason = 'Unknown'; |
31 | 31 | |
32 | 32 | public function __construct($message, $type, $data = null, $code = 0) { |
33 | - if ($type !== null) { |
|
33 | + if($type !== null) { |
|
34 | 34 | $this->type = $type; |
35 | 35 | } |
36 | 36 | |
37 | - if ($code !== null) { |
|
37 | + if($code !== null) { |
|
38 | 38 | $this->code = $code; |
39 | 39 | } |
40 | 40 | |
41 | - if ($message !== null) { |
|
41 | + if($message !== null) { |
|
42 | 42 | $this->reason = $message; |
43 | 43 | } |
44 | 44 |
@@ -1,6 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -class Requests_Exception_Transport_cURL extends Requests_Exception_Transport { |
|
3 | +class Requests_Exception_Transport_cURL extends Requests_Exception_Transport |
|
4 | +{ |
|
4 | 5 | |
5 | 6 | const EASY = 'cURLEasy'; |
6 | 7 | const MULTI = 'cURLMulti'; |
@@ -29,16 +30,20 @@ discard block |
||
29 | 30 | */ |
30 | 31 | protected $reason = 'Unknown'; |
31 | 32 | |
32 | - public function __construct($message, $type, $data = null, $code = 0) { |
|
33 | - if ($type !== null) { |
|
33 | + public function __construct($message, $type, $data = null, $code = 0) |
|
34 | + { |
|
35 | + if ($type !== null) |
|
36 | + { |
|
34 | 37 | $this->type = $type; |
35 | 38 | } |
36 | 39 | |
37 | - if ($code !== null) { |
|
40 | + if ($code !== null) |
|
41 | + { |
|
38 | 42 | $this->code = $code; |
39 | 43 | } |
40 | 44 | |
41 | - if ($message !== null) { |
|
45 | + if ($message !== null) |
|
46 | + { |
|
42 | 47 | $this->reason = $message; |
43 | 48 | } |
44 | 49 | |
@@ -49,7 +54,8 @@ discard block |
||
49 | 54 | /** |
50 | 55 | * Get the error message |
51 | 56 | */ |
52 | - public function getReason() { |
|
57 | + public function getReason() |
|
58 | + { |
|
53 | 59 | return $this->reason; |
54 | 60 | } |
55 | 61 |
@@ -29,16 +29,16 @@ |
||
29 | 29 | */ |
30 | 30 | protected $reason = 'Unknown'; |
31 | 31 | |
32 | - public function __construct($message, $type, $data = null, $code = 0) { |
|
33 | - if ($type !== null) { |
|
32 | + public function __construct($message, $type, $data = NULL, $code = 0) { |
|
33 | + if ($type !== NULL) { |
|
34 | 34 | $this->type = $type; |
35 | 35 | } |
36 | 36 | |
37 | - if ($code !== null) { |
|
37 | + if ($code !== NULL) { |
|
38 | 38 | $this->code = $code; |
39 | 39 | } |
40 | 40 | |
41 | - if ($message !== null) { |
|
41 | + if ($message !== NULL) { |
|
42 | 42 | $this->reason = $message; |
43 | 43 | } |
44 | 44 |
@@ -19,6 +19,7 @@ |
||
19 | 19 | * @param string $hook Hook name |
20 | 20 | * @param callback $callback Function/method to call on event |
21 | 21 | * @param int $priority Priority number. <0 is executed earlier, >0 is executed later |
22 | + * @return void |
|
22 | 23 | */ |
23 | 24 | public function register($hook, $callback, $priority = 0); |
24 | 25 |
@@ -12,7 +12,8 @@ |
||
12 | 12 | * @package Requests |
13 | 13 | * @subpackage Utilities |
14 | 14 | */ |
15 | -interface Requests_Hooker { |
|
15 | +interface Requests_Hooker |
|
16 | +{ |
|
16 | 17 | /** |
17 | 18 | * Register a callback for a hook |
18 | 19 | * |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | |
4 | -class SetLocation extends AbstractRequest { |
|
4 | +class SetLocation extends AbstractRequest |
|
5 | +{ |
|
5 | 6 | /** |
6 | 7 | * @var Location |
7 | 8 | */ |
@@ -3,37 +3,37 @@ |
||
3 | 3 | |
4 | 4 | class UpdateLocation extends AbstractRequest { |
5 | 5 | /** |
6 | - * @var Location |
|
7 | - */ |
|
8 | - public $location; |
|
9 | - /** |
|
10 | - * @return Location |
|
11 | - */ |
|
12 | - public function getLocation() |
|
13 | - { |
|
14 | - return $this->location; |
|
15 | - } |
|
16 | - /** |
|
17 | - * @param Location $location |
|
18 | - */ |
|
19 | - public function setLocation($location) |
|
20 | - { |
|
21 | - $this->location = $location; |
|
22 | - } |
|
6 | + * @var Location |
|
7 | + */ |
|
8 | + public $location; |
|
9 | + /** |
|
10 | + * @return Location |
|
11 | + */ |
|
12 | + public function getLocation() |
|
13 | + { |
|
14 | + return $this->location; |
|
15 | + } |
|
16 | + /** |
|
17 | + * @param Location $location |
|
18 | + */ |
|
19 | + public function setLocation($location) |
|
20 | + { |
|
21 | + $this->location = $location; |
|
22 | + } |
|
23 | 23 | |
24 | - function getApiEndPoint() |
|
25 | - { |
|
26 | - return '/v2/users/location'; |
|
27 | - } |
|
28 | - function getPayload() |
|
29 | - { |
|
30 | - return array( |
|
24 | + function getApiEndPoint() |
|
25 | + { |
|
26 | + return '/v2/users/location'; |
|
27 | + } |
|
28 | + function getPayload() |
|
29 | + { |
|
30 | + return array( |
|
31 | 31 | "location" => $this->getLocation()->toArray(), |
32 | - ); |
|
33 | - } |
|
34 | - function getMethod() |
|
35 | - { |
|
36 | - return 'PUT'; |
|
37 | - } |
|
32 | + ); |
|
33 | + } |
|
34 | + function getMethod() |
|
35 | + { |
|
36 | + return 'PUT'; |
|
37 | + } |
|
38 | 38 | } |
39 | 39 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | { |
37 | 37 | $str = ''; |
38 | 38 | $max = mb_strlen($keyspace, '8bit') - 1; |
39 | - for ($i = 0; $i < $length; ++$i) { |
|
39 | + for($i = 0; $i < $length; ++$i) { |
|
40 | 40 | $str .= $keyspace[random_int(0, $max)]; |
41 | 41 | } |
42 | 42 | return $str; |
@@ -1,6 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -class CreateUser extends AbstractRequest { |
|
3 | +class CreateUser extends AbstractRequest |
|
4 | +{ |
|
4 | 5 | /** |
5 | 6 | * @var Location |
6 | 7 | */ |
@@ -25,7 +26,7 @@ discard block |
||
25 | 26 | return $this->deviceUid; |
26 | 27 | } |
27 | 28 | public function setDeviceUid($deviceUid) |
28 | - { |
|
29 | + { |
|
29 | 30 | $this->deviceUid = $deviceUid; |
30 | 31 | } |
31 | 32 | public function generateDeviceUid() |
@@ -36,7 +37,8 @@ discard block |
||
36 | 37 | { |
37 | 38 | $str = ''; |
38 | 39 | $max = mb_strlen($keyspace, '8bit') - 1; |
39 | - for ($i = 0; $i < $length; ++$i) { |
|
40 | + for ($i = 0; $i < $length; ++$i) |
|
41 | + { |
|
40 | 42 | $str .= $keyspace[random_int(0, $max)]; |
41 | 43 | } |
42 | 44 | return $str; |
@@ -33,6 +33,9 @@ |
||
33 | 33 | return $this->random_str(64, 'abcdef0123456789'); |
34 | 34 | } |
35 | 35 | |
36 | + /** |
|
37 | + * @param integer $length |
|
38 | + */ |
|
36 | 39 | private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') |
37 | 40 | { |
38 | 41 | $str = ''; |
@@ -1,53 +1,53 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | class CreateUser extends AbstractRequest { |
4 | - /** |
|
5 | - * @var Location |
|
6 | - */ |
|
7 | - private $location; |
|
8 | - private $deviceUid; |
|
9 | - /** |
|
10 | - * @return Location |
|
11 | - */ |
|
12 | - private function getLocation() |
|
13 | - { |
|
14 | - return $this->location; |
|
15 | - } |
|
16 | - /** |
|
17 | - * @param Location $location |
|
18 | - */ |
|
19 | - public function setLocation(Location $location) |
|
20 | - { |
|
21 | - $this->location = $location; |
|
22 | - } |
|
23 | - private function getDeviceUid() |
|
24 | - { |
|
4 | + /** |
|
5 | + * @var Location |
|
6 | + */ |
|
7 | + private $location; |
|
8 | + private $deviceUid; |
|
9 | + /** |
|
10 | + * @return Location |
|
11 | + */ |
|
12 | + private function getLocation() |
|
13 | + { |
|
14 | + return $this->location; |
|
15 | + } |
|
16 | + /** |
|
17 | + * @param Location $location |
|
18 | + */ |
|
19 | + public function setLocation(Location $location) |
|
20 | + { |
|
21 | + $this->location = $location; |
|
22 | + } |
|
23 | + private function getDeviceUid() |
|
24 | + { |
|
25 | 25 | return $this->deviceUid; |
26 | 26 | } |
27 | 27 | public function setDeviceUid($deviceUid) |
28 | - { |
|
28 | + { |
|
29 | 29 | $this->deviceUid = $deviceUid; |
30 | 30 | } |
31 | - private function generateDeviceUid() |
|
32 | - { |
|
33 | - return $this->random_str(64, 'abcdef0123456789'); |
|
34 | - } |
|
31 | + private function generateDeviceUid() |
|
32 | + { |
|
33 | + return $this->random_str(64, 'abcdef0123456789'); |
|
34 | + } |
|
35 | 35 | |
36 | - private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') |
|
37 | - { |
|
38 | - $str = ''; |
|
39 | - $max = mb_strlen($keyspace, '8bit') - 1; |
|
40 | - for ($i = 0; $i < $length; ++$i) { |
|
41 | - $str .= $keyspace[rand(0, $max)]; |
|
42 | - } |
|
43 | - return $str; |
|
44 | - } |
|
45 | - public function getApiEndPoint() |
|
46 | - { |
|
47 | - return '/v2/users'; |
|
48 | - } |
|
49 | - public function getPayload() |
|
50 | - { |
|
36 | + private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') |
|
37 | + { |
|
38 | + $str = ''; |
|
39 | + $max = mb_strlen($keyspace, '8bit') - 1; |
|
40 | + for ($i = 0; $i < $length; ++$i) { |
|
41 | + $str .= $keyspace[rand(0, $max)]; |
|
42 | + } |
|
43 | + return $str; |
|
44 | + } |
|
45 | + public function getApiEndPoint() |
|
46 | + { |
|
47 | + return '/v2/users'; |
|
48 | + } |
|
49 | + public function getPayload() |
|
50 | + { |
|
51 | 51 | if(!isset($this->deviceUid)) |
52 | 52 | { |
53 | 53 | $this->setDeviceUid($this->generateDeviceUid()); |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | "client_id" => self::CLIENTID, |
59 | 59 | "device_uid" => $this->getDeviceUid(), |
60 | 60 | ); |
61 | - } |
|
62 | - public function getMethod() |
|
63 | - { |
|
64 | - return 'POST'; |
|
65 | - } |
|
61 | + } |
|
62 | + public function getMethod() |
|
63 | + { |
|
64 | + return 'POST'; |
|
65 | + } |
|
66 | 66 | } |
@@ -7,22 +7,22 @@ discard block |
||
7 | 7 | |
8 | 8 | public $url; |
9 | 9 | |
10 | - function setUrl ($url) |
|
10 | + function setUrl($url) |
|
11 | 11 | { |
12 | 12 | $this->url = $url; |
13 | 13 | } |
14 | 14 | |
15 | - function getUrl () |
|
15 | + function getUrl() |
|
16 | 16 | { |
17 | 17 | return $this->url; |
18 | 18 | } |
19 | 19 | |
20 | - function setLastPostId ($lastPostId) |
|
20 | + function setLastPostId($lastPostId) |
|
21 | 21 | { |
22 | 22 | $this->lastPostId = $lastPostId; |
23 | 23 | } |
24 | 24 | |
25 | - function getlastPostId () |
|
25 | + function getlastPostId() |
|
26 | 26 | { |
27 | 27 | return $this->lastPostId; |
28 | 28 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $apiEndPoint = $this->getUrl(); |
33 | 33 | //echo $GLOBALS['lastPostId']; |
34 | - if ($this->getLastPostId() != "") { |
|
34 | + if($this->getLastPostId() != "") { |
|
35 | 35 | $apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId(); |
36 | 36 | } |
37 | 37 | return $apiEndPoint; |
@@ -31,7 +31,8 @@ |
||
31 | 31 | { |
32 | 32 | $apiEndPoint = $this->getUrl(); |
33 | 33 | //echo $GLOBALS['lastPostId']; |
34 | - if ($this->getLastPostId() != "") { |
|
34 | + if ($this->getLastPostId() != "") |
|
35 | + { |
|
35 | 36 | $apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId(); |
36 | 37 | } |
37 | 38 | return $apiEndPoint; |
@@ -4,25 +4,25 @@ discard block |
||
4 | 4 | { |
5 | 5 | public $lastPostId; |
6 | 6 | |
7 | - /** |
|
8 | - * @var Location |
|
9 | - */ |
|
10 | - public $location; |
|
11 | - public $url; |
|
7 | + /** |
|
8 | + * @var Location |
|
9 | + */ |
|
10 | + public $location; |
|
11 | + public $url; |
|
12 | 12 | |
13 | 13 | |
14 | - function setUrl ($url) |
|
15 | - { |
|
16 | - $this->url = $url; |
|
17 | - } |
|
14 | + function setUrl ($url) |
|
15 | + { |
|
16 | + $this->url = $url; |
|
17 | + } |
|
18 | 18 | |
19 | - function getUrl () |
|
20 | - { |
|
21 | - return $this->url; |
|
22 | - } |
|
19 | + function getUrl () |
|
20 | + { |
|
21 | + return $this->url; |
|
22 | + } |
|
23 | 23 | |
24 | - function setLastPostId ($lastPostId) |
|
25 | - { |
|
24 | + function setLastPostId ($lastPostId) |
|
25 | + { |
|
26 | 26 | $this->lastPostId = $lastPostId; |
27 | 27 | } |
28 | 28 | |
@@ -31,38 +31,38 @@ discard block |
||
31 | 31 | return $this->lastPostId; |
32 | 32 | } |
33 | 33 | |
34 | - function getApiEndPoint() |
|
35 | - { |
|
36 | - $apiEndPoint = $this->getUrl(); |
|
34 | + function getApiEndPoint() |
|
35 | + { |
|
36 | + $apiEndPoint = $this->getUrl(); |
|
37 | 37 | |
38 | - if ($this->getLastPostId() != "") { |
|
38 | + if ($this->getLastPostId() != "") { |
|
39 | 39 | $apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId(); |
40 | 40 | } |
41 | - return $apiEndPoint; |
|
42 | - } |
|
43 | - function getPayload() |
|
44 | - { |
|
45 | - if($this->version == 'v3') |
|
46 | - { |
|
47 | - $this->location = new Location(); |
|
48 | - $this->location->setLat(52.520006); |
|
49 | - $this->location->setLng(13.404954); |
|
50 | - $this->location->setCityName('Berlin'); |
|
41 | + return $apiEndPoint; |
|
42 | + } |
|
43 | + function getPayload() |
|
44 | + { |
|
45 | + if($this->version == 'v3') |
|
46 | + { |
|
47 | + $this->location = new Location(); |
|
48 | + $this->location->setLat(52.520006); |
|
49 | + $this->location->setLng(13.404954); |
|
50 | + $this->location->setCityName('Berlin'); |
|
51 | 51 | |
52 | 52 | |
53 | - return array( |
|
54 | - "location" => $this->location->toArray(), |
|
55 | - "stickies" => 'false', |
|
56 | - ); |
|
57 | - } |
|
58 | - else |
|
59 | - { |
|
60 | - return array( |
|
61 | - ); |
|
62 | - } |
|
63 | - } |
|
64 | - function getMethod() |
|
65 | - { |
|
66 | - return 'GET'; |
|
67 | - } |
|
53 | + return array( |
|
54 | + "location" => $this->location->toArray(), |
|
55 | + "stickies" => 'false', |
|
56 | + ); |
|
57 | + } |
|
58 | + else |
|
59 | + { |
|
60 | + return array( |
|
61 | + ); |
|
62 | + } |
|
63 | + } |
|
64 | + function getMethod() |
|
65 | + { |
|
66 | + return 'GET'; |
|
67 | + } |
|
68 | 68 | } |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | |
4 | -class Upvote extends AbstractRequest { |
|
4 | +class Upvote extends AbstractRequest |
|
5 | +{ |
|
5 | 6 | |
6 | 7 | function getApiEndPoint() |
7 | 8 | { |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <?php |
2 | 2 | class Upvote extends AbstractRequest { |
3 | 3 | |
4 | - public $postId; |
|
4 | + public $postId; |
|
5 | 5 | |
6 | - function getApiEndPoint() |
|
7 | - { |
|
8 | - return '/v2/posts/' . $this->postId . '/upvote'; |
|
9 | - } |
|
10 | - function getPayload() |
|
11 | - { |
|
12 | - return array( |
|
6 | + function getApiEndPoint() |
|
7 | + { |
|
8 | + return '/v2/posts/' . $this->postId . '/upvote'; |
|
9 | + } |
|
10 | + function getPayload() |
|
11 | + { |
|
12 | + return array( |
|
13 | 13 | "reason_code" => -1, |
14 | - ); |
|
15 | - } |
|
16 | - function getMethod() |
|
17 | - { |
|
18 | - return 'PUT'; |
|
19 | - } |
|
14 | + ); |
|
15 | + } |
|
16 | + function getMethod() |
|
17 | + { |
|
18 | + return 'PUT'; |
|
19 | + } |
|
20 | 20 | } |
21 | 21 |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @return Requests_Cookie |
37 | 37 | */ |
38 | 38 | public function normalize_cookie($cookie, $key = null) { |
39 | - if ($cookie instanceof Requests_Cookie) { |
|
39 | + if($cookie instanceof Requests_Cookie) { |
|
40 | 40 | return $cookie; |
41 | 41 | } |
42 | 42 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @return string Item value |
72 | 72 | */ |
73 | 73 | public function offsetGet($key) { |
74 | - if (!isset($this->cookies[$key])) { |
|
74 | + if(!isset($this->cookies[$key])) { |
|
75 | 75 | return null; |
76 | 76 | } |
77 | 77 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param string $value Item value |
88 | 88 | */ |
89 | 89 | public function offsetSet($key, $value) { |
90 | - if ($key === null) { |
|
90 | + if($key === null) { |
|
91 | 91 | throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset'); |
92 | 92 | } |
93 | 93 | |
@@ -134,21 +134,21 @@ discard block |
||
134 | 134 | * @param array $options |
135 | 135 | */ |
136 | 136 | public function before_request($url, &$headers, &$data, &$type, &$options) { |
137 | - if (!$url instanceof Requests_IRI) { |
|
137 | + if(!$url instanceof Requests_IRI) { |
|
138 | 138 | $url = new Requests_IRI($url); |
139 | 139 | } |
140 | 140 | |
141 | - if (!empty($this->cookies)) { |
|
141 | + if(!empty($this->cookies)) { |
|
142 | 142 | $cookies = array(); |
143 | - foreach ($this->cookies as $key => $cookie) { |
|
143 | + foreach($this->cookies as $key => $cookie) { |
|
144 | 144 | $cookie = $this->normalize_cookie($cookie, $key); |
145 | 145 | |
146 | 146 | // Skip expired cookies |
147 | - if ($cookie->is_expired()) { |
|
147 | + if($cookie->is_expired()) { |
|
148 | 148 | continue; |
149 | 149 | } |
150 | 150 | |
151 | - if ($cookie->domain_matches($url->host)) { |
|
151 | + if($cookie->domain_matches($url->host)) { |
|
152 | 152 | $cookies[] = $cookie->format_for_header(); |
153 | 153 | } |
154 | 154 | } |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | * |
163 | 163 | * @var Requests_Response $response |
164 | 164 | */ |
165 | - public function before_redirect_check(Requests_Response &$return) { |
|
165 | + public function before_redirect_check(Requests_Response&$return) { |
|
166 | 166 | $url = $return->url; |
167 | - if (!$url instanceof Requests_IRI) { |
|
167 | + if(!$url instanceof Requests_IRI) { |
|
168 | 168 | $url = new Requests_IRI($url); |
169 | 169 | } |
170 | 170 |
@@ -25,7 +25,8 @@ discard block |
||
25 | 25 | * |
26 | 26 | * @param array $cookies Existing cookie values |
27 | 27 | */ |
28 | - public function __construct($cookies = array()) { |
|
28 | + public function __construct($cookies = array()) |
|
29 | + { |
|
29 | 30 | $this->cookies = $cookies; |
30 | 31 | } |
31 | 32 | |
@@ -35,8 +36,10 @@ discard block |
||
35 | 36 | * @param string|Requests_Cookie $cookie |
36 | 37 | * @return Requests_Cookie |
37 | 38 | */ |
38 | - public function normalize_cookie($cookie, $key = null) { |
|
39 | - if ($cookie instanceof Requests_Cookie) { |
|
39 | + public function normalize_cookie($cookie, $key = null) |
|
40 | + { |
|
41 | + if ($cookie instanceof Requests_Cookie) |
|
42 | + { |
|
40 | 43 | return $cookie; |
41 | 44 | } |
42 | 45 | |
@@ -50,7 +53,8 @@ discard block |
||
50 | 53 | * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie} |
51 | 54 | * @return Requests_Cookie |
52 | 55 | */ |
53 | - public function normalizeCookie($cookie, $key = null) { |
|
56 | + public function normalizeCookie($cookie, $key = null) |
|
57 | + { |
|
54 | 58 | return $this->normalize_cookie($cookie, $key); |
55 | 59 | } |
56 | 60 | |
@@ -60,7 +64,8 @@ discard block |
||
60 | 64 | * @param string $key Item key |
61 | 65 | * @return boolean Does the item exist? |
62 | 66 | */ |
63 | - public function offsetExists($key) { |
|
67 | + public function offsetExists($key) |
|
68 | + { |
|
64 | 69 | return isset($this->cookies[$key]); |
65 | 70 | } |
66 | 71 | |
@@ -70,8 +75,10 @@ discard block |
||
70 | 75 | * @param string $key Item key |
71 | 76 | * @return string Item value |
72 | 77 | */ |
73 | - public function offsetGet($key) { |
|
74 | - if (!isset($this->cookies[$key])) { |
|
78 | + public function offsetGet($key) |
|
79 | + { |
|
80 | + if (!isset($this->cookies[$key])) |
|
81 | + { |
|
75 | 82 | return null; |
76 | 83 | } |
77 | 84 | |
@@ -86,8 +93,10 @@ discard block |
||
86 | 93 | * @param string $key Item name |
87 | 94 | * @param string $value Item value |
88 | 95 | */ |
89 | - public function offsetSet($key, $value) { |
|
90 | - if ($key === null) { |
|
96 | + public function offsetSet($key, $value) |
|
97 | + { |
|
98 | + if ($key === null) |
|
99 | + { |
|
91 | 100 | throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset'); |
92 | 101 | } |
93 | 102 | |
@@ -99,7 +108,8 @@ discard block |
||
99 | 108 | * |
100 | 109 | * @param string $key |
101 | 110 | */ |
102 | - public function offsetUnset($key) { |
|
111 | + public function offsetUnset($key) |
|
112 | + { |
|
103 | 113 | unset($this->cookies[$key]); |
104 | 114 | } |
105 | 115 | |
@@ -108,7 +118,8 @@ discard block |
||
108 | 118 | * |
109 | 119 | * @return ArrayIterator |
110 | 120 | */ |
111 | - public function getIterator() { |
|
121 | + public function getIterator() |
|
122 | + { |
|
112 | 123 | return new ArrayIterator($this->cookies); |
113 | 124 | } |
114 | 125 | |
@@ -117,7 +128,8 @@ discard block |
||
117 | 128 | * |
118 | 129 | * @param Requests_Hooker $hooks Hooking system |
119 | 130 | */ |
120 | - public function register(Requests_Hooker $hooks) { |
|
131 | + public function register(Requests_Hooker $hooks) |
|
132 | + { |
|
121 | 133 | $hooks->register('requests.before_request', array($this, 'before_request')); |
122 | 134 | $hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check')); |
123 | 135 | } |
@@ -133,22 +145,28 @@ discard block |
||
133 | 145 | * @param string $type |
134 | 146 | * @param array $options |
135 | 147 | */ |
136 | - public function before_request($url, &$headers, &$data, &$type, &$options) { |
|
137 | - if (!$url instanceof Requests_IRI) { |
|
148 | + public function before_request($url, &$headers, &$data, &$type, &$options) |
|
149 | + { |
|
150 | + if (!$url instanceof Requests_IRI) |
|
151 | + { |
|
138 | 152 | $url = new Requests_IRI($url); |
139 | 153 | } |
140 | 154 | |
141 | - if (!empty($this->cookies)) { |
|
155 | + if (!empty($this->cookies)) |
|
156 | + { |
|
142 | 157 | $cookies = array(); |
143 | - foreach ($this->cookies as $key => $cookie) { |
|
158 | + foreach ($this->cookies as $key => $cookie) |
|
159 | + { |
|
144 | 160 | $cookie = $this->normalize_cookie($cookie, $key); |
145 | 161 | |
146 | 162 | // Skip expired cookies |
147 | - if ($cookie->is_expired()) { |
|
163 | + if ($cookie->is_expired()) |
|
164 | + { |
|
148 | 165 | continue; |
149 | 166 | } |
150 | 167 | |
151 | - if ($cookie->domain_matches($url->host)) { |
|
168 | + if ($cookie->domain_matches($url->host)) |
|
169 | + { |
|
152 | 170 | $cookies[] = $cookie->format_for_header(); |
153 | 171 | } |
154 | 172 | } |
@@ -162,9 +180,11 @@ discard block |
||
162 | 180 | * |
163 | 181 | * @var Requests_Response $response |
164 | 182 | */ |
165 | - public function before_redirect_check(Requests_Response &$return) { |
|
183 | + public function before_redirect_check(Requests_Response &$return) |
|
184 | + { |
|
166 | 185 | $url = $return->url; |
167 | - if (!$url instanceof Requests_IRI) { |
|
186 | + if (!$url instanceof Requests_IRI) |
|
187 | + { |
|
168 | 188 | $url = new Requests_IRI($url); |
169 | 189 | } |
170 | 190 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @param string|Requests_Cookie $cookie |
36 | 36 | * @return Requests_Cookie |
37 | 37 | */ |
38 | - public function normalize_cookie($cookie, $key = null) { |
|
38 | + public function normalize_cookie($cookie, $key = NULL) { |
|
39 | 39 | if ($cookie instanceof Requests_Cookie) { |
40 | 40 | return $cookie; |
41 | 41 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie} |
51 | 51 | * @return Requests_Cookie |
52 | 52 | */ |
53 | - public function normalizeCookie($cookie, $key = null) { |
|
53 | + public function normalizeCookie($cookie, $key = NULL) { |
|
54 | 54 | return $this->normalize_cookie($cookie, $key); |
55 | 55 | } |
56 | 56 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function offsetGet($key) { |
74 | 74 | if (!isset($this->cookies[$key])) { |
75 | - return null; |
|
75 | + return NULL; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | return $this->cookies[$key]; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param string $value Item value |
88 | 88 | */ |
89 | 89 | public function offsetSet($key, $value) { |
90 | - if ($key === null) { |
|
90 | + if ($key === NULL) { |
|
91 | 91 | throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset'); |
92 | 92 | } |
93 | 93 |
@@ -31,5 +31,5 @@ |
||
31 | 31 | * @see Requests_Hooks::register |
32 | 32 | * @param Requests_Hooks $hooks Hook system |
33 | 33 | */ |
34 | - public function register(Requests_Hooks &$hooks); |
|
34 | + public function register(Requests_Hooks&$hooks); |
|
35 | 35 | } |
36 | 36 | \ No newline at end of file |
@@ -18,7 +18,8 @@ |
||
18 | 18 | * @package Requests |
19 | 19 | * @subpackage Authentication |
20 | 20 | */ |
21 | -interface Requests_Auth { |
|
21 | +interface Requests_Auth |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * Register hooks as needed |
24 | 25 | * |
@@ -30,6 +30,7 @@ |
||
30 | 30 | * |
31 | 31 | * @see Requests_Hooks::register |
32 | 32 | * @param Requests_Hooks $hooks Hook system |
33 | + * @return void |
|
33 | 34 | */ |
34 | 35 | public function register(Requests_Hooks &$hooks); |
35 | 36 | } |
36 | 37 | \ No newline at end of file |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | * @param array|null $args Array of user and password. Must have exactly two elements |
56 | 56 | */ |
57 | 57 | public function __construct($args = null) { |
58 | - if (is_string($args)) { |
|
58 | + if(is_string($args)) { |
|
59 | 59 | $this->proxy = $args; |
60 | 60 | } |
61 | - elseif (is_array($args)) { |
|
62 | - if (count($args) == 1) { |
|
61 | + elseif(is_array($args)) { |
|
62 | + if(count($args) == 1) { |
|
63 | 63 | list($this->proxy) = $args; |
64 | 64 | } |
65 | - elseif (count($args) == 3) { |
|
65 | + elseif(count($args) == 3) { |
|
66 | 66 | list($this->proxy, $this->user, $this->pass) = $args; |
67 | 67 | $this->use_authentication = true; |
68 | 68 | } |
@@ -82,12 +82,12 @@ discard block |
||
82 | 82 | * @see fsockopen_header |
83 | 83 | * @param Requests_Hooks $hooks Hook system |
84 | 84 | */ |
85 | - public function register(Requests_Hooks &$hooks) { |
|
85 | + public function register(Requests_Hooks&$hooks) { |
|
86 | 86 | $hooks->register('curl.before_send', array(&$this, 'curl_before_send')); |
87 | 87 | |
88 | 88 | $hooks->register('fsockopen.remote_socket', array(&$this, 'fsockopen_remote_socket')); |
89 | 89 | $hooks->register('fsockopen.remote_host_path', array(&$this, 'fsockopen_remote_host_path')); |
90 | - if ($this->use_authentication) { |
|
90 | + if($this->use_authentication) { |
|
91 | 91 | $hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header')); |
92 | 92 | } |
93 | 93 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); |
103 | 103 | curl_setopt($handle, CURLOPT_PROXY, $this->proxy); |
104 | 104 | |
105 | - if ($this->use_authentication) { |
|
105 | + if($this->use_authentication) { |
|
106 | 106 | curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY); |
107 | 107 | curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->get_auth_string()); |
108 | 108 | } |
@@ -16,7 +16,8 @@ discard block |
||
16 | 16 | * @subpackage Proxy |
17 | 17 | * @since 1.6 |
18 | 18 | */ |
19 | -class Requests_Proxy_HTTP implements Requests_Proxy { |
|
19 | +class Requests_Proxy_HTTP implements Requests_Proxy |
|
20 | +{ |
|
20 | 21 | /** |
21 | 22 | * Proxy host and port |
22 | 23 | * |
@@ -54,19 +55,25 @@ discard block |
||
54 | 55 | * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`) |
55 | 56 | * @param array|null $args Array of user and password. Must have exactly two elements |
56 | 57 | */ |
57 | - public function __construct($args = null) { |
|
58 | - if (is_string($args)) { |
|
58 | + public function __construct($args = null) |
|
59 | + { |
|
60 | + if (is_string($args)) |
|
61 | + { |
|
59 | 62 | $this->proxy = $args; |
60 | 63 | } |
61 | - elseif (is_array($args)) { |
|
62 | - if (count($args) == 1) { |
|
64 | + elseif (is_array($args)) |
|
65 | + { |
|
66 | + if (count($args) == 1) |
|
67 | + { |
|
63 | 68 | list($this->proxy) = $args; |
64 | 69 | } |
65 | - elseif (count($args) == 3) { |
|
70 | + elseif (count($args) == 3) |
|
71 | + { |
|
66 | 72 | list($this->proxy, $this->user, $this->pass) = $args; |
67 | 73 | $this->use_authentication = true; |
68 | 74 | } |
69 | - else { |
|
75 | + else |
|
76 | + { |
|
70 | 77 | throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs'); |
71 | 78 | } |
72 | 79 | } |
@@ -82,12 +89,14 @@ discard block |
||
82 | 89 | * @see fsockopen_header |
83 | 90 | * @param Requests_Hooks $hooks Hook system |
84 | 91 | */ |
85 | - public function register(Requests_Hooks &$hooks) { |
|
92 | + public function register(Requests_Hooks &$hooks) |
|
93 | + { |
|
86 | 94 | $hooks->register('curl.before_send', array(&$this, 'curl_before_send')); |
87 | 95 | |
88 | 96 | $hooks->register('fsockopen.remote_socket', array(&$this, 'fsockopen_remote_socket')); |
89 | 97 | $hooks->register('fsockopen.remote_host_path', array(&$this, 'fsockopen_remote_host_path')); |
90 | - if ($this->use_authentication) { |
|
98 | + if ($this->use_authentication) |
|
99 | + { |
|
91 | 100 | $hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header')); |
92 | 101 | } |
93 | 102 | } |
@@ -98,11 +107,13 @@ discard block |
||
98 | 107 | * @since 1.6 |
99 | 108 | * @param resource $handle cURL resource |
100 | 109 | */ |
101 | - public function curl_before_send(&$handle) { |
|
110 | + public function curl_before_send(&$handle) |
|
111 | + { |
|
102 | 112 | curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); |
103 | 113 | curl_setopt($handle, CURLOPT_PROXY, $this->proxy); |
104 | 114 | |
105 | - if ($this->use_authentication) { |
|
115 | + if ($this->use_authentication) |
|
116 | + { |
|
106 | 117 | curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY); |
107 | 118 | curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->get_auth_string()); |
108 | 119 | } |
@@ -114,7 +125,8 @@ discard block |
||
114 | 125 | * @since 1.6 |
115 | 126 | * @param string $remote_socket Socket connection string |
116 | 127 | */ |
117 | - public function fsockopen_remote_socket(&$remote_socket) { |
|
128 | + public function fsockopen_remote_socket(&$remote_socket) |
|
129 | + { |
|
118 | 130 | $remote_socket = $this->proxy; |
119 | 131 | } |
120 | 132 | |
@@ -125,7 +137,8 @@ discard block |
||
125 | 137 | * @param string $path Path to send in HTTP request string ("GET ...") |
126 | 138 | * @param string $url Full URL we're requesting |
127 | 139 | */ |
128 | - public function fsockopen_remote_host_path(&$path, $url) { |
|
140 | + public function fsockopen_remote_host_path(&$path, $url) |
|
141 | + { |
|
129 | 142 | $path = $url; |
130 | 143 | } |
131 | 144 | |
@@ -135,7 +148,8 @@ discard block |
||
135 | 148 | * @since 1.6 |
136 | 149 | * @param string $out HTTP header string |
137 | 150 | */ |
138 | - public function fsockopen_header(&$out) { |
|
151 | + public function fsockopen_header(&$out) |
|
152 | + { |
|
139 | 153 | $out .= sprintf("Proxy-Authorization: Basic %s\r\n", base64_encode($this->get_auth_string())); |
140 | 154 | } |
141 | 155 | |
@@ -145,7 +159,8 @@ discard block |
||
145 | 159 | * @since 1.6 |
146 | 160 | * @return string |
147 | 161 | */ |
148 | - public function get_auth_string() { |
|
162 | + public function get_auth_string() |
|
163 | + { |
|
149 | 164 | return $this->user . ':' . $this->pass; |
150 | 165 | } |
151 | 166 | } |
152 | 167 | \ No newline at end of file |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`) |
55 | 55 | * @param array|null $args Array of user and password. Must have exactly two elements |
56 | 56 | */ |
57 | - public function __construct($args = null) { |
|
57 | + public function __construct($args = NULL) { |
|
58 | 58 | if (is_string($args)) { |
59 | 59 | $this->proxy = $args; |
60 | 60 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | elseif (count($args) == 3) { |
66 | 66 | list($this->proxy, $this->user, $this->pass) = $args; |
67 | - $this->use_authentication = true; |
|
67 | + $this->use_authentication = TRUE; |
|
68 | 68 | } |
69 | 69 | else { |
70 | 70 | throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs'); |