diff --git a/examples/coinbase_account_balance.php b/examples/coinbase_account_balance.php index 9814fac..85e9509 100644 --- a/examples/coinbase_account_balance.php +++ b/examples/coinbase_account_balance.php @@ -3,8 +3,8 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('API_KEY', ''); -define('API_SECRET', ''); +const API_KEY = ''; +const API_SECRET = ''; $url = 'https://coinbase.com/api/v1/account/balance'; diff --git a/examples/download_file_with_callback.php b/examples/download_file_with_callback.php index e1af778..5702ecb 100644 --- a/examples/download_file_with_callback.php +++ b/examples/download_file_with_callback.php @@ -4,7 +4,7 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; $curl = new Curl(); -$curl->download('https://secure.php.net/images/logos/php-med-trans.png', function($instance, $tmpfile) { +$curl->download('https://secure.php.net/images/logos/php-med-trans.png', function ($instance, $tmpfile) { $save_to_path = '/tmp/' . basename($instance->url); $fh = fopen($save_to_path, 'wb'); stream_copy_to_stream($tmpfile, $fh); diff --git a/examples/flickr.class.php b/examples/flickr.class.php index 285ca7d..b98274c 100644 --- a/examples/flickr.class.php +++ b/examples/flickr.class.php @@ -1,6 +1,9 @@ farm . '.staticflickr.com/' . $photo->server . '/' . - $photo->id . '_' . $photo->secret . '_' . $size . '.' . $ext; - - return $url; -} - -define('FLICKR_API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const FLICKR_API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); $data = array( 'method' => 'flickr.photos.search', @@ -27,5 +19,9 @@ $curl = new Curl(); $curl->get('https://api.flickr.com/services/rest/', $data); foreach ($curl->response->photos->photo as $photo) { - echo ''; + $size = 's'; + $ext = 'jpg'; + $url = 'http://farm' . $photo->farm . '.staticflickr.com/' . $photo->server . '/' . + $photo->id . '_' . $photo->secret . '_' . $size . '.' . $ext; + echo ''; } diff --git a/examples/flickr_upload_photo.php b/examples/flickr_upload_photo.php index 035a2a2..d638b88 100644 --- a/examples/flickr_upload_photo.php +++ b/examples/flickr_upload_photo.php @@ -3,6 +3,7 @@ require __DIR__ . '/vendor/autoload.php'; require 'flickr.class.php'; use \Curl\Curl; +use \Flickr\Flickr; $flickr = new Flickr(); $flickr->authenticate(); diff --git a/examples/gmail_send_email.php b/examples/gmail_send_email.php index e5a42d4..8d7083d 100644 --- a/examples/gmail_send_email.php +++ b/examples/gmail_send_email.php @@ -3,8 +3,8 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('CLIENT_ID', 'XXXXXXXXXXXX.apps.googleusercontent.com'); -define('CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXX'); +const CLIENT_ID = 'XXXXXXXXXXXX.apps.googleusercontent.com'; +const CLIENT_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXX'; session_start(); diff --git a/examples/google_plus_profile.php b/examples/google_plus_profile.php index 7536f39..6ce1b66 100644 --- a/examples/google_plus_profile.php +++ b/examples/google_plus_profile.php @@ -3,8 +3,8 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('CLIENT_ID', 'XXXXXXXXXXXX.apps.googleusercontent.com'); -define('CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXX'); +const CLIENT_ID = 'XXXXXXXXXXXX.apps.googleusercontent.com'; +const CLIENT_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXX'; session_start(); diff --git a/examples/google_spreadsheet_values_update.php b/examples/google_spreadsheet_values_update.php index 235b72f..d6f790c 100644 --- a/examples/google_spreadsheet_values_update.php +++ b/examples/google_spreadsheet_values_update.php @@ -3,7 +3,6 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; - const OAUTH2_AUTH_URL = 'https://accounts.google.com/o/oauth2/auth'; const OAUTH2_TOKEN_URI = 'https://www.googleapis.com/oauth2/v4/token'; diff --git a/examples/gratipay_send_tip.php b/examples/gratipay_send_tip.php index e3f08da..3830eca 100644 --- a/examples/gratipay_send_tip.php +++ b/examples/gratipay_send_tip.php @@ -3,8 +3,8 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('GRATIPAY_USERNAME', 'XXXXXXXXXX'); -define('GRATIPAY_API_KEY', 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'); +const GRATIPAY_USERNAME = 'XXXXXXXXXX'; +const GRATIPAY_API_KEY = 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'; $data = array( array( diff --git a/examples/instagram_popular_media.php b/examples/instagram_popular_media.php index 4beef4f..dc83c56 100644 --- a/examples/instagram_popular_media.php +++ b/examples/instagram_popular_media.php @@ -3,8 +3,8 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); -define('INSTAGRAM_CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const INSTAGRAM_CLIENT_ID = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; +const INSTAGRAM_CLIENT_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; session_start(); diff --git a/examples/instagram_search_photos.php b/examples/instagram_search_photos.php index 8682f71..747ecaa 100644 --- a/examples/instagram_search_photos.php +++ b/examples/instagram_search_photos.php @@ -3,7 +3,7 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const INSTAGRAM_CLIENT_ID = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; $curl = new Curl(); $curl->get('https://api.instagram.com/v1/media/search', array( diff --git a/examples/mailchimp_subscribe_email_address.php b/examples/mailchimp_subscribe_email_address.php index f7ad797..d4c8e0f 100644 --- a/examples/mailchimp_subscribe_email_address.php +++ b/examples/mailchimp_subscribe_email_address.php @@ -3,13 +3,13 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('MAILCHIMP_API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXX'); +const MAILCHIMP_API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXX'; $parts = explode('-', MAILCHIMP_API_KEY); -define('MAILCHIMP_BASE_URL', 'https://' . $parts['1'] . '.api.mailchimp.com/2.0/'); +$MAILCHIMP_BASE_URL = 'https://' . $parts['1'] . '.api.mailchimp.com/2.0/'; $curl = new Curl(); -$curl->get(MAILCHIMP_BASE_URL . '/lists/list.json', array( +$curl->get($MAILCHIMP_BASE_URL . '/lists/list.json', array( 'apikey' => MAILCHIMP_API_KEY, )); @@ -21,7 +21,7 @@ if ($curl->response->total === 0) { $lists = $curl->response->data; $list = $lists['0']; -$curl->post(MAILCHIMP_BASE_URL . '/lists/subscribe.json', array( +$curl->post($MAILCHIMP_BASE_URL . '/lists/subscribe.json', array( 'apikey' => MAILCHIMP_API_KEY, 'id' => $list->id, 'email' => array( diff --git a/examples/multi_curl_download_with_callback.php b/examples/multi_curl_download_with_callback.php index 1aff283..4ce3d71 100644 --- a/examples/multi_curl_download_with_callback.php +++ b/examples/multi_curl_download_with_callback.php @@ -3,7 +3,7 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\MultiCurl; -$callback = function($instance, $tmpfile) { +$callback = function ($instance, $tmpfile) { $save_to_path = '/tmp/' . basename($instance->url); $fh = fopen($save_to_path, 'wb'); stream_copy_to_stream($tmpfile, $fh); diff --git a/examples/multi_curl_get_callbacks.php b/examples/multi_curl_get_callbacks.php index c111d7d..1315d5d 100644 --- a/examples/multi_curl_get_callbacks.php +++ b/examples/multi_curl_get_callbacks.php @@ -5,16 +5,16 @@ use \Curl\MultiCurl; $multi_curl = new MultiCurl(); -$multi_curl->success(function($instance) { +$multi_curl->success(function ($instance) { echo 'call to "' . $instance->url . '" was successful.' . "\n"; echo 'response: ' . $instance->response . "\n"; }); -$multi_curl->error(function($instance) { +$multi_curl->error(function ($instance) { echo 'call to "' . $instance->url . '" was unsuccessful.' . "\n"; echo 'error code: ' . $instance->errorCode . "\n"; echo 'error message: ' . $instance->errorMessage . "\n"; }); -$multi_curl->complete(function($instance) { +$multi_curl->complete(function ($instance) { echo 'call completed' . "\n"; }); diff --git a/examples/progress.php b/examples/progress.php index 228c88a..f51ef4b 100644 --- a/examples/progress.php +++ b/examples/progress.php @@ -4,12 +4,12 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; $curl = new Curl(); -$curl->progress(function($client, $download_size, $downloaded, $upload_size, $uploaded) { +$curl->progress(function ($client, $download_size, $downloaded, $upload_size, $uploaded) { if ($download_size === 0) { return; } - $percent = floor( $downloaded * 100 / $download_size ); + $percent = floor($downloaded * 100 / $download_size); echo ' ' . $percent . '%' . "\r"; }); $curl->download('https://php.net/distributions/manual/php_manual_en.html.gz', '/tmp/php_manual_en.html.gz'); diff --git a/examples/progress_advanced.php b/examples/progress_advanced.php index b7541d9..cbaa1dc 100644 --- a/examples/progress_advanced.php +++ b/examples/progress_advanced.php @@ -4,7 +4,7 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; $curl = new Curl(); -$curl->progress(function($client, $download_size, $downloaded, $upload_size, $uploaded) { +$curl->progress(function ($client, $download_size, $downloaded, $upload_size, $uploaded) { if ($download_size === 0) { return; } @@ -13,18 +13,18 @@ $curl->progress(function($client, $download_size, $downloaded, $upload_size, $up $progress_size = 40; $fraction_downloaded = $downloaded / $download_size; $dots = round($fraction_downloaded * $progress_size); - printf('%3.0f%% [', $fraction_downloaded * 100 ); + printf('%3.0f%% [', $fraction_downloaded * 100); $i = 0; - for ( ; $i < $dots - 1; $i++) { + for (; $i < $dots - 1; $i++) { echo '='; } echo '>'; - for ( ; $i < $progress_size - 1; $i++) { + for (; $i < $progress_size - 1; $i++) { echo ' '; } echo ']' . "\r"; }); -$curl->complete(function($instance) { +$curl->complete(function ($instance) { echo "\n" . 'download complete' . "\n"; }); $curl->download('https://secure.php.net/distributions/manual/php_manual_en.html.gz', '/tmp/php_manual_en.html.gz'); diff --git a/examples/twitter_post_tweet.php b/examples/twitter_post_tweet.php index 9118dab..67a2869 100644 --- a/examples/twitter_post_tweet.php +++ b/examples/twitter_post_tweet.php @@ -3,10 +3,10 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXX'); -define('API_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); -define('OAUTH_ACCESS_TOKEN', 'XXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); -define('OAUTH_TOKEN_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXX'; +const API_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; +const OAUTH_ACCESS_TOKEN = 'XXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; +const OAUTH_TOKEN_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; $status = 'I love php curl class. https://github.com/php-curl-class/php-curl-class'; diff --git a/examples/twitter_trending_topics.php b/examples/twitter_trending_topics.php index e60b14e..704718c 100644 --- a/examples/twitter_trending_topics.php +++ b/examples/twitter_trending_topics.php @@ -3,10 +3,10 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXX'); -define('API_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); -define('OAUTH_ACCESS_TOKEN', 'XXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); -define('OAUTH_TOKEN_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXX'; +const API_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; +const OAUTH_ACCESS_TOKEN = 'XXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; +const OAUTH_TOKEN_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; $woeid = '2487956'; diff --git a/examples/youtube_list_playlist_videos.php b/examples/youtube_list_playlist_videos.php index eb883b0..737c2bd 100644 --- a/examples/youtube_list_playlist_videos.php +++ b/examples/youtube_list_playlist_videos.php @@ -3,7 +3,7 @@ require __DIR__ . '/vendor/autoload.php'; use \Curl\Curl; -define('YOUTUBE_API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'); +const YOUTUBE_API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; $playlistId = 'RDHJb0VYVtaNc'; diff --git a/scripts/bump_major_version.php b/scripts/bump_major_version.php index a3953f0..605722c 100755 --- a/scripts/bump_major_version.php +++ b/scripts/bump_major_version.php @@ -6,8 +6,7 @@ $current_version = Curl\Curl::VERSION; list($major, $_, $_) = explode('.', $current_version); $new_version = implode('.', array((string)((int)$major += 1), '0', '0')); -foreach( - array( +foreach (array( array( dirname(__FILE__) . '/../src/Curl/Curl.php', '/const VERSION = \'(?:\d+.\d+.\d+)\';/', diff --git a/scripts/bump_minor_version.php b/scripts/bump_minor_version.php index 4fe189e..7426b89 100755 --- a/scripts/bump_minor_version.php +++ b/scripts/bump_minor_version.php @@ -6,8 +6,7 @@ $current_version = Curl\Curl::VERSION; list($major, $minor, $_) = explode('.', $current_version); $new_version = implode('.', array($major, (string)((int)$minor += 1), '0')); -foreach( - array( +foreach (array( array( dirname(__FILE__) . '/../src/Curl/Curl.php', '/const VERSION = \'(?:\d+.\d+.\d+)\';/', diff --git a/scripts/bump_patch_version.php b/scripts/bump_patch_version.php index 7e88bfc..8e15ef6 100755 --- a/scripts/bump_patch_version.php +++ b/scripts/bump_patch_version.php @@ -6,8 +6,7 @@ $current_version = Curl\Curl::VERSION; list($major, $minor, $patch) = explode('.', $current_version); $new_version = implode('.', array($major, $minor, (string)((int)$patch += 1))); -foreach( - array( +foreach (array( array( dirname(__FILE__) . '/../src/Curl/Curl.php', '/const VERSION = \'(?:\d+.\d+.\d+)\';/', diff --git a/src/Curl/CaseInsensitiveArray.php b/src/Curl/CaseInsensitiveArray.php index 956514c..878bfe6 100644 --- a/src/Curl/CaseInsensitiveArray.php +++ b/src/Curl/CaseInsensitiveArray.php @@ -39,7 +39,7 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator * * @access public */ - public function __construct(Array $initial = null) + public function __construct(array $initial = null) { if ($initial !== null) { foreach ($initial as $key => $value) { diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php index a0deabf..24985b9 100644 --- a/src/Curl/Curl.php +++ b/src/Curl/Curl.php @@ -2,7 +2,6 @@ namespace Curl; - class Curl { const VERSION = '5.1.0'; @@ -549,11 +548,13 @@ class Curl } else { if (isset($this->options[CURLOPT_CUSTOMREQUEST])) { if ((version_compare(PHP_VERSION, '5.5.11') < 0) || defined('HHVM_VERSION')) { - trigger_error('Due to technical limitations of PHP <= 5.5.11 and HHVM, it is not possible to ' + trigger_error( + 'Due to technical limitations of PHP <= 5.5.11 and HHVM, it is not possible to ' . 'perform a post-redirect-get request using a php-curl-class Curl object that ' . 'has already been used to perform other types of requests. Either use a new ' . 'php-curl-class Curl object or upgrade your PHP engine.', - E_USER_ERROR); + E_USER_ERROR + ); } else { $this->setOpt(CURLOPT_CUSTOMREQUEST, null); } @@ -677,7 +678,7 @@ class Curl } $this->cookies[implode('', $name_chars)] = implode('', $value_chars); - $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function($k, $v) { + $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function ($k, $v) { return $k . '=' . $v; }, array_keys($this->cookies), array_values($this->cookies)))); } @@ -783,7 +784,7 @@ class Curl public function setDefaultJsonDecoder() { $args = func_get_args(); - $this->jsonDecoder = function($response) use ($args) { + $this->jsonDecoder = function ($response) use ($args) { array_unshift($args, $response); // Call json_decode() without the $options parameter in PHP @@ -808,7 +809,7 @@ class Curl */ public function setDefaultXmlDecoder() { - $this->xmlDecoder = function($response) { + $this->xmlDecoder = function ($response) { $xml_obj = @simplexml_load_string($response); if (!($xml_obj === false)) { $response = $xml_obj; @@ -1071,7 +1072,8 @@ class Curl * * @access private */ - private function __get_effectiveUrl() { + private function __get_effectiveUrl() + { return $this->getInfo(CURLINFO_EFFECTIVE_URL); } @@ -1080,7 +1082,8 @@ class Curl * * @access private */ - private function __get_totalTime() { + private function __get_totalTime() + { return $this->getInfo(CURLINFO_TOTAL_TIME); } @@ -1269,8 +1272,12 @@ class Curl $return[$key] = $value; } else { $return = array_merge( - $return, self::array_flatten_multidim( - $value, $prefix ? $prefix . '[' . $key . ']' : $key)); + $return, + self::array_flatten_multidim( + $value, + $prefix ? $prefix . '[' . $key . ']' : $key + ) + ); } } } diff --git a/src/Curl/MultiCurl.php b/src/Curl/MultiCurl.php index bec7d96..f984b2a 100644 --- a/src/Curl/MultiCurl.php +++ b/src/Curl/MultiCurl.php @@ -81,7 +81,7 @@ class MultiCurl $curl->fileHandle = tmpfile(); } else { $filename = $mixed_filename; - $curl->downloadCompleteFunction = function($instance, $fh) use ($filename) { + $curl->downloadCompleteFunction = function ($instance, $fh) use ($filename) { file_put_contents($filename, stream_get_contents($fh)); }; $curl->fileHandle = fopen('php://temp', 'wb'); diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php index 8fe25ba..a75ad9b 100644 --- a/tests/PHPCurlClass/PHPCurlClassTest.php +++ b/tests/PHPCurlClass/PHPCurlClassTest.php @@ -359,7 +359,9 @@ class CurlTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - 'key=file&file[0]=wibble&file[1]=wubble&file[2]=wobble', urldecode(http_build_query($data))); + 'key=file&file[0]=wibble&file[1]=wubble&file[2]=wobble', + urldecode(http_build_query($data)) + ); $test = new Test(); $test->curl->setDefaultJsonDecoder(true); @@ -411,7 +413,10 @@ class CurlTest extends PHPUnit_Framework_TestCase // Expect "Content-Type: multipart/form-data" in request headers. preg_match( - '/^multipart\/form-data; boundary=/', $test->curl->requestHeaders['Content-Type'], $content_type); + '/^multipart\/form-data; boundary=/', + $test->curl->requestHeaders['Content-Type'], + $content_type + ); $this->assertTrue(!empty($content_type)); // Expect received POST data to match POSTed data less the file. @@ -501,8 +506,10 @@ class CurlTest extends PHPUnit_Framework_TestCase // post-redirect-get request will trigger a PHP error $test->server('post_redirect_get', 'POST'); - $this->assertTrue(false, - 'Reusing an existing Curl object on incompatible PHP engines shall trigger an error.'); + $this->assertTrue( + false, + 'Reusing an existing Curl object on incompatible PHP engines shall trigger an error.' + ); } catch (PHPUnit_Framework_Error $e) { $this->assertTrue(true); } @@ -666,7 +673,7 @@ class CurlTest extends PHPUnit_Framework_TestCase $curl->setHeader('X-DEBUG-TEST', 'download_response'); $curl->download(Test::TEST_URL . '?' . http_build_query(array( 'file_path' => $uploaded_file_path, - )), function($instance, $fh) use (&$callback_called) { + )), function ($instance, $fh) use (&$callback_called) { PHPUnit_Framework_Assert::assertFalse($callback_called); PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue(is_resource($fh)); @@ -1228,7 +1235,7 @@ class CurlTest extends PHPUnit_Framework_TestCase $this->assertFalse(is_array($test->curl->response)); $test = new Test(); - $test->curl->setJsonDecoder(function($response) { + $test->curl->setJsonDecoder(function ($response) { return json_decode($response, true); }); $test->server('json_response', 'POST', $data); @@ -2483,7 +2490,11 @@ class CurlTest extends PHPUnit_Framework_TestCase $curl = $test->curl; $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->beforeSend(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($before_send_called); PHPUnit_Framework_Assert::assertFalse($success_called); @@ -2492,7 +2503,11 @@ class CurlTest extends PHPUnit_Framework_TestCase $before_send_called = true; }); $curl->success(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($before_send_called); PHPUnit_Framework_Assert::assertFalse($success_called); @@ -2501,11 +2516,19 @@ class CurlTest extends PHPUnit_Framework_TestCase $success_called = true; }); $curl->error(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { $error_called = true; }); $curl->complete(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($before_send_called); PHPUnit_Framework_Assert::assertTrue($success_called); @@ -2534,7 +2557,11 @@ class CurlTest extends PHPUnit_Framework_TestCase $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 2000); $curl->beforeSend(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($before_send_called); PHPUnit_Framework_Assert::assertFalse($success_called); @@ -2543,11 +2570,19 @@ class CurlTest extends PHPUnit_Framework_TestCase $before_send_called = true; }); $curl->success(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { $success_called = true; }); $curl->error(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($before_send_called); PHPUnit_Framework_Assert::assertFalse($success_called); @@ -2556,7 +2591,11 @@ class CurlTest extends PHPUnit_Framework_TestCase $error_called = true; }); $curl->complete(function ($instance) use ( - &$before_send_called, &$success_called, &$error_called, &$complete_called) { + &$before_send_called, + &$success_called, + &$error_called, + &$complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($before_send_called); PHPUnit_Framework_Assert::assertFalse($success_called); @@ -2700,7 +2739,7 @@ class CurlTest extends PHPUnit_Framework_TestCase // indicate a memory leak. $max_memory_diff = 1000; foreach ($results as $i => $result) { - $memory_diff = $result['after'] - $result['before'];; + $memory_diff = $result['after'] - $result['before']; // Skip the first test to allow memory usage to settle. if ($i >= 1) { @@ -2741,7 +2780,7 @@ class CurlTest extends PHPUnit_Framework_TestCase $this->assertFalse(strpos($test->curl->response->saveXML(), 'curl->setXmlDecoder(function($response) { + $test->curl->setXmlDecoder(function ($response) { return simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA); }); $test->server('xml_with_cdata_response', 'POST', $data); diff --git a/tests/PHPCurlClass/PHPMultiCurlClassTest.php b/tests/PHPCurlClass/PHPMultiCurlClassTest.php index 5439e70..a30d6b9 100644 --- a/tests/PHPCurlClass/PHPMultiCurlClassTest.php +++ b/tests/PHPCurlClass/PHPMultiCurlClassTest.php @@ -57,7 +57,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -125,7 +126,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -192,7 +194,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_error_called, &$patch_error_called, &$post_error_called, - &$put_error_called) { + &$put_error_called + ) { $delete_error_called = true; $download_error_called = true; $get_error_called = true; @@ -211,7 +214,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -376,7 +380,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -443,7 +448,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_success_called, &$patch_success_called, &$post_success_called, - &$put_success_called) { + &$put_success_called + ) { $delete_success_called = true; $get_success_called = true; $head_success_called = true; @@ -461,7 +467,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -529,7 +536,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called, &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called, &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called, - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST); if ($request_method === 'DELETE') { @@ -657,7 +665,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_complete_called = false; $delete = $multi_curl->addDelete(Test::TEST_URL); $delete->beforeSend(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($delete_before_send_called); PHPUnit_Framework_Assert::assertFalse($delete_success_called); @@ -666,7 +675,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_before_send_called = true; }); $delete->success(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($delete_before_send_called); PHPUnit_Framework_Assert::assertFalse($delete_success_called); @@ -675,11 +685,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_success_called = true; }); $delete->error(function ($instance) use ( - &$delete_error_called) { + &$delete_error_called + ) { $delete_error_called = true; }); $delete->complete(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($delete_before_send_called); PHPUnit_Framework_Assert::assertTrue($delete_success_called); @@ -696,7 +708,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $download = $multi_curl->addDownload(Test::TEST_URL, $download_file_path); $download->beforeSend(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($download_before_send_called); PHPUnit_Framework_Assert::assertFalse($download_success_called); @@ -706,7 +719,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase }); $download->success(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($download_before_send_called); PHPUnit_Framework_Assert::assertFalse($download_success_called); @@ -715,12 +729,14 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $download_success_called = true; }); $download->error(function ($instance) use ( - &$download_error_called) { + &$download_error_called + ) { $download_error_called = true; }); $download->complete(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($download_before_send_called); PHPUnit_Framework_Assert::assertTrue($download_success_called); @@ -735,7 +751,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_complete_called = false; $get = $multi_curl->addGet(Test::TEST_URL); $get->beforeSend(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($get_before_send_called); PHPUnit_Framework_Assert::assertFalse($get_success_called); @@ -744,7 +761,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_before_send_called = true; }); $get->success(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($get_before_send_called); PHPUnit_Framework_Assert::assertFalse($get_success_called); @@ -753,11 +771,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_success_called = true; }); $get->error(function ($instance) use ( - &$get_error_called) { + &$get_error_called + ) { $get_error_called = true; }); $get->complete(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($get_before_send_called); PHPUnit_Framework_Assert::assertTrue($get_success_called); @@ -772,7 +792,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_complete_called = false; $head = $multi_curl->addHead(Test::TEST_URL); $head->beforeSend(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($head_before_send_called); PHPUnit_Framework_Assert::assertFalse($head_success_called); @@ -781,7 +802,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_before_send_called = true; }); $head->success(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($head_before_send_called); PHPUnit_Framework_Assert::assertFalse($head_success_called); @@ -790,11 +812,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_success_called = true; }); $head->error(function ($instance) use ( - &$head_error_called) { + &$head_error_called + ) { $head_error_called = true; }); $head->complete(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($head_before_send_called); PHPUnit_Framework_Assert::assertTrue($head_success_called); @@ -809,7 +833,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_complete_called = false; $options = $multi_curl->addOptions(Test::TEST_URL); $options->beforeSend(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($options_before_send_called); PHPUnit_Framework_Assert::assertFalse($options_success_called); @@ -818,7 +843,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_before_send_called = true; }); $options->success(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($options_before_send_called); PHPUnit_Framework_Assert::assertFalse($options_success_called); @@ -827,11 +853,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_success_called = true; }); $options->error(function ($instance) use ( - &$options_error_called) { + &$options_error_called + ) { $options_error_called = true; }); $options->complete(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($options_before_send_called); PHPUnit_Framework_Assert::assertTrue($options_success_called); @@ -846,7 +874,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_complete_called = false; $patch = $multi_curl->addPatch(Test::TEST_URL); $patch->beforeSend(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($patch_before_send_called); PHPUnit_Framework_Assert::assertFalse($patch_success_called); @@ -855,7 +884,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_before_send_called = true; }); $patch->success(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($patch_before_send_called); PHPUnit_Framework_Assert::assertFalse($patch_success_called); @@ -864,11 +894,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_success_called = true; }); $patch->error(function ($instance) use ( - &$patch_error_called) { + &$patch_error_called + ) { $patch_error_called = true; }); $patch->complete(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($patch_before_send_called); PHPUnit_Framework_Assert::assertTrue($patch_success_called); @@ -883,7 +915,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_complete_called = false; $post = $multi_curl->addPost(Test::TEST_URL); $post->beforeSend(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($post_before_send_called); PHPUnit_Framework_Assert::assertFalse($post_success_called); @@ -892,7 +925,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_before_send_called = true; }); $post->success(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($post_before_send_called); PHPUnit_Framework_Assert::assertFalse($post_success_called); @@ -901,11 +935,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_success_called = true; }); $post->error(function ($instance) use ( - &$post_error_called) { + &$post_error_called + ) { $post_error_called = true; }); $post->complete(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($post_before_send_called); PHPUnit_Framework_Assert::assertTrue($post_success_called); @@ -920,7 +956,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_complete_called = false; $put = $multi_curl->addPut(Test::TEST_URL); $put->beforeSend(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($put_before_send_called); PHPUnit_Framework_Assert::assertFalse($put_success_called); @@ -929,7 +966,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_before_send_called = true; }); $put->success(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($put_before_send_called); PHPUnit_Framework_Assert::assertFalse($put_success_called); @@ -938,11 +976,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_success_called = true; }); $put->error(function ($instance) use ( - &$put_error_called) { + &$put_error_called + ) { $put_error_called = true; }); $put->complete(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($put_before_send_called); PHPUnit_Framework_Assert::assertTrue($put_success_called); @@ -1005,7 +1045,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_complete_called = false; $delete = $multi_curl->addDelete(Test::ERROR_URL); $delete->beforeSend(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($delete_before_send_called); PHPUnit_Framework_Assert::assertFalse($delete_success_called); @@ -1014,11 +1055,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_before_send_called = true; }); $delete->success(function ($instance) use ( - &$delete_success_called) { + &$delete_success_called + ) { $delete_success_called = true; }); $delete->error(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($delete_before_send_called); PHPUnit_Framework_Assert::assertFalse($delete_success_called); @@ -1027,7 +1070,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $delete_error_called = true; }); $delete->complete(function ($instance) use ( - &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called) { + &$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($delete_before_send_called); PHPUnit_Framework_Assert::assertFalse($delete_success_called); @@ -1044,7 +1088,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $download = $multi_curl->addDownload(Test::ERROR_URL, $download_file_path); $download->beforeSend(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($download_before_send_called); PHPUnit_Framework_Assert::assertFalse($download_success_called); @@ -1053,12 +1098,14 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $download_before_send_called = true; }); $download->success(function ($instance) use ( - &$download_success_called) { + &$download_success_called + ) { $download_success_called = true; }); $download->error(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($download_before_send_called); PHPUnit_Framework_Assert::assertFalse($download_success_called); @@ -1068,7 +1115,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase }); $download->complete(function ($instance) use ( &$download_before_send_called, &$download_success_called, &$download_error_called, - &$download_complete_called) { + &$download_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($download_before_send_called); PHPUnit_Framework_Assert::assertFalse($download_success_called); @@ -1083,7 +1131,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_complete_called = false; $get = $multi_curl->addGet(Test::ERROR_URL); $get->beforeSend(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($get_before_send_called); PHPUnit_Framework_Assert::assertFalse($get_success_called); @@ -1092,11 +1141,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_before_send_called = true; }); $get->success(function ($instance) use ( - &$get_success_called) { + &$get_success_called + ) { $get_success_called = true; }); $get->error(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($get_before_send_called); PHPUnit_Framework_Assert::assertFalse($get_success_called); @@ -1105,7 +1156,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_error_called = true; }); $get->complete(function ($instance) use ( - &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called) { + &$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($get_before_send_called); PHPUnit_Framework_Assert::assertFalse($get_success_called); @@ -1120,7 +1172,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_complete_called = false; $head = $multi_curl->addHead(Test::ERROR_URL); $head->beforeSend(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($head_before_send_called); PHPUnit_Framework_Assert::assertFalse($head_success_called); @@ -1129,11 +1182,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_before_send_called = true; }); $head->success(function ($instance) use ( - &$head_success_called) { + &$head_success_called + ) { $head_success_called = true; }); $head->error(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($head_before_send_called); PHPUnit_Framework_Assert::assertFalse($head_success_called); @@ -1142,7 +1197,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $head_error_called = true; }); $head->complete(function ($instance) use ( - &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called) { + &$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($head_before_send_called); PHPUnit_Framework_Assert::assertFalse($head_success_called); @@ -1157,7 +1213,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_complete_called = false; $options = $multi_curl->addOptions(Test::ERROR_URL); $options->beforeSend(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($options_before_send_called); PHPUnit_Framework_Assert::assertFalse($options_success_called); @@ -1166,11 +1223,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_before_send_called = true; }); $options->success(function ($instance) use ( - &$options_success_called) { + &$options_success_called + ) { $options_success_called = true; }); $options->error(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($options_before_send_called); PHPUnit_Framework_Assert::assertFalse($options_success_called); @@ -1179,7 +1238,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $options_error_called = true; }); $options->complete(function ($instance) use ( - &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called) { + &$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($options_before_send_called); PHPUnit_Framework_Assert::assertFalse($options_success_called); @@ -1194,7 +1254,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_complete_called = false; $patch = $multi_curl->addPatch(Test::ERROR_URL); $patch->beforeSend(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($patch_before_send_called); PHPUnit_Framework_Assert::assertFalse($patch_success_called); @@ -1203,11 +1264,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_before_send_called = true; }); $patch->success(function ($instance) use ( - &$patch_success_called) { + &$patch_success_called + ) { $patch_success_called = true; }); $patch->error(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($patch_before_send_called); PHPUnit_Framework_Assert::assertFalse($patch_success_called); @@ -1216,7 +1279,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $patch_error_called = true; }); $patch->complete(function ($instance) use ( - &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called) { + &$patch_before_send_called, &$patch_success_called, &$patch_error_called, &$patch_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($patch_before_send_called); PHPUnit_Framework_Assert::assertFalse($patch_success_called); @@ -1231,7 +1295,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_complete_called = false; $post = $multi_curl->addPost(Test::ERROR_URL); $post->beforeSend(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($post_before_send_called); PHPUnit_Framework_Assert::assertFalse($post_success_called); @@ -1240,11 +1305,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_before_send_called = true; }); $post->success(function ($instance) use ( - &$post_success_called) { + &$post_success_called + ) { $post_sucess_called = true; }); $post->error(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($post_before_send_called); PHPUnit_Framework_Assert::assertFalse($post_success_called); @@ -1253,7 +1320,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $post_error_called = true; }); $post->complete(function ($instance) use ( - &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called) { + &$post_before_send_called, &$post_success_called, &$post_error_called, &$post_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($post_before_send_called); PHPUnit_Framework_Assert::assertFalse($post_success_called); @@ -1268,7 +1336,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_complete_called = false; $put = $multi_curl->addPut(Test::ERROR_URL); $put->beforeSend(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertFalse($put_before_send_called); PHPUnit_Framework_Assert::assertFalse($put_success_called); @@ -1277,11 +1346,13 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_before_send_called = true; }); $put->success(function ($instance) use ( - &$put_success_called) { + &$put_success_called + ) { $put_success_called = true; }); $put->error(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($put_before_send_called); PHPUnit_Framework_Assert::assertFalse($put_success_called); @@ -1290,7 +1361,8 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $put_error_called = true; }); $put->complete(function ($instance) use ( - &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called) { + &$put_before_send_called, &$put_success_called, &$put_error_called, &$put_complete_called + ) { PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue($put_before_send_called); PHPUnit_Framework_Assert::assertFalse($put_success_called); @@ -1346,16 +1418,16 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase public function testCurlCallbackOverride() { $multi_curl = new MultiCurl(); - $multi_curl->beforeSend(function() { + $multi_curl->beforeSend(function () { PHPUnit_Framework_Assert::assertFalse(true); }); - $multi_curl->success(function() { + $multi_curl->success(function () { PHPUnit_Framework_Assert::assertFalse(true); }); - $multi_curl->error(function() { + $multi_curl->error(function () { PHPUnit_Framework_Assert::assertFalse(true); }); - $multi_curl->complete(function() { + $multi_curl->complete(function () { PHPUnit_Framework_Assert::assertFalse(true); }); @@ -1935,7 +2007,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase { $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'json_response'); - $multi_curl->setJsonDecoder(function($response) { + $multi_curl->setJsonDecoder(function ($response) { return 'foo'; }); @@ -1947,7 +2019,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_2 = $multi_curl->addGet(Test::TEST_URL); $get_2->beforeSend(function ($instance) { - $instance->setJsonDecoder(function($response) { + $instance->setJsonDecoder(function ($response) { return 'bar'; }); }); @@ -1965,7 +2037,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase { $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'xml_with_cdata_response'); - $multi_curl->setXmlDecoder(function($response) { + $multi_curl->setXmlDecoder(function ($response) { return 'foo'; }); @@ -1977,7 +2049,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $get_2 = $multi_curl->addGet(Test::TEST_URL); $get_2->beforeSend(function ($instance) { - $instance->setXmlDecoder(function($response) { + $instance->setXmlDecoder(function ($response) { return 'bar'; }); }); @@ -2007,7 +2079,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl->setHeader('X-DEBUG-TEST', 'download_response'); $multi_curl->addDownload(Test::TEST_URL . '?' . http_build_query(array( 'file_path' => $uploaded_file_path, - )), function($instance, $fh) use (&$download_callback_called) { + )), function ($instance, $fh) use (&$download_callback_called) { PHPUnit_Framework_Assert::assertFalse($download_callback_called); PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance); PHPUnit_Framework_Assert::assertTrue(is_resource($fh)); @@ -2039,7 +2111,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase PHPUnit_Framework_Assert::assertFalse($download_before_send_called); $download_before_send_called = true; }); - $multi_curl->addDownload(Test::ERROR_URL, function($instance, $fh) use (&$download_callback_called) { + $multi_curl->addDownload(Test::ERROR_URL, function ($instance, $fh) use (&$download_callback_called) { $download_callback_called = true; }); $multi_curl->start(); @@ -2053,41 +2125,45 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setHeader('X-DEBUG-TEST', 'delete_with_body'); - $multi_curl->addDelete($data, array('wibble' => 'wubble'))->complete(function($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('{"get":{"key":"value"},"delete":{"wibble":"wubble"}}', - $instance->rawResponse); - }); - $multi_curl->start(); - - $multi_curl = new MultiCurl(Test::TEST_URL); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); - $multi_curl->addDelete($data)->complete(function($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); - }); - $multi_curl->start(); - - $multi_curl = new MultiCurl(Test::TEST_URL); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); - $multi_curl->addGet($data)->complete(function($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); - }); - $multi_curl->start(); - - $multi_curl = new MultiCurl(Test::TEST_URL); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); - $multi_curl->addHead($data)->complete(function($instance) { + $multi_curl->addDelete($data, array('wibble' => 'wubble'))->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals( - 'HEAD /?key=value HTTP/1.1', $instance->requestHeaders['Request-Line']); + '{"get":{"key":"value"},"delete":{"wibble":"wubble"}}', + $instance->rawResponse + ); }); $multi_curl->start(); $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setHeader('X-DEBUG-TEST', 'get'); - $multi_curl->addOptions($data)->complete(function($instance) { + $multi_curl->addDelete($data)->complete(function ($instance) { + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); + PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + }); + $multi_curl->start(); + + $multi_curl = new MultiCurl(Test::TEST_URL); + $multi_curl->setHeader('X-DEBUG-TEST', 'get'); + $multi_curl->addGet($data)->complete(function ($instance) { + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); + PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + }); + $multi_curl->start(); + + $multi_curl = new MultiCurl(Test::TEST_URL); + $multi_curl->setHeader('X-DEBUG-TEST', 'get'); + $multi_curl->addHead($data)->complete(function ($instance) { + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); + PHPUnit_Framework_Assert::assertEquals( + 'HEAD /?key=value HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + }); + $multi_curl->start(); + + $multi_curl = new MultiCurl(Test::TEST_URL); + $multi_curl->setHeader('X-DEBUG-TEST', 'get'); + $multi_curl->addOptions($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2095,7 +2171,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setHeader('X-DEBUG-TEST', 'request_method'); - $multi_curl->addPatch($data)->complete(function($instance) { + $multi_curl->addPatch($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('PATCH', $instance->response); }); @@ -2103,7 +2179,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setHeader('X-DEBUG-TEST', 'post'); - $multi_curl->addPost($data)->complete(function($instance) { + $multi_curl->addPost($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2111,7 +2187,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setHeader('X-DEBUG-TEST', 'put'); - $multi_curl->addPut($data)->complete(function($instance) { + $multi_curl->addPut($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2125,7 +2201,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addDelete($data)->complete(function($instance) { + $multi_curl->addDelete($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2134,7 +2210,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addGet($data)->complete(function($instance) { + $multi_curl->addGet($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2143,17 +2219,19 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addHead($data)->complete(function($instance) { + $multi_curl->addHead($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals( - 'HEAD /?key=value HTTP/1.1', $instance->requestHeaders['Request-Line']); + 'HEAD /?key=value HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); }); $multi_curl->start(); $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addOptions($data)->complete(function($instance) { + $multi_curl->addOptions($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2161,7 +2239,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'request_method'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addPatch($data)->complete(function($instance) { + $multi_curl->addPatch($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('PATCH', $instance->response); }); @@ -2169,7 +2247,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'post'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addPost($data)->complete(function($instance) { + $multi_curl->addPost($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); @@ -2177,13 +2255,14 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(); $multi_curl->setHeader('X-DEBUG-TEST', 'put'); $multi_curl->setUrl(Test::TEST_URL); - $multi_curl->addPut($data)->complete(function($instance) { + $multi_curl->addPut($data)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); }); } - public function testAddRequestAfterStart() { + public function testAddRequestAfterStart() + { $multi_curl = new MultiCurl(); $urls = array(); @@ -2231,7 +2310,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setOpt(CURLOPT_FOLLOWLOCATION, true); $multi_curl->setHeader('X-DEBUG-TEST', 'post_redirect_get'); - $multi_curl->addPost(array(), false)->complete(function($instance) { + $multi_curl->addPost(array(), false)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals('Redirected: POST', $instance->response); }); $multi_curl->start(); @@ -2240,7 +2319,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $multi_curl = new MultiCurl(Test::TEST_URL); $multi_curl->setOpt(CURLOPT_FOLLOWLOCATION, true); $multi_curl->setHeader('X-DEBUG-TEST', 'post_redirect_get'); - $multi_curl->addPost(array(), true)->complete(function($instance) { + $multi_curl->addPost(array(), true)->complete(function ($instance) { PHPUnit_Framework_Assert::assertEquals('Redirected: GET', $instance->response); }); $multi_curl->start(); diff --git a/tests/PHPCurlClass/server.php b/tests/PHPCurlClass/server.php index 558e0f7..e1f5856 100644 --- a/tests/PHPCurlClass/server.php +++ b/tests/PHPCurlClass/server.php @@ -62,7 +62,12 @@ if ($test === 'http_basic_auth') { if (empty($_SERVER['PHP_AUTH_DIGEST'])) { header('HTTP/1.1 401 Unauthorized'); header(sprintf( - 'WWW-Authenticate: Digest realm="%s", qop="%s", nonce="%s", opaque="%s"', $realm, $qop, $nonce, $opaque)); + 'WWW-Authenticate: Digest realm="%s", qop="%s", nonce="%s", opaque="%s"', + $realm, + $qop, + $nonce, + $opaque + )); echo 'canceled'; exit; } @@ -76,8 +81,12 @@ if ($test === 'http_basic_auth') { 'uri' => '', 'response' => '', ); - preg_match_all('@(' . implode('|', array_keys($data)) . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', - $_SERVER['PHP_AUTH_DIGEST'], $matches, PREG_SET_ORDER); + preg_match_all( + '@(' . implode('|', array_keys($data)) . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', + $_SERVER['PHP_AUTH_DIGEST'], + $matches, + PREG_SET_ORDER + ); foreach ($matches as $match) { $data[$match['1']] = $match['3'] ? $match['3'] : $match['4']; } @@ -85,7 +94,8 @@ if ($test === 'http_basic_auth') { $A1 = md5($data['username'] . ':' . $realm . ':' . $users[$data['username']]); $A2 = md5($_SERVER['REQUEST_METHOD'] . ':' . $data['uri']); $valid_response = md5( - $A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2); + $A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2 + ); if (!($data['response'] === $valid_response)) { header('HTTP/1.1 401 Unauthorized'); @@ -110,9 +120,7 @@ if ($test === 'http_basic_auth') { } elseif ($test === 'patch') { echo $http_raw_post_data; exit; -} elseif ( - $test === 'post_multidimensional' || - $test === 'post_multidimensional_with_file') { +} elseif ($test === 'post_multidimensional' || $test === 'post_multidimensional_with_file') { header('Content-Type: application/json'); echo json_encode(array( 'post' => $_POST, diff --git a/tests/check_syntax.sh b/tests/check_syntax.sh index f9fd334..dff7863 100755 --- a/tests/check_syntax.sh +++ b/tests/check_syntax.sh @@ -1,6 +1,7 @@ phpcs \ - --extensions=php \ + --extensions="php" \ --ignore="*/vendor/*" \ - --standard=PSR2 \ + --standard="ruleset.xml" \ -p \ + -s \ .. diff --git a/tests/ruleset.xml b/tests/ruleset.xml new file mode 100644 index 0000000..988373a --- /dev/null +++ b/tests/ruleset.xml @@ -0,0 +1,9 @@ + + + + + + + + +