o2system / curl

src/Request.php

Spacing +63 added lines, -63 removed lines

@@ -75,28 +75,28 @@ 
         }

 

         // default, TRUE to return the transfer as a string of the return value of curl_exec() instead of outputting it out directly.

-        $this->curlOptions[ CURLOPT_RETURNTRANSFER ] = true;

+        $this->curlOptions[CURLOPT_RETURNTRANSFER] = true;

 

         // default, TRUE to output verbose information.

-        $this->curlOptions[ CURLOPT_VERBOSE ] = true;

+        $this->curlOptions[CURLOPT_VERBOSE] = true;

 

         // default, TRUE to include the header in the output.

-        $this->curlOptions[ CURLOPT_HEADER ] = true;

+        $this->curlOptions[CURLOPT_HEADER] = true;

 

         // default, lets CURL decide which version to use.

-        $this->curlOptions[ CURLOPT_HTTP_VERSION ] = CURL_HTTP_VERSION_NONE;

+        $this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_NONE;

 

         // default, http user agent using o2system curl.

-        $this->curlOptions[ CURLOPT_USERAGENT ] = 'Curl/1.0 (O2System)';

+        $this->curlOptions[CURLOPT_USERAGENT] = 'Curl/1.0 (O2System)';

 

         // default, TRUE to automatically set the Referer: field in requests where it follows a Location: redirect.

-        $this->curlOptions[ CURLOPT_AUTOREFERER ] = true;

+        $this->curlOptions[CURLOPT_AUTOREFERER] = true;

 

         // default, FALSE to stop cURL from verifying the peer's certificate.

-        $this->curlOptions[ CURLOPT_SSL_VERIFYPEER ] = false;

+        $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = false;

 

         // default, 0 to not check the names.

-        $this->curlOptions[ CURLOPT_SSL_VERIFYHOST ] = 0;

+        $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;

     }

 

     // ------------------------------------------------------------------------

@@ -137,7 +137,7 @@ 
      */

     public function setOption($option, $value)

     {

-        $this->curlOptions[ $option ] = $value;

+        $this->curlOptions[$option] = $value;

 

         return $this;

     }

@@ -179,7 +179,7 @@ 
                 CURL_HTTP_VERSION_2,

             ]

         )) {

-            $this->curlOptions[ CURLOPT_HTTP_VERSION ] = $httpVersion;

+            $this->curlOptions[CURLOPT_HTTP_VERSION] = $httpVersion;

         }

 

         return $this;

@@ -198,7 +198,7 @@ 
      */

     public function setUserAgent($userAgent)

     {

-        $this->curlOptions[ CURLOPT_USERAGENT ] = trim($userAgent);

+        $this->curlOptions[CURLOPT_USERAGENT] = trim($userAgent);

 

         return $this;

     }

@@ -216,7 +216,7 @@ 
      */

     public function setReferer($referer)

     {

-        $this->curlOptions[ CURLOPT_REFERER ] = trim($referer);

+        $this->curlOptions[CURLOPT_REFERER] = trim($referer);

 

         return $this;

     }

