Skip to content

Commit 73476ac

Browse files
author
Martin Brecht-Precht
committed
Updated dependencies.
Updated readme. Added company root namespace.
1 parent 402a20e commit 73476ac

File tree

8 files changed

+82
-81
lines changed

8 files changed

+82
-81
lines changed

‎README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ require_once('path/to/vendor/autoload.php');
3333
#### Preparing the HTTP client
3434

3535
```{php}
36-
use JsonHttpClient;
37-
use BasicHttpClient\Request\Authentication;
38-
use BasicHttpClient\Request\Message;
36+
use Markenwerk\JsonHttpClient;
37+
use Markenwerk\BasicHttpClient\Request\Authentication;
38+
use Markenwerk\BasicHttpClient\Request\Message;
3939
4040
// Instantiating a basic HTTP client with the endpoints URL
4141
// If the endpoint uses the `HTTPS` schema a `HttpsTransport` instance will be used automatically.
@@ -113,7 +113,7 @@ The following example shows the usage with a more detailed configuration.
113113
#### Configuring a HTTP Transport instance
114114

115115
```{php}
116-
use BasicHttpClient\Request\Transport\HttpTransport;
116+
use Markenwerk\BasicHttpClient\Request\Transport\HttpTransport;
117117
118118
// Configuring a Transport instance
119119
$transport = new HttpTransport();
@@ -129,7 +129,7 @@ $transport
129129
#### Configuring a HTTPS Transport instance
130130

