Skip to content

Commit 70dd093

Browse files
ianbarberianbarber
committed
Merge pull request googleapis#133 from silvolu/master
Spring cleaning
2 parents 381dbd0 + 42a7a96 commit 70dd093

File tree

6 files changed

+115
-103
lines changed

6 files changed

+115
-103
lines changed

‎src/Google/Http/REST.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public static function execute(Google_Client $client, Google_Http_Request $req)
4444
return self::decodeHttpResponse($httpRequest);
4545
}
4646

47-
4847
/**
4948
* Decode an HTTP Response.
5049
* @static
@@ -57,7 +56,7 @@ public static function decodeHttpResponse($response)
5756
$code = $response->getResponseHttpCode();
5857
$body = $response->getResponseBody();
5958
$decoded = null;
60-
59+
6160
if ((intVal($code)) >= 300) {
6261
$decoded = json_decode($body, true);
6362
$err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
@@ -79,16 +78,14 @@ public static function decodeHttpResponse($response)
7978

8079
throw new Google_Service_Exception($err, $code, null, $errors);
8180
}
82-
81+
8382
// Only attempt to decode the response, if the response code wasn't (204) 'no content'
8483
if ($code != '204') {
8584
$decoded = json_decode($body, true);
8685
if ($decoded === null || $decoded === "") {
8786
throw new Google_Service_Exception("Invalid json in service response: $body");
8887
}
8988

90-
$decoded = isset($decoded['data']) ? $decoded['data'] : $decoded;
91-
9289
if ($response->getExpectedClass()) {
9390
$class = $response->getExpectedClass();
9491
$decoded = new $class($decoded);

‎src/Google/IO/Abstract.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ public function parseHttpResponse($respData, $headerSize)
247247
// only strip this header if the sub-class needs this quirk
248248
if ($this->needsQuirk() && stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
249249
$respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
250+
$headerSize -= strlen(self::CONNECTION_ESTABLISHED);
250251
}
251252

252253
if ($headerSize) {
@@ -277,7 +278,6 @@ public function getHttpResponseHeaders($rawHeaders)
277278
private function parseStringHeaders($rawHeaders)
278279
{
279280
$headers = array();
280-
281281
$responseHeaderLines = explode("\r\n", $rawHeaders);
282282
foreach ($responseHeaderLines as $headerLine) {
283283
if ($headerLine && strpos($headerLine, ':') !== false) {

‎src/Google/Model.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class Google_Model implements ArrayAccess
2727
{
28-
protected $data = array();
28+
protected $modelData = array();
2929
protected $processed = array();
3030

3131
/**
@@ -46,33 +46,33 @@ public function __get($key)
4646
$keyTypeName = $this->keyType($key);
4747
$keyDataType = $this->dataType($key);
4848
if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
49-
if (isset($this->data[$key])) {
50-
$val = $this->data[$key];
49+
if (isset($this->modelData[$key])) {
50+
$val = $this->modelData[$key];
5151
} else {
5252
$val = null;
5353
}
5454

5555
if ($this->isAssociativeArray($val)) {
5656
if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
5757
foreach ($val as $arrayKey => $arrayItem) {
58-
$this->data[$key][$arrayKey] =
58+
$this->modelData[$key][$arrayKey] =
5959
$this->createObjectFromName($keyTypeName, $arrayItem);
6060
}
6161
} else {
62-
$this->data[$key] = $this->createObjectFromName($keyTypeName, $val);
62+
$this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
6363
}
6464
} else if (is_array($val)) {
6565
$arrayObject = array();
6666
foreach ($val as $arrayIndex => $arrayItem) {
6767
$arrayObject[$arrayIndex] =
6868
$this->createObjectFromName($keyTypeName, $arrayItem);
6969
}
70-
$this->data[$key] = $arrayObject;
70+
$this->modelData[$key] = $arrayObject;
7171
}
7272
$this->processed[$key] = true;
7373
}
7474

75-
return $this->data[$key];
75+
return $this->modelData[$key];
7676
}
7777

7878
/**
@@ -95,7 +95,7 @@ protected function mapTypes($array)
9595
$this->$camelKey = $val;
9696
}
9797
}
98-
$this->data = $array;
98+
$this->modelData = $array;
9999
}
100100

101101
/**
@@ -109,7 +109,7 @@ public function toSimpleObject()
109109
$object = new stdClass();
110110

111111
// Process all other data.
112-
foreach ($this->data as $key => $val) {
112+
foreach ($this->modelData as $key => $val) {
113113
$result = $this->getSimpleValue($val);
114114
if ($result !== null) {
115115
$object->$key = $result;
@@ -200,7 +200,7 @@ public function assertIsArray($obj, $method)
200200

201201
public function offsetExists($offset)
202202
{
203-
return isset($this->$offset) || isset($this->data[$offset]);
203+
return isset($this->$offset) || isset($this->modelData[$offset]);
204204
}
205205

206206
public function offsetGet($offset)
@@ -215,14 +215,14 @@ public function offsetSet($offset, $value)
215215
if (property_exists($this, $offset)) {
216216
$this->$offset = $value;
217217
} else {
218-
$this->data[$offset] = $value;
218+
$this->modelData[$offset] = $value;
219219
$this->processed[$offset] = true;
220220
}
221221
}
222222

223223
public function offsetUnset($offset)
224224
{
225-
unset($this->data[$offset]);
225+
unset($this->modelData[$offset]);
226226
}
227227

228228
protected function keyType($key)
@@ -237,11 +237,11 @@ protected function dataType($key)
237237

238238
public function __isset($key)
239239
{
240-
return isset($this->data[$key]);
240+
return isset($this->modelData[$key]);
241241
}
242242

243243
public function __unset($key)
244244
{
245-
unset($this->data[$key]);
245+
unset($this->modelData[$key]);
246246
}
247247
}

‎tests/general/ApiMediaFileUploadTest.php‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,68 +21,75 @@
2121
require_once 'BaseTest.php';
2222
require_once 'Google/Http/MediaFileUpload.php';
2323

24-
class ApiMediaFileUploadTest extends BaseTest {
25-
public function testMediaFile() {
24+
class ApiMediaFileUploadTest extends BaseTest
25+
{
26+
public function testMediaFile()
27+
{
2628
$client = $this->getClient();
2729
$request = new Google_Http_Request('http://www.example.com', 'POST');
28-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', base64_decode('data:image/png;base64,a'));
30+
$media = new Google_Http_MediaFileUpload(
31+
$client,
32+
$request,
33+
'image/png',
34+
base64_decode('data:image/png;base64,a')
35+
);
2936

3037
$this->assertEquals(0, $media->getProgress());
3138
$this->assertGreaterThan(0, strlen($request->getPostBody()));
3239
}
3340

34-
public function testGetUploadType() {
35-
$client = $this->getClient();
36-
$request = new Google_Http_Request('http://www.example.com', 'POST');
41+
public function testGetUploadType()
42+
{
43+
$client = $this->getClient();
44+
$request = new Google_Http_Request('http://www.example.com', 'POST');
3745

38-
// Test resumable upload
39-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
40-
$params = array('mediaUpload' => array('value' => $media));
41-
$this->assertEquals('resumable',
42-
$media->getUploadType(null));
46+
// Test resumable upload
47+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
48+
$params = array('mediaUpload' => array('value' => $media));
49+
$this->assertEquals('resumable', $media->getUploadType(null));
4350

44-
// Test data *only* uploads
45-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
46-
$this->assertEquals('media',
47-
$media->getUploadType(null));
51+
// Test data *only* uploads
52+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
53+
$this->assertEquals('media', $media->getUploadType(null));
4854

49-
// Test multipart uploads
50-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
51-
$this->assertEquals('multipart',
52-
$media->getUploadType(array('a' => 'b')));
53-
}
55+
// Test multipart uploads
56+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
57+
$this->assertEquals('multipart', $media->getUploadType(array('a' => 'b')));
58+
}
5459

55-
public function testResultCode() {
56-
$client = $this->getClient();
57-
$request = new Google_Http_Request('http://www.example.com', 'POST');
60+
public function testResultCode()
61+
{
62+
$client = $this->getClient();
63+
$request = new Google_Http_Request('http://www.example.com', 'POST');
5864

59-
// Test resumable upload
60-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
61-
$this->assertEquals(null, $media->getHttpResultCode());
62-
}
65+
// Test resumable upload
66+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
67+
$this->assertEquals(null, $media->getHttpResultCode());
68+
}
6369

64-
public function testProcess() {
65-
$client = $this->getClient();
66-
$data = 'foo';
70+
public function testProcess()
71+
{
72+
$client = $this->getClient();
73+
$data = 'foo';
6774

68-
// Test data *only* uploads.
69-
$request = new Google_Http_Request('http://www.example.com', 'POST');
70-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
71-
$this->assertEquals($data, $request->getPostBody());
75+
// Test data *only* uploads.
76+
$request = new Google_Http_Request('http://www.example.com', 'POST');
77+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
78+
$this->assertEquals($data, $request->getPostBody());
7279

73-
// Test resumable (meta data) - we want to send the metadata, not the app data.
74-
$request = new Google_Http_Request('http://www.example.com', 'POST');
75-
$reqData = json_encode("hello");
76-
$request->setPostBody($reqData);
77-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, true);
78-
$this->assertEquals(json_decode($reqData), $request->getPostBody());
80+
// Test resumable (meta data) - we want to send the metadata, not the app data.
81+
$request = new Google_Http_Request('http://www.example.com', 'POST');
82+
$reqData = json_encode("hello");
83+
$request->setPostBody($reqData);
84+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, true);
85+
$this->assertEquals(json_decode($reqData), $request->getPostBody());
7986

80-
// Test multipart - we are sending encoded meta data and post data
81-
$request = new Google_Http_Request('http://www.example.com', 'POST');
82-
$reqData = json_encode("hello");
83-
$request->setPostBody($reqData);
84-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
85-
$this->assertContains($reqData, $request->getPostBody());
86-
$this->assertContains(base64_encode($data), $request->getPostBody());
87-
}
87+
// Test multipart - we are sending encoded meta data and post data
88+
$request = new Google_Http_Request('http://www.example.com', 'POST');
89+
$reqData = json_encode("hello");
90+
$request->setPostBody($reqData);
91+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
92+
$this->assertContains($reqData, $request->getPostBody());
93+
$this->assertContains(base64_encode($data), $request->getPostBody());
94+
}
8895
}

‎tests/general/ApiModelTest.php‎

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,46 @@ class ApiModelTest extends BaseTest
2525
{
2626
public function testModelMutation()
2727
{
28-
$data = json_decode('{"kind": "calendar#event",
29-
"etag": "\"-kteSF26GsdKQ5bfmcd4H3_-u3g/MTE0NTUyNTAxOTk0MjAwMA\"",
30-
"id": "1234566",
31-
"status": "confirmed",
32-
"htmlLink": "https://www.google.com/calendar/event?eid=NWdpMmFjNDkzbm5yZzh2N2poZXNhZmdldDggaWFuLmJhcmJlckBt",
33-
"created": "2006-04-13T14:22:08.000Z",
34-
"updated": "2006-04-20T09:23:39.942Z",
35-
"summary": "Evening Jolt Q3 CTFL",
36-
"description": "6.30 - Adminning\n9.30 - Game",
37-
"creator": {
38-
"email": "ian@example.com",
39-
"displayName": "Ian Test",
40-
"self": true
41-
},
42-
"organizer": {
43-
"email": "ian@example.com",
44-
"displayName": "Ian Test",
45-
"self": true
46-
},
47-
"start": {
48-
"date": "2006-04-23"
49-
},
50-
"end": {
51-
"date": "2006-04-24"
52-
},
53-
"iCalUID": "5gi2ac493nnrfdfd7jhesafget8@google.com",
54-
"sequence": 0,
55-
"reminders": {
56-
"useDefault": false
57-
}}', true);
28+
$htmlLink = 'https://www.google.com/calendar/event?'
29+
. 'eid=NWdpMmFjNDkzbm5yZzh2N2poZXNhZmdldDggaWFuLmJhcmJlckBt';
30+
$data = json_decode(
31+
'{
32+
"kind": "calendar#event",
33+
"etag": "\"-kteSF26GsdKQ5bfmcd4H3_-u3g/MTE0NTUyNTAxOTk0MjAwMA\"",
34+
"id": "1234566",
35+
"status": "confirmed",
36+
"htmlLink": "' . $htmlLink . '",
37+
"created": "2006-04-13T14:22:08.000Z",
38+
"updated": "2006-04-20T09:23:39.942Z",
39+
"summary": "Evening Jolt Q3 CTFL",
40+
"description": "6.30 - Adminning\n9.30 - Game",
41+
"creator": {
42+
"email": "ian@example.com",
43+
"displayName": "Ian Test",
44+
"self": true
45+
},
46+
"organizer": {
47+
"email": "ian@example.com",
48+
"displayName": "Ian Test",
49+
"self": true
50+
},
51+
"start": {
52+
"date": "2006-04-23"
53+
},
54+
"end": {
55+
"date": "2006-04-24"
56+
},
57+
"iCalUID": "5gi2ac493nnrfdfd7jhesafget8@google.com",
58+
"sequence": 0,
59+
"reminders": {
60+
"useDefault": false
61+
}
62+
}',
63+
true
64+
);
5865
$event = new Google_Service_Calendar_Event($data);
5966
$date = new Google_Service_Calendar_EventDateTime();
67+
date_default_timezone_set('UTC');
6068
$dateString = Date("c");
6169
$summary = "hello";
6270
$date->setDate($dateString);

‎tests/general/IoTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ public function responseChecker($io)
215215
$this->assertEquals(null, json_decode($body, true));
216216

217217
// Test transforms from proxies.
218-
$rawHeaders = "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n";
219-
$size = strlen($rawHeaders);
218+
$rawHeaders = Google_IO_Abstract::CONNECTION_ESTABLISHED
219+
. "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n";
220+
$headersSize = strlen($rawHeaders);
220221
$rawBody = "{}";
221222

222-
$rawResponse = Google_IO_Abstract::CONNECTION_ESTABLISHED
223-
. "$rawHeaders\r\n$rawBody";
224-
list($headers, $body) = $io->parseHttpResponse($rawResponse, $size);
223+
$rawResponse = "$rawHeaders\r\n$rawBody";
224+
list($headers, $body) = $io->parseHttpResponse($rawResponse, $headersSize);
225225
$this->assertEquals(1, sizeof($headers));
226226
$this->assertEquals(array(), json_decode($body, true));
227227
}

0 commit comments

Comments
 (0)