@@ -237,9 +237,9 @@ 
     public function setEncoding($encoding)

     {

         if (in_array($encoding, ['identity', 'deflate', 'gzip'])) {

-            $this->curlOptions[ CURLOPT_ENCODING ] = $encoding;

+            $this->curlOptions[CURLOPT_ENCODING] = $encoding;

         } else {

-            $this->curlOptions[ CURLOPT_ENCODING ] = '';

+            $this->curlOptions[CURLOPT_ENCODING] = '';

         }

 

         return $this;

@@ -260,9 +260,9 @@ 
     public function setTimeout($timeout, $isMilliseconds = false)

     {

         if ($isMilliseconds) {

-            $this->curlOptions[ CURLOPT_TIMEOUT_MS ] = (int)$timeout;

+            $this->curlOptions[CURLOPT_TIMEOUT_MS] = (int) $timeout;

         } else {

-            $this->curlOptions[ CURLOPT_TIMEOUT ] = (int)$timeout;

+            $this->curlOptions[CURLOPT_TIMEOUT] = (int) $timeout;

         }

 

         return $this;

@@ -283,9 +283,9 @@ 
     public function setConnectionTimeout($timeout, $isMilliseconds = false)

     {

         if ($isMilliseconds) {

-            $this->curlOptions[ CURLOPT_CONNECTTIMEOUT_MS ] = (int)$timeout;

+            $this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = (int) $timeout;

         } else {

-            $this->curlOptions[ CURLOPT_CONNECTTIMEOUT ] = (int)$timeout;

+            $this->curlOptions[CURLOPT_CONNECTTIMEOUT] = (int) $timeout;

         }

 

         return $this;

@@ -304,8 +304,8 @@ 
      */

     public function setMaximumRedirects($maximum)

     {

-        $this->curlOptions[ CURLOPT_MAXREDIRS ] = (int)$maximum;

-        $this->curlOptions[ CURLOPT_FOLLOWLOCATION ] = true;

+        $this->curlOptions[CURLOPT_MAXREDIRS] = (int) $maximum;

+        $this->curlOptions[CURLOPT_FOLLOWLOCATION] = true;

 

         return $this;

     }

@@ -330,8 +330,8 @@ 
     {

         if (is_file($caInfoFilePath)) {

             $this->setSslVerify(2, true);

-            $this->curlOptions[ CURLOPT_CAINFO ] = pathinfo($caInfoFilePath, PATHINFO_BASENAME);

-            $this->curlOptions[ CURLOPT_CAPATH ] = dirname($caInfoFilePath);

+            $this->curlOptions[CURLOPT_CAINFO] = pathinfo($caInfoFilePath, PATHINFO_BASENAME);

+            $this->curlOptions[CURLOPT_CAPATH] = dirname($caInfoFilePath);

         }

 

         return $this;

@@ -355,11 +355,11 @@ 
      */

     public function setSslVerify($verifyHost, $verifyStatus = false)

     {

-        $this->curlOptions[ CURLOPT_SSL_VERIFYPEER ] = true;

+        $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = true;

 

         $verifyHost = in_array($verifyHost, range(0, 3)) ? $verifyHost : 0;

-        $this->curlOptions[ CURLOPT_SSL_VERIFYHOST ] = (int)$verifyHost;

-        $this->curlOptions[ CURLOPT_SSL_VERIFYSTATUS ] = (bool)$verifyStatus;

+        $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = (int) $verifyHost;

+        $this->curlOptions[CURLOPT_SSL_VERIFYSTATUS] = (bool) $verifyStatus;

 

         return $this;

     }

@@ -386,11 +386,11 @@ 
     public function setAuthentication($username = '', $password = '', $method = CURLAUTH_ANY)

     {

         if (defined('CURLOPT_USERNAME')) {

-            $this->curlOptions[ CURLOPT_USERNAME ] = $username;

+            $this->curlOptions[CURLOPT_USERNAME] = $username;

         }

 

-        $this->curlOptions[ CURLOPT_USERPWD ] = "$username:$password";

-        $this->curlOptions[ CURLOPT_HTTPAUTH ] = CURLAUTH_ANY;

+        $this->curlOptions[CURLOPT_USERPWD] = "$username:$password";

+        $this->curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_ANY;

 

         if (in_array($method, [

             CURLAUTH_BASIC,

@@ -400,7 +400,7 @@ 
             CURLAUTH_ANY,

             CURLAUTH_ANYSAFE,

         ])) {

-            $this->curlOptions[ CURLOPT_HTTPAUTH ] = $method;

+            $this->curlOptions[CURLOPT_HTTPAUTH] = $method;

         }

 

         return $this;

@@ -427,10 +427,10 @@ 
      */

     public function setProxy($address, $port = 1080, $type = CURLPROXY_HTTP)

     {

-        $this->curlOptions[ CURLOPT_PROXY ] = $address;

-        $this->curlOptions[ CURLOPT_PROXYPORT ] = $port;

-        $this->curlOptions[ CURLOPT_PROXYTYPE ] = $type;

-        $this->curlOptions[ CURLOPT_HTTPPROXYTUNNEL ] = true;

+        $this->curlOptions[CURLOPT_PROXY] = $address;

+        $this->curlOptions[CURLOPT_PROXYPORT] = $port;

+        $this->curlOptions[CURLOPT_PROXYTYPE] = $type;

+        $this->curlOptions[CURLOPT_HTTPPROXYTUNNEL] = true;

 

         return $this;

     }

@@ -453,16 +453,16 @@ 
     public function setProxyAuthentication($username, $password, $method = CURLAUTH_BASIC)

     {

         if (array_key_exists(CURLOPT_HTTPPROXYTUNNEL, $this->curlOptions)) {

-            $this->curlOptions[ CURLOPT_PROXYUSERPWD ] = "$username:$password";

+            $this->curlOptions[CURLOPT_PROXYUSERPWD] = "$username:$password";

         }

 

-        $this->curlOptions[ CURLOPT_PROXYAUTH ] = CURLAUTH_BASIC;

+        $this->curlOptions[CURLOPT_PROXYAUTH] = CURLAUTH_BASIC;

 

         if (in_array($method, [

             CURLAUTH_BASIC,

             CURLAUTH_NTLM,

         ])) {

-            $this->curlOptions[ CURLOPT_PROXYAUTH ] = $method;

+            $this->curlOptions[CURLOPT_PROXYAUTH] = $method;

         }

 

         return $this;

@@ -502,7 +502,7 @@ 
      */

     public function addHeader($name, $value)

     {

-        $this->curlHeaders[ $name ] = $value;

+        $this->curlHeaders[$name] = $value;

 

         return $this;

     }

@@ -522,7 +522,7 @@ 
      */

     public function setCookie($cookie)

     {

-        $this->curlOptions[ CURLOPT_COOKIE ] = $cookie;

+        $this->curlOptions[CURLOPT_COOKIE] = $cookie;

 

         return $this;

     }

@@ -544,8 +544,8 @@ 
     {

         if (is_file($cookieFile)) {

             $cookieJar = empty($cookieJar) ? $cookieFile : $cookieJar;

-            $this->curlOptions[ CURLOPT_COOKIEFILE ] = $cookieFile;

-            $this->curlOptions[ CURLOPT_COOKIEJAR ] = $cookieJar;

+            $this->curlOptions[CURLOPT_COOKIEFILE] = $cookieFile;

+            $this->curlOptions[CURLOPT_COOKIEJAR] = $cookieJar;

         }

 

         return $this;

@@ -566,7 +566,7 @@ 
     {

         $this->uri = $this->uri->withQuery($query);

 

-        $this->curlOptions[ CURLOPT_HTTPGET ] = true;

+        $this->curlOptions[CURLOPT_HTTPGET] = true;

 

         return $this->getResponse();

     }

@@ -594,7 +594,7 @@ 
                 $headers[] = trim($key) . ': ' . trim($value);

             }

 

-            $this->curlOptions[ CURLOPT_HTTPHEADER ] = $headers;

+            $this->curlOptions[CURLOPT_HTTPHEADER] = $headers;

         }

 

         if (curl_setopt_array($handle, $this->curlOptions)) {

@@ -625,14 +625,14 @@ 
      */

     public function post(array $fields = [], $json = false)

     {

-        $this->curlOptions[ CURLOPT_POST ] = true;

+        $this->curlOptions[CURLOPT_POST] = true;

 

         if ($json === true) {

-            $this->curlOptions[ CURLOPT_POSTFIELDS ] = json_encode($fields);

+            $this->curlOptions[CURLOPT_POSTFIELDS] = json_encode($fields);

             $this->addHeader('Content-Type', 'application/json');

-            $this->addHeader('Content-Length', strlen($this->curlOptions[ CURLOPT_POSTFIELDS ]));

+            $this->addHeader('Content-Length', strlen($this->curlOptions[CURLOPT_POSTFIELDS]));

         } else {

-            $this->curlOptions[ CURLOPT_POSTFIELDS ] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);

+            $this->curlOptions[CURLOPT_POSTFIELDS] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);

         }

 

         return $this->getResponse();

@@ -651,11 +651,11 @@ 
      */

     public function delete(array $fields = [])

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'DELETE';

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'DELETE';

 

         if (count($fields)) {

-            $this->curlOptions[ CURLOPT_POST ] = true;

-            $this->curlOptions[ CURLOPT_POSTFIELDS ] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);

+            $this->curlOptions[CURLOPT_POST] = true;

+            $this->curlOptions[CURLOPT_POSTFIELDS] = http_build_query($fields, null, '&', PHP_QUERY_RFC3986);

         }

 

         return $this->getResponse();

@@ -672,10 +672,10 @@ 
      */

     public function head()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'HEAD';

-        $this->curlOptions[ CURLOPT_HTTPGET ] = true;

-        $this->curlOptions[ CURLOPT_HEADER ] = true;

-        $this->curlOptions[ CURLOPT_NOBODY ] = true;

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'HEAD';

+        $this->curlOptions[CURLOPT_HTTPGET] = true;

+        $this->curlOptions[CURLOPT_HEADER] = true;

+        $this->curlOptions[CURLOPT_NOBODY] = true;

 

         return $this->getResponse();

     }

@@ -691,7 +691,7 @@ 
      */

     public function trace()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'TRACE';

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'TRACE';

 

         return $this->getResponse();

     }

@@ -707,7 +707,7 @@ 
      */

     public function options()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'OPTIONS';

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'OPTIONS';

 

         return $this->getResponse();

     }

@@ -723,7 +723,7 @@ 
      */

     public function patch()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'PATCH';

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'PATCH';

 

         return $this->getResponse();

     }