131131
```{php}
132-
use BasicHttpClient\Request\Transport\HttpsTransport;
132+
use Markenwerk\BasicHttpClient\Request\Transport\HttpsTransport;
133133
134134
// Configuring a Transport instance
135135
$transport = new HttpsTransport();
@@ -146,10 +146,10 @@ $transport
146146
#### Configuring a Message instance with Body
147147

148148
```{php}
149-
use BasicHttpClient\Request\Message\Cookie\Cookie;
150-
use BasicHttpClient\Request\Message\Header\Header;
151-
use BasicHttpClient\Request\Message\Message;
152-
use JsonHttpClient\Request\Message\Body\JsonBody;
149+
use Markenwerk\BasicHttpClient\Request\Message\Cookie\Cookie;
150+
use Markenwerk\BasicHttpClient\Request\Message\Header\Header;
151+
use Markenwerk\BasicHttpClient\Request\Message\Message;
152+
use Markenwerk\JsonHttpClient\Request\Message\Body\JsonBody;
153153
154154
// Configuring a message Body instance
155155
$messageBody = new JsonBody(array(
@@ -195,9 +195,9 @@ $message->addAdditionalHeader(new Header('Custom-Header', array('AnotherCustomHe
195195
For more information about the usage of the URL object please take a look at the [PHP URL Util](https://github.com/markenwerk/php-url-util) project.
196196

197197
```{php}
198-
use BasicHttpClient\Request\Authentication\BasicAuthentication;
199-
use JsonHttpClient\Request\JsonRequest;
200-
use Url\Url;
198+
use Markenwerk\BasicHttpClient\Request\Authentication\BasicAuthentication;
199+
use Markenwerk\JsonHttpClient\Request\JsonRequest;
200+
use Markenwerk\UrlUtil\Url;
201201
202202
// Setting up the endpoints URL
203203
$url = new Url('https://john:secret@yourapihere-com-98yq3775xff0.runscope.net:443/path/to/resource?arg1=123#fragment');
@@ -239,8 +239,8 @@ You can add one or more Authentication instances to every Request instance. At t
239239
Required credentials are a *username* and a *password* that get provided to the class constructor as arguments.
240240

241241
```{php}
242-
use BasicHttpClient\Request\Authentication\BasicAuthentication;
243-
use JsonHttpClient\Request\JsonRequest;
242+
use Markenwerk\BasicHttpClient\Request\Authentication\BasicAuthentication;
243+
use Markenwerk\JsonHttpClient\Request\JsonRequest;
244244
245245
// Configuring the authentication
246246
$basicAuthentication = new BasicAuthentication('username', 'password');
@@ -255,8 +255,8 @@ $response = $request->addAuthentication($basicAuthentication);
255255
Required credentials are a *Certificate Authority Certificate*, a *Client Certificate* and the password that is used to decrypt the Client Certificate that get provided to the class constructor as arguments.
256256

257257
```{php}
258-
use BasicHttpClient\Request\Authentication\ClientCertificateAuthentication;
259-
use JsonHttpClient\Request\JsonRequest;
258+
use Markenwerk\BasicHttpClient\Request\Authentication\ClientCertificateAuthentication;
259+
use Markenwerk\JsonHttpClient\Request\JsonRequest;
260260
261261
// Configuring the authentication
262262
$clientCertificateAuthentication = new ClientCertificateAuthentication(
@@ -279,7 +279,7 @@ $response = $request->addAuthentication($clientCertificateAuthentication);
279279
If using the `JsonHttpClient` the response object is returned by the termination methods listed above. If directly using the JsonRequest instance, you can get the JsonResponse object via a getter.
280280

281281
```{php}
282-
// Getting the response BasicHttpClient\Response\JsonResponse object
282+
// Getting the response Markenwerk\BasicHttpClient\Response\JsonResponse object
283283
$response = $request->getResponse();
284284
285285
// Reading the HTTP status code as integer; will return `200`
@@ -288,7 +288,7 @@ echo print_r($response->getStatusCode(), true) . PHP_EOL;
288288
// Reading the HTTP status text as string; will return `HTTP/1.1 200 OK`
289289
echo print_r($response->getStatusText(), true) . PHP_EOL;
290290
291-
// Reading the HTTP response headers as array of BasicHttpClient\Response\Header\Header objects
291+
// Reading the HTTP response headers as array of Markenwerk\BasicHttpClient\Response\Header\Header objects
292292
echo print_r($response->getHeaders(), true) . PHP_EOL;
293293
294294
// Reading the HTTP response body as associative array
@@ -311,7 +311,7 @@ echo print_r($request->getEffectiveStatus(), true) . PHP_EOL;
311311
// Getting the effective raw request headers as string
312312
echo print_r($request->getEffectiveRawHeader(), true) . PHP_EOL;
313313
314-
// Getting the effective request headers as array of `BasicHttpClient\Request\Message\Header\Header` objects
314+
// Getting the effective request headers as array of `Markenwerk\BasicHttpClient\Request\Message\Header\Header` objects
315315
echo print_r($request->getEffectiveHeaders(), true) . PHP_EOL.PHP_EOL;
316316
```
317317

@@ -320,7 +320,7 @@ echo print_r($request->getEffectiveHeaders(), true) . PHP_EOL.PHP_EOL;
320320
## Getting some transactional statistics
321321

322322
```{php}
323-
// Getting the statistics BasicHttpClient\Response\Statistics\Statistics object
323+
// Getting the statistics Markenwerk\BasicHttpClient\Response\Statistics\Statistics object
324324
$statistics = $request->getResponse()->getStatistics();
325325
326326
// Reading the redirection URL if the server responds with an redirect HTTP header and
@@ -360,13 +360,13 @@ You can find more information about [PHP Common Exceptions at Github](https://gi
360360

361361
In general you should expect that any setter method could thrown an `\InvalidArgumentException`. The following exceptions could get thrown while using PHP Basic HTTP Client.
362362

363-
- `CommonException\IoException\FileNotFoundException` on configuring a `ClientCertificateAuthentication`instance
364-
- `CommonException\IoException\FileReadableException` on configuring a `ClientCertificateAuthentication`instance
365-
- `BasicHttpClient\Exception\HttpRequestAuthenticationException` on performing a request
366-
- `BasicHttpClient\Exception\HttpRequestException` on performing a request
367-
- `CommonException\NetworkException\ConnectionTimeoutException` on performing a request
368-
- `CommonException\NetworkException\CurlException` on performing a request
369-
- `BasicHttpClient\Exception\HttpResponseException` if parsing the JSON response body fails
363+
- `Markenwerk\CommonException\IoException\FileNotFoundException` on configuring a `ClientCertificateAuthentication`instance
364+
- `Markenwerk\CommonException\IoException\FileReadableException` on configuring a `ClientCertificateAuthentication`instance
365+
- `Markenwerk\BasicHttpClient\Exception\HttpRequestAuthenticationException` on performing a request
366+
- `Markenwerk\BasicHttpClient\Exception\HttpRequestException` on performing a request
367+
- `Markenwerk\CommonException\NetworkException\ConnectionTimeoutException` on performing a request
368+
- `Markenwerk\CommonException\NetworkException\CurlException` on performing a request
369+
- `Markenwerk\BasicHttpClient\Exception\HttpResponseException` if parsing the JSON response body fails
370370

371371
---
372372

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
],
2222
"autoload": {
2323
"psr-4": {
24-
"JsonHttpClient\\": "src/"
24+
"Markenwerk\\JsonHttpClient\\": "src/"
2525
}
2626
},
2727
"require": {
2828
"php": ">=5.3",
29-
"markenwerk/basic-http-client": "~2.0"
29+
"markenwerk/basic-http-client": "~3.0"
3030
},
3131
"require-dev": {
3232
"phpunit/phpunit": "~4.8",

‎detaild.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
namespace Project;
44

5-
use BasicHttpClient\Request\Authentication\BasicAuthentication;
6-
use BasicHttpClient\Request\Authentication\ClientCertificateAuthentication;
7-
use BasicHttpClient\Request\Message\Cookie\Cookie;
8-
use BasicHttpClient\Request\Message\Header\Header;
9-
use BasicHttpClient\Request\Message\Message;
10-
use BasicHttpClient\Request\Transport\HttpsTransport;
11-
use JsonHttpClient\Request\Message\Body\JsonBody;
12-
use JsonHttpClient\Request\JsonRequest;
13-
use Url\Url;
5+
use Markenwerk\BasicHttpClient\Request\Authentication\BasicAuthentication;
6+
use Markenwerk\BasicHttpClient\Request\Message\Cookie\Cookie;
7+
use Markenwerk\BasicHttpClient\Request\Message\Header\Header;
8+
use Markenwerk\BasicHttpClient\Request\Message\Message;
9+
use Markenwerk\BasicHttpClient\Request\Transport\HttpsTransport;
10+
use Markenwerk\JsonHttpClient\Request\Message\Body\JsonBody;
11+
use Markenwerk\JsonHttpClient\Request\JsonRequest;
12+
use Markenwerk\UrlUtil\Url;
1413

1514
require_once('vendor/autoload.php');
1615

@@ -44,7 +43,7 @@
4443
$url = new Url('https://yourapihere-com-98yq3775xff0.runscope.net/');
4544

4645
$request = new JsonRequest();
47-
$response = $request
46+
$request
4847
->setUserAgent('PHP JSON HTTP Client Test 1.0')
4948
->setUrl($url)
5049
->addAuthentication(new BasicAuthentication('username', 'password'))

‎src/JsonHttpClient.php

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<?php
22

3-
namespace JsonHttpClient;
3+
namespace Markenwerk\JsonHttpClient;
44

5-
use BasicHttpClient\HttpClientInterface;
6-
use BasicHttpClient\Request\Message\Header\Header;
7-
use BasicHttpClient\Request\RequestInterface;
8-
use BasicHttpClient\Request\Message\Message;
9-
use BasicHttpClient\Request\Transport\HttpsTransport;
10-
use BasicHttpClient\Request\Transport\HttpTransport;
11-
use BasicHttpClient\Response\ResponseInterface;
12-
use JsonHttpClient\Request\JsonRequest;
13-
use JsonHttpClient\Request\Message\Body\JsonBody;
14-
use Url\Url;
5+
use Markenwerk\BasicHttpClient\HttpClientInterface;
6+
use Markenwerk\BasicHttpClient\Request\Message\Header\Header;
7+
use Markenwerk\BasicHttpClient\Request\RequestInterface;
8+
use Markenwerk\BasicHttpClient\Request\Message\Message;
9+
use Markenwerk\BasicHttpClient\Request\Transport\HttpsTransport;
10+
use Markenwerk\BasicHttpClient\Request\Transport\HttpTransport;
11+
use Markenwerk\BasicHttpClient\Response\ResponseInterface;
12+
use Markenwerk\CommonException\NetworkException\Base\NetworkException;
13+
use Markenwerk\CommonException\NetworkException\ConnectionTimeoutException;
14+
use Markenwerk\JsonHttpClient\Request\JsonRequest;
15+
use Markenwerk\JsonHttpClient\Request\Message\Body\JsonBody;
16+
use Markenwerk\UrlUtil\Url;
1517

1618
/**
1719
* Class JsonHttpClient
1820
*
19-
* @package BasicHttpClient
21+
* @package Markenwerk\JsonHttpClient
2022
*/
2123
class JsonHttpClient implements HttpClientInterface
2224
{
@@ -60,8 +62,8 @@ public function getRequest()
6062
/**
6163
* @param string[] $queryParameters
6264
* @return ResponseInterface
63-
* @throws \CommonException\NetworkException\Base\NetworkException
64-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
65+
* @throws NetworkException
66+
* @throws ConnectionTimeoutException
6567
*/
6668
public function get(array $queryParameters = null)
6769
{
@@ -76,8 +78,8 @@ public function get(array $queryParameters = null)
7678
/**
7779
* @param string[] $queryParameters
7880
* @return ResponseInterface
79-
* @throws \CommonException\NetworkException\Base\NetworkException
80-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
81+
* @throws NetworkException
82+
* @throws ConnectionTimeoutException
8183
*/
8284
public function head(array $queryParameters = null)
8385
{
@@ -92,8 +94,8 @@ public function head(array $queryParameters = null)
9294
/**
9395
* @param array $postData
9496
* @return ResponseInterface
95-
* @throws \CommonException\NetworkException\Base\NetworkException
96-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
97+
* @throws NetworkException
98+
* @throws ConnectionTimeoutException
9799
*/
98100
public function post(array $postData = null)
99101
{
@@ -109,8 +111,8 @@ public function post(array $postData = null)
109111
/**
110112
* @param array $putData
111113
* @return ResponseInterface
112-
* @throws \CommonException\NetworkException\Base\NetworkException
113-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
114+
* @throws NetworkException
115+
* @throws ConnectionTimeoutException
114116
*/
115117
public function put(array $putData = null)
116118
{
@@ -126,8 +128,8 @@ public function put(array $putData = null)
126128
/**
127129
* @param array $patchData
128130
* @return ResponseInterface
129-
* @throws \CommonException\NetworkException\Base\NetworkException
130-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
131+
* @throws NetworkException
132+
* @throws ConnectionTimeoutException
131133
*/
132134
public function patch(array $patchData = null)
133135
{
@@ -143,8 +145,8 @@ public function patch(array $patchData = null)
143145
/**
144146
* @param string[] $queryParameters
145147
* @return ResponseInterface
146-
* @throws \CommonException\NetworkException\Base\NetworkException
147-
* @throws \CommonException\NetworkException\ConnectionTimeoutException
148+
* @throws NetworkException
149+
* @throws ConnectionTimeoutException
148150
*/
149151
public function delete(array $queryParameters = null)
150152
{

‎src/Request/JsonRequest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace JsonHttpClient\Request;
3+
namespace Markenwerk\JsonHttpClient\Request;
44

5-
use BasicHttpClient\Request\AbstractRequest;
6-
use BasicHttpClient\Response\ResponseInterface;
7-
use JsonHttpClient\Response\JsonResponse;
5+
use Markenwerk\BasicHttpClient\Request\AbstractRequest;
6+
use Markenwerk\BasicHttpClient\Response\ResponseInterface;
7+
use Markenwerk\JsonHttpClient\Response\JsonResponse;
88

99
/**
1010
* Class JsonRequest
1111
*
12-
* @package BasicHttpClient\Request
12+
* @package Markenwerk\JsonHttpClient\Request
1313
*/
1414
class JsonRequest extends AbstractRequest
1515
{

‎src/Request/Message/Body/JsonBody.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace JsonHttpClient\Request\Message\Body;
3+
namespace Markenwerk\JsonHttpClient\Request\Message\Body;
44

5-
use BasicHttpClient\Exception\HttpRequestMessageException;
6-
use BasicHttpClient\Request\Message\Body\BodyInterface;
5+
use Markenwerk\BasicHttpClient\Exception\HttpRequestMessageException;
6+
use Markenwerk\BasicHttpClient\Request\Message\Body\BodyInterface;
77

88
/**
99
* Class JsonBody
1010
*
11-
* @package BasicHttpClient\Request\Message\Body
11+
* @package Markenwerk\JsonHttpClient\Request\Message\Body
1212
*/
1313
class JsonBody implements BodyInterface
1414
{

‎src/Response/JsonResponse.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace JsonHttpClient\Response;
3+
namespace Markenwerk\JsonHttpClient\Response;
44

5-
use BasicHttpClient\Exception\HttpResponseException;
6-
use BasicHttpClient\Response\AbstractResponse;
5+
use Markenwerk\BasicHttpClient\Exception\HttpResponseException;
6+
use Markenwerk\BasicHttpClient\Response\AbstractResponse;
77

88
/**
99
* Class JsonResponse
1010
*
11-
* @package BasicHttpClient\Response
11+
* @package Markenwerk\JsonHttpClient\Response
1212
*/
1313
class JsonResponse extends AbstractResponse
1414
{

‎test.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
require_once('vendor/autoload.php');
66

7-
use JsonHttpClient;
8-
use BasicHttpClient\Request\Authentication;
9-
use BasicHttpClient\Request\Message;
7+
use Markenwerk\JsonHttpClient;
8+
use Markenwerk\BasicHttpClient\Request\Authentication;
9+
use Markenwerk\BasicHttpClient\Request\Message;
1010

1111
// Instantiating a basic HTTP client with the endpoints URL
1212
// If the endpoint uses the `HTTPS` schema a `HttpsTransport` instance will be used automatically.
@@ -17,12 +17,12 @@
1717
->getRequest()
1818
->addAuthentication(new Authentication\BasicAuthentication('username', 'password'));
1919

20-
$response = $client->get(array(
20+
$client->get(array(
2121
'paramName1' => 'paramValue1',
2222
'paramName2' => 'paramValue2'
2323
));
2424

25-
$response = $client->post(array(
25+
$client->post(array(
2626
'paramName1' => 'paramValue1',
2727
'paramName2' => 'paramValue2',
2828
'paramName3' => array(

0 commit comments

Comments
 (0)