Use short array syntax

Author: zachborboa

README.md

@@ -59,17 +59,17 @@ if ($curl->error) {
 ```php
 // https://www.example.com/search?q=keyword
 $curl = new Curl();
-$curl->get('https://www.example.com/search', array(
+$curl->get('https://www.example.com/search', [
     'q' => 'keyword',
-));
+]);
 ```
 
 ```php
 $curl = new Curl();
-$curl->post('https://www.example.com/login/', array(
+$curl->post('https://www.example.com/login/', [
     'username' => 'myusername',
     'password' => 'mypassword',
-));
+]);
 ```
 
 ```php
@@ -100,31 +100,31 @@ $curl->get('https://shortn.example.com/bHbVsP');
 
 ```php
 $curl = new Curl();
-$curl->put('https://api.example.com/user/', array(
+$curl->put('https://api.example.com/user/', [
     'first_name' => 'Zach',
     'last_name' => 'Borboa',
-));
+]);
 ```
 
 ```php
 $curl = new Curl();
-$curl->patch('https://api.example.com/profile/', array(
+$curl->patch('https://api.example.com/profile/', [
     'image' => '@path/to/file.jpg',
-));
+]);
 ```
 
 ```php
 $curl = new Curl();
-$curl->patch('https://api.example.com/profile/', array(
+$curl->patch('https://api.example.com/profile/', [
     'image' => new CURLFile('path/to/file.jpg'),
-));
+]);
 ```
 
 ```php
 $curl = new Curl();
-$curl->delete('https://api.example.com/user/', array(
+$curl->delete('https://api.example.com/user/', [
     'id' => '1234',
-));
+]);
 ```
 
 ```php
@@ -175,15 +175,15 @@ $multi_curl->complete(function($instance) {
     echo 'call completed' . "\n";
 });
 
-$multi_curl->addGet('https://www.google.com/search', array(
+$multi_curl->addGet('https://www.google.com/search', [
     'q' => 'hello world',
-));
-$multi_curl->addGet('https://duckduckgo.com/', array(
+]);
+$multi_curl->addGet('https://duckduckgo.com/', [
     'q' => 'hello world',
-));
-$multi_curl->addGet('https://www.bing.com/search', array(
+]);
+$multi_curl->addGet('https://www.bing.com/search', [
     'q' => 'hello world',
-));
+]);
 
 $multi_curl->start(); // Blocks until all items in the queue have been processed.
 ```
@@ -202,13 +202,13 @@ Curl::buildPostData($data)
 Curl::call()
 Curl::close()
 Curl::complete($callback)
-Curl::delete($url, $query_parameters = array(), $data = array())
+Curl::delete($url, $query_parameters = [], $data = [])
 Curl::disableTimeout()
 Curl::download($url, $mixed_filename)
 Curl::error($callback)
 Curl::exec($ch = null)
 Curl::execDone()
-Curl::get($url, $data = array())
+Curl::get($url, $data = [])
 Curl::getAttempts()
 Curl::getBeforeSendCallback()
 Curl::getCompleteCallback()
@@ -241,19 +241,19 @@ Curl::getRetryDecider()
 Curl::getSuccessCallback()
 Curl::getUrl()
 Curl::getXmlDecoder()
-Curl::head($url, $data = array())
+Curl::head($url, $data = [])
 Curl::isChildOfMultiCurl()
 Curl::isCurlError()
 Curl::isError()
 Curl::isHttpError()
-Curl::options($url, $data = array())
-Curl::patch($url, $data = array())
+Curl::options($url, $data = [])
+Curl::patch($url, $data = [])
 Curl::post($url, $data = '', $follow_303_with_post = false)
 Curl::progress($callback)
-Curl::put($url, $data = array())
+Curl::put($url, $data = [])
 Curl::removeHeader($key)
 Curl::reset()
-Curl::search($url, $data = array())
+Curl::search($url, $data = [])
 Curl::setBasicAuthentication($username, $password = '')
 Curl::setConnectTimeout($seconds)
 Curl::setCookie($key, $value)
@@ -295,15 +295,15 @@ Curl::verbose($on = true, $output = 'STDERR')
 MultiCurl::__construct($base_url = null)
 MultiCurl::__destruct()
 MultiCurl::addCurl(Curl $curl)
-MultiCurl::addDelete($url, $query_parameters = array(), $data = array())
+MultiCurl::addDelete($url, $query_parameters = [], $data = [])
 MultiCurl::addDownload($url, $mixed_filename)
-MultiCurl::addGet($url, $data = array())
-MultiCurl::addHead($url, $data = array())
-MultiCurl::addOptions($url, $data = array())
-MultiCurl::addPatch($url, $data = array())
+MultiCurl::addGet($url, $data = [])
+MultiCurl::addHead($url, $data = [])
+MultiCurl::addOptions($url, $data = [])
+MultiCurl::addPatch($url, $data = [])
 MultiCurl::addPost($url, $data = '', $follow_303_with_post = false)
-MultiCurl::addPut($url, $data = array())
-MultiCurl::addSearch($url, $data = array())
+MultiCurl::addPut($url, $data = [])
+MultiCurl::addSearch($url, $data = [])
 MultiCurl::beforeSend($callback)
 MultiCurl::close()
 MultiCurl::complete($callback)

SECURITY.md

@@ -21,7 +21,7 @@ echo $curl->response;
 Safer:
 
 ```php
-function is_allowed_url($url, $allowed_url_schemes = array('http', 'https')) {
+function is_allowed_url($url, $allowed_url_schemes = ['http', 'https']) {
     $valid_url = filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED) !== false;
     if ($valid_url) {
         $scheme = parse_url($url, PHP_URL_SCHEME);
@@ -54,9 +54,9 @@ $ curl https://www.example.com/upload_photo.php --data "photo=@/etc/passwd"
 ```php
 // upload_photo.php
 $curl = new Curl();
-$curl->post('http://www.anotherwebsite.com/', array(
+$curl->post('http://www.anotherwebsite.com/', [
     'photo' => $_POST['photo'], // DANGER!
-));
+]);
 ```
 
 ### Unsafe response with redirection enabled

examples/delete.php

@@ -8,14 +8,14 @@
 $curl = new Curl();
 $curl->delete(
     'https://httpbin.org/delete',
-    array(
+    [
         'key' => 'value',
-    ),
-    array(
+    ],
+    [
         'a' => '1',
         'b' => '2',
         'c' => '3',
-    )
+    ]
 );
 
 if ($curl->error) {

examples/deviant_art_rss.php

@@ -4,10 +4,10 @@
 use Curl\Curl;
 
 $curl = new Curl();
-$curl->get('http://backend.deviantart.com/rss.xml', array(
+$curl->get('http://backend.deviantart.com/rss.xml', [
     'q' => 'boost:popular in:photography/people/fashion',
     'type' => 'deviation',
-));
+]);
 
 foreach ($curl->response->channel->item as $entry) {
     $thumbnails = $entry->children('http://search.yahoo.com/mrss/')->thumbnail;

examples/flickr.class.php

@@ -46,23 +46,23 @@ public function uploadPhoto()
 
     private function getOAuthParameters()
     {
-        return array(
+        return [
             'oauth_nonce' => md5(microtime() . mt_rand()),
             'oauth_timestamp' => time(),
             'oauth_consumer_key' => FLICKR_API_KEY,
             'oauth_signature_method' => 'HMAC-SHA1',
             'oauth_version' => '1.0',
-        );
+        ];
     }
 
     private function getSignature($request_method, $url, $parameters)
     {
         ksort($parameters, SORT_STRING);
-        $request = implode('&', array(
+        $request = implode('&', [
             rawurlencode($request_method),
             rawurlencode($url),
             rawurlencode(http_build_query($parameters, '', '&', PHP_QUERY_RFC3986)),
-        ));
+        ]);
         $key = FLICKR_API_SECRET . '&';
         if (!empty($_SESSION['oauth_access_token_secret'])) {
             $key .= $_SESSION['oauth_access_token_secret'];
@@ -76,12 +76,12 @@ private function getSignature($request_method, $url, $parameters)
     private function getRequestToken()
     {
         $oauth_data = $this->getOAuthParameters();
-        $oauth_data['oauth_callback'] = implode('', array(
+        $oauth_data['oauth_callback'] = implode('', [
             isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http',
             '://',
             $_SERVER['SERVER_NAME'],
             $_SERVER['SCRIPT_NAME'],
-        ));
+        ]);
 
         $request_token_url = 'https://www.flickr.com/services/oauth/request_token';
         $oauth_data['oauth_signature'] = $this->getSignature('POST', $request_token_url, $oauth_data);
@@ -93,10 +93,10 @@ private function getRequestToken()
         $_SESSION['oauth_token_secret'] = $parts['oauth_token_secret'];
 
         // Continue to Flickr for user's authorization.
-        header('Location: https://secure.flickr.com/services/oauth/authorize?' . http_build_query(array(
+        header('Location: https://secure.flickr.com/services/oauth/authorize?' . http_build_query([
             'oauth_token' => $parts['oauth_token'],
             'perms' => 'write',
-        )));
+        ]));
         exit;
     }
 

examples/flickr_photo_search.php

@@ -5,15 +5,15 @@
 
 const FLICKR_API_KEY = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
 
-$data = array(
+$data = [
     'method' => 'flickr.photos.search',
     'api_key' => FLICKR_API_KEY,
     'text' => 'happy',
     'sort' => 'interestingness-desc',
     'safe_search' => '3',
     'format' => 'json',
     'nojsoncallback' => '1',
-);
+];
 
 $curl = new Curl();
 $curl->get('https://api.flickr.com/services/rest/', $data);

examples/get.php

@@ -6,9 +6,9 @@
 // curl --request GET "https://httpbin.org/get?key=value"
 
 $curl = new Curl();
-$curl->get('https://httpbin.org/get', array(
+$curl->get('https://httpbin.org/get', [
     'key' => 'value',
-));
+]);
 
 if ($curl->error) {
     echo 'Error: ' . $curl->errorCode . ': ' . $curl->errorMessage . "\n";

examples/get_base_url_1.php

@@ -5,8 +5,8 @@
 
 $curl = new Curl('https://httpbin.org/get');
 for ($i = 1; $i <= 10; $i++) {
-    $curl->get(array(
+    $curl->get([
         'page' => $i,
-    ));
+    ]);
     // TODO: Do something with result $curl->response.
 }

examples/get_base_url_2.php

@@ -6,8 +6,8 @@
 $curl = new Curl();
 $curl->setUrl('https://httpbin.org/get');
 for ($i = 1; $i <= 10; $i++) {
-    $curl->get(array(
+    $curl->get([
         'page' => $i,
-    ));
+    ]);
     // TODO: Do something with result $curl->response.
 }

examples/get_pages.php

@@ -5,8 +5,8 @@
 
 $curl = new Curl();
 for ($i = 1; $i <= 10; $i++) {
-    $curl->get('https://httpbin.org/get', array(
+    $curl->get('https://httpbin.org/get', [
         'page' => $i,
-    ));
+    ]);
     // TODO: Do something with result $curl->response.
 }