bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

splitting out Unirest\File and updating README

Browse Source
This commit is contained in:
Ahmad Nassri
2015-01-14 18:31:21 -05:00
parent ed2a2df982
commit be9bca1d5a
7 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
README.md
View File

@@ -2,38 +2,38 @@
Unirest is a set of lightweight HTTP libraries available in multiple languages, ideal for most applications: Unirest is a set of lightweight HTTP libraries available in multiple languages, ideal for most applications:
* Make `GET`, `POST`, `PUT`, `PATCH`, `DELETE` requests * Utility methods to call `GET`, `HEAD`, `POST`, `PUT`, `DELETE`, `CONNECT`, `OPTIONS`, `TRACE`, `PATCH` requests
* It supports form parameters, file uploads and custom body entities * Supports form parameters, file uploads and custom body entities
* Supports gzip * Supports gzip
* Supports Basic Authentication natively * Supports Basic Authentication natively
* Customizable timeout * Customizable timeout
* Customizable default headers for every request (DRY) * Customizable default headers for every request (DRY)
* Automatic JSON parsing into a native object for JSON responses * Automatic JSON parsing into a native object for JSON responses
Created with love by [thefosk](https://github.com/thefosk) @ [mashape.com](https://mashape.com) Created with love by [Mashape](https://www.mashape.com)
--- ---
**To the community**: At this time Unirest-PHP only support syncronous requests, and I would really love to implement asynchronous support. If you guys have any feedback or ideas please comment on issue <a href="https://github.com/Mashape/unirest-php/issues/23">#23</a>. **To the community**: At this time Unirest-PHP only support syncronous requests, and I would really love to implement asynchronous support. If you guys have any feedback or ideas please comment on issue [#23](https://github.com/Mashape/unirest-php/issues/23).
--- ---
### Install with Composer ### Install with Composer
If you're using [Composer](https://github.com/composer/composer) to manage If you're using [Composer](https://getcomposer.org/) to manage dependencies, you can add Unirest with it.
dependencies, you can add Unirest with it.
```javascript ```javascript
{ {
"require" : { "require" : {
"mashape/unirest-php" : "dev-master" "mashape/unirest-php" : "2.0.*"
}, },
"autoload": { "autoload": {
"psr-0": {"Unirest": "lib/"} "psr-0": {"Unirest": "src/"}
} }
} }
``` ```
### Install source from GitHub ### Install source from GitHub
Unirest-PHP requires PHP `v5.3+`. Download the PHP library from Github, and require in your script like so: Unirest-PHP requires PHP `v5.3+`. Download the PHP library from Github, and require in your script like so:
To install the source code: To install the source code:
@@ -45,7 +45,7 @@ $ git clone git@github.com:Mashape/unirest-php.git
And include it in your scripts: And include it in your scripts:
```bash ```bash
require_once '/path/to/unirest-php/lib/Unirest.php'; require_once '/path/to/unirest-php/src/Unirest.php';
``` ```
## Creating Request ## Creating Request
@@ -53,17 +53,15 @@ require_once '/path/to/unirest-php/lib/Unirest.php';
So you're probably wondering how using Unirest makes creating requests in PHP easier, let's look at a working example: So you're probably wondering how using Unirest makes creating requests in PHP easier, let's look at a working example:
```php ```php
$response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ), $headers = array("Accept" => "application/json");
array( $body = array("foo" => "hellow", "bar" => "world");
"parameter" => 23,
"foo" => "bar"
)
);
$response->code; // HTTP Status code $response = Unirest\Request::post("http://httpbin.org/post", $headers, $body);
$response->headers; // Headers
$response->body; // Parsed body $response->code; // HTTP Status code
$response->raw_body; // Unparsed body $response->headers; // Headers
$response->body; // Parsed body
$response->raw_body; // Unparsed body
``` ```
### File Uploads ### File Uploads
@@ -71,24 +69,20 @@ $response->raw_body; // Unparsed body
To upload files in a multipart form representation use the return value of `Unirest::file($path)` as the value of a parameter: To upload files in a multipart form representation use the return value of `Unirest::file($path)` as the value of a parameter:
```php ```php
$response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ), $headers = array("Accept" => "application/json");
array( $body = array("file" => Unirest\File::add("/tmp/file.txt"));
"file" => Unirest::file("/tmp/file.txt") // Tells Unirest where the file is located
) $response = Unirest\Request::post("http://httpbin.org/post", $headers, $body);
);
``` ```
### Custom Entity Body ### Custom Entity Body
Sending a custom body such as a JSON Object rather than a string or form style parameters we utilize json_encode for the body: Sending a custom body such as a JSON Object rather than a string or form style parameters we utilize json_encode for the body:
```php ```php
$response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ), $headers = array("Accept" => "application/json");
json_encode( $body = json_encode(array("foo" => "hellow", "bar" => "world"));
array(
"parameter" => "value", $response = Unirest\Request::post("http://httpbin.org/post", $headers, $body);
"foo" => "bar"
)
)
);
``` ```
### Basic Authentication ### Basic Authentication
@@ -96,16 +90,17 @@ $response = Unirest::post("http://httpbin.org/post", array( "Accept" => "applica
Authenticating the request with basic authentication can be done by providing the `username` and `password` arguments: Authenticating the request with basic authentication can be done by providing the `username` and `password` arguments:
```php ```php
$response = Unirest::get("http://httpbin.org/get", null, null, "username", "password"); $response = Unirest\Request::get("http://httpbin.org/get", null, null, "username", "password");
``` ```
# Request # Request
```php ```php
Unirest::get($url, $headers = array(), $parameters = NULL, $username = NULL, $password = NULL) Unirest\Request::get($url, $headers = array(), $parameters = NULL, $username = NULL, $password = NULL)
Unirest::post($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL) Unirest\Request::post($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
Unirest::put($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL) Unirest\Request::put($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
Unirest::patch($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL) Unirest\Request::patch($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
Unirest::delete($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL) Unirest\Request::delete($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
``` ```
- `url` - Endpoint, address, or uri to be acted upon and requested information from. - `url` - Endpoint, address, or uri to be acted upon and requested information from.
@@ -115,6 +110,7 @@ Unirest::delete($url, $headers = array(), $body = NULL, $username = NULL, $passw
- `password` - Basic Authentication password - `password` - Basic Authentication password
# Response # Response
Upon recieving a response Unirest returns the result in the form of an Object, this object should always have the same keys for each language regarding to the response details. Upon recieving a response Unirest returns the result in the form of an Object, this object should always have the same keys for each language regarding to the response details.
- `code` - HTTP Response Status Code (Example `200`) - `code` - HTTP Response Status Code (Example `200`)
@@ -131,7 +127,7 @@ You can set some advanced configuration to tune Unirest-PHP:
You can set a custom timeout value (in **seconds**): You can set a custom timeout value (in **seconds**):
```php ```php
Unirest::timeout(5); // 5s timeout Unirest\Request::timeout(5); // 5s timeout
``` ```
### Default Request Headers ### Default Request Headers
@@ -139,14 +135,14 @@ Unirest::timeout(5); // 5s timeout
You can set default headers that will be sent on every request: You can set default headers that will be sent on every request:
```php ```php
Unirest::defaultHeader("Header1", "Value1"); Unirest\Request::defaultHeader("Header1", "Value1");
Unirest::defaultHeader("Header2", "Value2"); Unirest\Request::defaultHeader("Header2", "Value2");
``` ```
You can clear the default headers anytime with: You can clear the default headers anytime with:
```php ```php
Unirest::clearDefaultHeaders(); Unirest\Request::clearDefaultHeaders();
``` ```
### SSL validation ### SSL validation
@@ -154,7 +150,7 @@ Unirest::clearDefaultHeaders();
You can explicitly enable or disable SSL certificate validation when consuming an SSL protected endpoint: You can explicitly enable or disable SSL certificate validation when consuming an SSL protected endpoint:
```php ```php
Unirest::verifyPeer(false); // Disables SSL cert validation Unirest\Request::verifyPeer(false); // Disables SSL cert validation
``` ```
By default is `true`. By default is `true`.

1
src/Unirest.php
View File

@@ -1,5 +1,6 @@
<?php <?php
require_once dirname(__FILE__) . '/Unirest/File.php';
require_once dirname(__FILE__) . '/Unirest/Method.php'; require_once dirname(__FILE__) . '/Unirest/Method.php';
require_once dirname(__FILE__) . '/Unirest/Response.php'; require_once dirname(__FILE__) . '/Unirest/Response.php';
require_once dirname(__FILE__) . '/Unirest/Request.php'; require_once dirname(__FILE__) . '/Unirest/Request.php';

19
src/Unirest/File.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
namespace Unirest;
class File
{
/**
* Prepares a file for upload. To be used inside the parameters declaration for a request.
* @param string $path The file path
*/
public static function add($filename, $mimetype = '', $postname = '')
{
if (function_exists('curl_file_create')) {
return curl_file_create($filename, $mimetype = '', $postname = '');
} else {
return sprintf('@%s;filename=%s;type=%s', $filename, $postname ?: basename($filename), $mimetype);
}
}
}

3
src/Unirest/Method.php
View File

@@ -20,9 +20,6 @@ interface Method
const OPTIONS = 'OPTIONS'; const OPTIONS = 'OPTIONS';
const TRACE = 'TRACE'; const TRACE = 'TRACE';
// RFC3744
const ACL = 'ACL';
// RFC3253 // RFC3253
const BASELINE = 'BASELINE'; const BASELINE = 'BASELINE';

13
src/Unirest/Request.php
View File

@@ -173,19 +173,6 @@ class Request
return self::send(Method::TRACE, $url, $body, $headers, $username, $password); return self::send(Method::TRACE, $url, $body, $headers, $username, $password);
} }
/**
* Prepares a file for upload. To be used inside the parameters declaration for a request.
* @param string $path The file path
*/
public static function file($filename, $mimetype = '', $postname = '')
{
if (function_exists('curl_file_create')) {
return curl_file_create($filename, $mimetype = '', $postname = '');
} else {
return sprintf('@%s;filename=%s;type=%s', $filename, $postname ?: basename($filename), $mimetype);
}
}
/** /**
* This function is useful for serializing multidimensional arrays, and avoid getting * This function is useful for serializing multidimensional arrays, and avoid getting
* the 'Array to string conversion' notice * the 'Array to string conversion' notice

4
src/Unirest/Response.php
View File

@@ -4,7 +4,6 @@ namespace Unirest;
class Response class Response
{ {
public $code; public $code;
public $raw_body; public $raw_body;
public $body; public $body;
@@ -39,9 +38,8 @@ class Response
if (function_exists('http_parse_headers')) { if (function_exists('http_parse_headers')) {
return http_parse_headers($raw_headers); return http_parse_headers($raw_headers);
} else { } else {
$headers = array();
$key = ''; $key = '';
$headers = array();
foreach (explode("\n", $raw_headers) as $i => $h) { foreach (explode("\n", $raw_headers) as $i => $h) {
$h = explode(':', $h, 2); $h = explode(':', $h, 2);

8
tests/Unirest/RequestTest.php
View File

@@ -4,11 +4,11 @@ require_once __DIR__ . '/../../src/Unirest.php';
define('UPLOAD_FIXTURE', dirname(__DIR__) . '/fixtures/upload.txt'); define('UPLOAD_FIXTURE', dirname(__DIR__) . '/fixtures/upload.txt');
use Unirest\File as File;
use Unirest\Request as Request; use Unirest\Request as Request;
class UnirestTest extends \PHPUnit_Framework_TestCase class UnirestTest extends \PHPUnit_Framework_TestCase
{ {
public function testGet() public function testGet()
{ {
$response = Request::get('http://httpbin.org/get?name=Mark', array( $response = Request::get('http://httpbin.org/get?name=Mark', array(
@@ -197,7 +197,7 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
public function testHttpBuildQueryWhenCurlFile() public function testHttpBuildQueryWhenCurlFile()
{ {
$file = Request::file(UPLOAD_FIXTURE); $file = File::add(UPLOAD_FIXTURE);
$body = array( $body = array(
'to' => 'mail@mailinator.com', 'to' => 'mail@mailinator.com',
'from' => 'mail@mailinator.com', 'from' => 'mail@mailinator.com',
@@ -214,7 +214,7 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
'Accept' => 'application/json' 'Accept' => 'application/json'
), array( ), array(
'name' => 'Mark', 'name' => 'Mark',
'file' => Request::file(UPLOAD_FIXTURE) 'file' => File::add(UPLOAD_FIXTURE)
)); ));
$this->assertEquals(200, $response->code); $this->assertEquals(200, $response->code);
@@ -231,7 +231,7 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
'Accept' => 'application/json' 'Accept' => 'application/json'
), array( ), array(
'name' => 'Mark', 'name' => 'Mark',
'files[owl.gif]' => Request::file(UPLOAD_FIXTURE) 'files[owl.gif]' => File::add(UPLOAD_FIXTURE)
)); ));
$this->assertEquals(200, $response->code); $this->assertEquals(200, $response->code);