@@ -739,7 +739,7 @@ 
      */

     public function connect()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'CONNECT';

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'CONNECT';

 

         return $this->getResponse();

     }

@@ -755,9 +755,9 @@ 
      */

     public function download()

     {

-        $this->curlOptions[ CURLOPT_CUSTOMREQUEST ] = 'DOWNLOAD';

-        $this->curlOptions[ CURLOPT_BINARYTRANSFER ] = true;

-        $this->curlOptions[ CURLOPT_RETURNTRANSFER ] = false;

+        $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'DOWNLOAD';

+        $this->curlOptions[CURLOPT_BINARYTRANSFER] = true;

+        $this->curlOptions[CURLOPT_RETURNTRANSFER] = false;

 

         return $this->getResponse();

     }

@@ -774,11 +774,11 @@ 
     public function getHandle()

     {

         if ($this->curlAutoClose) {

-            $this->curlOptions[ CURLOPT_FORBID_REUSE ] = true;

-            $this->curlOptions[ CURLOPT_FRESH_CONNECT ] = true;

+            $this->curlOptions[CURLOPT_FORBID_REUSE] = true;

+            $this->curlOptions[CURLOPT_FRESH_CONNECT] = true;

         }

 

-        $this->curlOptions[ CURLOPT_URL ] = $this->uri->__toString();

+        $this->curlOptions[CURLOPT_URL] = $this->uri->__toString();

 

         $handle = curl_init($this->uri->__toString());