geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-13 11:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use namespaces

Browse Source
This commit is contained in:
Zach Borboa
2014-05-22 21:29:24 -07:00
parent 66bd2887da
commit 360058c529
19 changed files with 148 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/coinbase_account_balance.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('API_KEY', '');
define('API_SECRET', '');
examples/coinbase_spot_rate.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$curl = new Curl();
$curl->get('https://coinbase.com/api/v1/prices/spot_rate');
examples/deviant_art_rss.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$curl = new Curl();
$curl->get('http://backend.deviantart.com/rss.xml', array(
examples/domainr_search_domain_name_availability.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$curl = new Curl();
$curl->get('https://domai.nr/api/json/search', array(
examples/flickr_photo_search.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
function construct_url($photo, $size = 's', $ext = 'jpg')
{
examples/flickr_upload_photo.php
+2 -1
View File
@@ -1,7 +1,8 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
require 'Flickr.class.php';
use \Curl\Curl;
$flickr = new Flickr();
$flickr->authenticate();
examples/github_create_gist.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$content = <<<EOF
<?php
examples/gittip_send_tip.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('GITTIP_USERNAME', 'XXXXXXXXXX');
define('GITTIP_API_KEY', 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX');
examples/google_plus_profile.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('CLIENT_ID', 'XXXXXXXXXXXX.apps.googleusercontent.com');
define('CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXX');
examples/instagram_popular_media.php
+3 -3
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
define('INSTAGRAM_CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
@@ -46,8 +47,7 @@ if (isset($_SESSION['access_token'])) {
'<img alt="" src="' . $media->images->thumbnail->url . '" />' .
'</a>';
}
}
else {
} else {
header('Location: https://api.instagram.com/oauth/authorize/?' . http_build_query(array(
'client_id' => INSTAGRAM_CLIENT_ID,
'redirect_uri' => $redirect_uri,
examples/instagram_search_photos.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
examples/mailchimp_subscribe_email_address.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('MAILCHIMP_API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXX');
$parts = explode('-', MAILCHIMP_API_KEY);
examples/put.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
// curl -X PUT -d "id=1&first_name=Zach&last_name=Borboa" "http://httpbin.org/put"
$curl = new Curl();
examples/reddit_top_pics.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$data = array();
if (isset($_GET['after'])) {
examples/twitter_post_tweet.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
define('API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXX');
define('API_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
examples/youtube_video_count.php
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
require '../src/Curl.class.php';
require '../src/Curl/Curl.php';
use \Curl\Curl;
$video_ids = array(
'9bZkp7q19f0',
src/Curl.class.php → src/Curl/Curl.php
+44 -42
View File
@@ -1,5 +1,7 @@
<?php
namespace Curl;
class Curl
{
const USER_AGENT = 'PHP-Curl-Class/2.0 (+https://github.com/php-curl-class/php-curl-class)';
@@ -338,8 +340,8 @@ class Curl
private function postfields($data)
{
if (is_array($data)) {
if (is_array_multidim($data)) {
$data = http_build_multi_query($data);
if (self::is_array_multidim($data)) {
$data = self::http_build_multi_query($data);
} else {
$binary_data = false;
foreach ($data as $key => $value) {
@@ -354,9 +356,9 @@ class Curl
} elseif (is_string($value) && strpos($value, '@') === 0) {
$binary_data = true;
if (class_exists('CURLFile')) {
$data[$key] = new CURLFile(substr($value, 1));
$data[$key] = new \CURLFile(substr($value, 1));
}
} elseif ($value instanceof CURLFile) {
} elseif ($value instanceof \CURLFile) {
$binary_data = true;
}
}
@@ -423,9 +425,46 @@ class Curl
{
$this->close();
}
public static function is_array_assoc($array)
{
return (bool)count(array_filter(array_keys($array), 'is_string'));
}
public static function is_array_multidim($array)
{
if (!is_array($array)) {
return false;
}
return !(count($array) === count($array, COUNT_RECURSIVE));
}
public static function http_build_multi_query($data, $key = null)
{
$query = array();
if (empty($data)) {
return $key . '=';
}
$is_array_assoc = self::is_array_assoc($data);
foreach ($data as $k => $value) {
if (is_string($value) || is_numeric($value)) {
$brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
$query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
} elseif (is_array($value)) {
$nested = is_null($key) ? $k : $key . '[' . $k . ']';
$query[] = self::http_build_multi_query($value, $nested);
}
}
return implode('&', $query);
}
}
class CaseInsensitiveArray implements ArrayAccess, Countable, Iterator
class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
{
private $container = array();
@@ -494,40 +533,3 @@ class CaseInsensitiveArray implements ArrayAccess, Countable, Iterator
reset($this->container);
}
}
function is_array_assoc($array)
{
return (bool)count(array_filter(array_keys($array), 'is_string'));
}
function is_array_multidim($array)
{
if (!is_array($array)) {
return false;
}
return !(count($array) === count($array, COUNT_RECURSIVE));
}
function http_build_multi_query($data, $key = null)
{
$query = array();
if (empty($data)) {
return $key . '=';
}
$is_array_assoc = is_array_assoc($data);
foreach ($data as $k => $value) {
if (is_string($value) || is_numeric($value)) {
$brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
$query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
} elseif (is_array($value)) {
$nested = is_null($key) ? $k : $key . '[' . $k . ']';
$query[] = http_build_multi_query($value, $nested);
}
}
return implode('&', $query);
}
tests/PHPCurlClass/helper.inc.php → tests/PHPCurlClass/Helper.php
+6 -2
View File
@@ -1,4 +1,8 @@
<?php
namespace Helper;
use Curl\Curl;
class Test
{
const TEST_URL = 'http://127.0.0.1:8000/';
@@ -23,9 +27,9 @@ class Test
function test($instance, $before, $after)
{
$instance->server('request_method', $before);
PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $before);
\PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $before);
$instance->server('request_method', $after);
PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $after);
\PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $after);
}
function create_png()
tests/PHPCurlClass/PHPCurlClassTest.php
+65 -64
View File
@@ -1,9 +1,10 @@
<?php
// Usage: phpunit --verbose run.php
require '../src/Curl.class.php';
require 'helper.inc.php';
require '../src/Curl/Curl.php';
require 'Helper.php';
use \Curl\Curl;
use \Curl\CaseInsensitiveArray;
use \Helper\Test;
class CurlTest extends PHPUnit_Framework_TestCase
{
@@ -14,7 +15,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testArrayAssociative()
{
$this->assertTrue(is_array_assoc(array(
$this->assertTrue(Curl::is_array_assoc(array(
'foo' => 'wibble',
'bar' => 'wubble',
'baz' => 'wobble',
@@ -23,7 +24,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testArrayIndexed()
{
$this->assertFalse(is_array_assoc(array(
$this->assertFalse(Curl::is_array_assoc(array(
'wibble',
'wubble',
'wobble',
@@ -118,7 +119,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
"\r\n" .
'OK';
$reflector = new ReflectionClass('Curl');
$reflector = new ReflectionClass('\Curl\Curl');
$reflection_method = $reflector->getMethod('parseResponse');
$reflection_method->setAccessible(true);
@@ -176,7 +177,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testPostFilePathUpload()
{
$file_path = get_png();
$file_path = Helper\get_png();
$test = new Test();
$this->assertTrue($test->server('post_file_path_upload', 'POST', array(
@@ -191,7 +192,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testPostCurlFileUpload()
{
if (class_exists('CURLFile')) {
$file_path = get_png();
$file_path = Helper\get_png();
$test = new Test();
$this->assertTrue($test->server('post_file_path_upload', 'POST', array(
@@ -220,8 +221,8 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testPutFileHandle()
{
$png = create_png();
$tmp_file = create_tmp_file($png);
$png = Helper\create_png();
$tmp_file = Helper\create_tmp_file($png);
$test = new Test();
$test->curl->setHeader('X-DEBUG-TEST', 'put_file_handle');
@@ -484,7 +485,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testPostFileFormDataContentType()
{
$file_path = get_png();
$file_path = Helper\get_png();
$test = new Test();
$test->server('server', 'POST', array(
@@ -504,7 +505,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
return;
}
$file_path = get_png();
$file_path = Helper\get_png();
$test = new Test();
$test->server('server', 'POST', array(
@@ -701,7 +702,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$error_called,
&$complete_called
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -713,7 +714,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$complete_called,
&$curl
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -724,7 +725,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$error_called,
&$complete_called
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertTrue($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -758,7 +759,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$complete_called,
&$success_called_once
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -772,7 +773,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$curl,
&$error_called_once
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -785,7 +786,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
&$complete_called,
&$complete_called_once
) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertTrue($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -823,21 +824,21 @@ class CurlTest extends PHPUnit_Framework_TestCase
$curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 2000);
$curl->success(function ($instance) use (&$success_called, &$error_called, &$complete_called) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
$success_called = true;
});
$curl->error(function ($instance) use (&$success_called, &$error_called, &$complete_called, &$curl) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertFalse($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
$error_called = true;
});
$curl->complete(function ($instance) use (&$success_called, &$error_called, &$complete_called) {
PHPUnit_Framework_Assert::assertInstanceOf('Curl', $instance);
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
PHPUnit_Framework_Assert::assertFalse($success_called);
PHPUnit_Framework_Assert::assertTrue($error_called);
PHPUnit_Framework_Assert::assertFalse($complete_called);
@@ -892,77 +893,77 @@ class CurlTest extends PHPUnit_Framework_TestCase
public function testRequestMethodSuccessiveGetRequests()
{
$test = new Test();
test($test, 'GET', 'POST');
test($test, 'GET', 'PUT');
test($test, 'GET', 'PATCH');
test($test, 'GET', 'DELETE');
test($test, 'GET', 'HEAD');
test($test, 'GET', 'OPTIONS');
Helper\test($test, 'GET', 'POST');
Helper\test($test, 'GET', 'PUT');
Helper\test($test, 'GET', 'PATCH');
Helper\test($test, 'GET', 'DELETE');
Helper\test($test, 'GET', 'HEAD');
Helper\test($test, 'GET', 'OPTIONS');
}
public function testRequestMethodSuccessivePostRequests()
{
$test = new Test();
test($test, 'POST', 'GET');
test($test, 'POST', 'PUT');
test($test, 'POST', 'PATCH');
test($test, 'POST', 'DELETE');
test($test, 'POST', 'HEAD');
test($test, 'POST', 'OPTIONS');
Helper\test($test, 'POST', 'GET');
Helper\test($test, 'POST', 'PUT');
Helper\test($test, 'POST', 'PATCH');
Helper\test($test, 'POST', 'DELETE');
Helper\test($test, 'POST', 'HEAD');
Helper\test($test, 'POST', 'OPTIONS');
}
public function testRequestMethodSuccessivePutRequests()
{
$test = new Test();
test($test, 'PUT', 'GET');
test($test, 'PUT', 'POST');
test($test, 'PUT', 'PATCH');
test($test, 'PUT', 'DELETE');
test($test, 'PUT', 'HEAD');
test($test, 'PUT', 'OPTIONS');
Helper\test($test, 'PUT', 'GET');
Helper\test($test, 'PUT', 'POST');
Helper\test($test, 'PUT', 'PATCH');
Helper\test($test, 'PUT', 'DELETE');
Helper\test($test, 'PUT', 'HEAD');
Helper\test($test, 'PUT', 'OPTIONS');
}
public function testRequestMethodSuccessivePatchRequests()
{
$test = new Test();
test($test, 'PATCH', 'GET');
test($test, 'PATCH', 'POST');
test($test, 'PATCH', 'PUT');
test($test, 'PATCH', 'DELETE');
test($test, 'PATCH', 'HEAD');
test($test, 'PATCH', 'OPTIONS');
Helper\test($test, 'PATCH', 'GET');
Helper\test($test, 'PATCH', 'POST');
Helper\test($test, 'PATCH', 'PUT');
Helper\test($test, 'PATCH', 'DELETE');
Helper\test($test, 'PATCH', 'HEAD');
Helper\test($test, 'PATCH', 'OPTIONS');
}
public function testRequestMethodSuccessiveDeleteRequests()
{
$test = new Test();
test($test, 'DELETE', 'GET');
test($test, 'DELETE', 'POST');
test($test, 'DELETE', 'PUT');
test($test, 'DELETE', 'PATCH');
test($test, 'DELETE', 'HEAD');
test($test, 'DELETE', 'OPTIONS');
Helper\test($test, 'DELETE', 'GET');
Helper\test($test, 'DELETE', 'POST');
Helper\test($test, 'DELETE', 'PUT');
Helper\test($test, 'DELETE', 'PATCH');
Helper\test($test, 'DELETE', 'HEAD');
Helper\test($test, 'DELETE', 'OPTIONS');
}
public function testRequestMethodSuccessiveHeadRequests()
{
$test = new Test();
test($test, 'HEAD', 'GET');
test($test, 'HEAD', 'POST');
test($test, 'HEAD', 'PUT');
test($test, 'HEAD', 'PATCH');
test($test, 'HEAD', 'DELETE');
test($test, 'HEAD', 'OPTIONS');
Helper\test($test, 'HEAD', 'GET');
Helper\test($test, 'HEAD', 'POST');
Helper\test($test, 'HEAD', 'PUT');
Helper\test($test, 'HEAD', 'PATCH');
Helper\test($test, 'HEAD', 'DELETE');
Helper\test($test, 'HEAD', 'OPTIONS');
}
public function testRequestMethodSuccessiveOptionsRequests()
{
$test = new Test();
test($test, 'OPTIONS', 'GET');
test($test, 'OPTIONS', 'POST');
test($test, 'OPTIONS', 'PUT');
test($test, 'OPTIONS', 'PATCH');
test($test, 'OPTIONS', 'DELETE');
test($test, 'OPTIONS', 'HEAD');
Helper\test($test, 'OPTIONS', 'GET');
Helper\test($test, 'OPTIONS', 'POST');
Helper\test($test, 'OPTIONS', 'PUT');
Helper\test($test, 'OPTIONS', 'PATCH');
Helper\test($test, 'OPTIONS', 'DELETE');
Helper\test($test, 'OPTIONS', 'HEAD');
}
}