Skip to content

Commit 4f33cb3

Browse files
committed
Merge branch 'master' into issue94-patch
# Conflicts: # lib/Response.php
2 parents ee8ca8d + 15fa0d2 commit 4f33cb3

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

lib/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public function makeAllRequests(array $requests = [])
346346
if (empty($requests)) {
347347
$requests = $this->savedRequests;
348348
}
349-
list ($channels, $multiHandle) = $this->createCurlMultiHandle($requests);
349+
list($channels, $multiHandle) = $this->createCurlMultiHandle($requests);
350350

351351
// running all requests
352352
$isRunning = null;

lib/Response.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function headers($assoc = false)
8585

8686
/**
8787
* Returns response headers as associative array
88-
*
88+
*
8989
* @param array $headers
9090
*
9191
* @return array
@@ -102,7 +102,7 @@ function ($result, $header) {
102102
return $result;
103103
}
104104

105-
list ($key, $value) = explode(':', $header, 2);
105+
list($key, $value) = explode(':', $header, 2);
106106
$result[trim($key)] = trim($value);
107107

108108
return $result;

test/unit/FilesExistTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ public function testFileArePresentInRepo()
2828
#$this->assertTrue($composeExists);
2929
}
3030
}
31-

test/unit/LicenceYearTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ public function testConstructor()
1717

1818
$this->assertEquals($expected, $copyright);
1919
}
20-
2120
}

0 commit comments

Comments
 (0)