Rozbo / puck

core/helpers/Curl.php

Doc Comments +8 added lines, -8 removed lines

@@ -227,7 +227,7 @@ 
      * Progress
      *
      * @access public
-     * @param  $callback
+     * @param  \Closure $callback
      */
     public function progress($callback)
     {
@@ -263,7 +263,7 @@ 
      * Download Complete
      *
      * @access private
-     * @param  $fh
+     * @param  resource $fh
      */
     private function downloadComplete($fh)
     {
@@ -442,7 +442,7 @@ 
      * Get Info
      *
      * @access public
-     * @param  $opt
+     * @param  integer $opt
      *
      * @return mixed
      */
@@ -462,7 +462,7 @@ 
      * Get Opt
      *
      * @access public
-     * @param  $option
+     * @param  integer $option
      *
      * @return mixed
      */
@@ -1105,7 +1105,7 @@ 
      * Set Timeout
      *
      * @access public
-     * @param  $seconds
+     * @param  integer $seconds
      */
     public function setTimeout($seconds)
     {
@@ -1130,7 +1130,7 @@ 
      * Set User Agent
      *
      * @access public
-     * @param  $user_agent
+     * @param  string $user_agent
      */
     public function setUserAgent($user_agent)
     {
@@ -1173,7 +1173,7 @@ 
      * Using `curl -H "Host:" ...' is equivalent to $curl->removeHeader('Host');.
      *
      * @access public
-     * @param  $key
+     * @param  string $key
      */
     public function removeHeader($key)
     {
@@ -1360,7 +1360,7 @@ 
      * Parse Response Headers
      *
      * @access private
-     * @param  $raw_response_headers
+     * @param  string $raw_response_headers
      *
      * @return array
      */

Spacing +227 added lines, -227 removed lines

@@ -9,51 +9,51 @@ 
 
 class Curl {
 
-    const VERSION = '7.2.0';
-    const DEFAULT_TIMEOUT = 30;
+    const VERSION='7.2.0';
+    const DEFAULT_TIMEOUT=30;
 
     public $curl;
-    public $id = null;
-
-    public $error = false;
-    public $errorCode = 0;
-    public $errorMessage = null;
-
-    public $curlError = false;
-    public $curlErrorCode = 0;
-    public $curlErrorMessage = null;
-
-    public $httpError = false;
-    public $httpStatusCode = 0;
-    public $httpErrorMessage = null;
-
-    public $baseUrl = null;
-    public $url = null;
-    public $requestHeaders = null;
-    public $responseHeaders = null;
-    public $rawResponseHeaders = '';
-    public $responseCookies = array();
-    public $response = null;
-    public $rawResponse = null;
-
-    public $beforeSendFunction = null;
-    public $downloadCompleteFunction = null;
-    public $successFunction = null;
-    public $errorFunction = null;
-    public $completeFunction = null;
-    public $fileHandle = null;
-
-    private $cookies = array();
-    private $headers = array();
-    private $options = array();
-
-    private $jsonDecoder = null;
-    private $jsonPattern = '/^(?:application|text)\/(?:[a-z]+(?:[\.-][0-9a-z]+){0,}[\+\.]|x-)?json(?:-[a-z]+)?/i';
-    private $xmlDecoder = null;
-    private $xmlPattern = '~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
-    private $defaultDecoder = null;
-
-    public static $RFC2616 = array(
+    public $id=null;
+
+    public $error=false;
+    public $errorCode=0;
+    public $errorMessage=null;
+
+    public $curlError=false;
+    public $curlErrorCode=0;
+    public $curlErrorMessage=null;
+
+    public $httpError=false;
+    public $httpStatusCode=0;
+    public $httpErrorMessage=null;
+
+    public $baseUrl=null;
+    public $url=null;
+    public $requestHeaders=null;
+    public $responseHeaders=null;
+    public $rawResponseHeaders='';
+    public $responseCookies=array();
+    public $response=null;
+    public $rawResponse=null;
+
+    public $beforeSendFunction=null;
+    public $downloadCompleteFunction=null;
+    public $successFunction=null;
+    public $errorFunction=null;
+    public $completeFunction=null;
+    public $fileHandle=null;
+
+    private $cookies=array();
+    private $headers=array();
+    private $options=array();
+
+    private $jsonDecoder=null;
+    private $jsonPattern='/^(?:application|text)\/(?:[a-z]+(?:[\.-][0-9a-z]+){0,}[\+\.]|x-)?json(?:-[a-z]+)?/i';
+    private $xmlDecoder=null;
+    private $xmlPattern='~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
+    private $defaultDecoder=null;
+
+    public static $RFC2616=array(
         // RFC2616: "any CHAR except CTLs or separators".
         // CHAR           = <any US-ASCII character (octets 0 - 127)>
         // CTL            = <any US-ASCII control character
@@ -70,7 +70,7 @@ 
         'Y', 'Z', '^', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
         'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '|', '~',
     );
-    public static $RFC6265 = array(
+    public static $RFC6265=array(
         // RFC6265: "US-ASCII characters excluding CTLs, whitespace DQUOTE, comma, semicolon, and backslash".
         // %x21
         '!',
@@ -86,7 +86,7 @@ 
         's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~',
     );
 
-    private static $deferredProperties = array(
+    private static $deferredProperties=array(
         'effectiveUrl',
         'rfc2616',
         'rfc6265',
@@ -100,14 +100,14 @@ 
      * @param  $base_url
      * @throws \ErrorException
      */
-    public function __construct($base_url = null)
+    public function __construct($base_url=null)
     {
         if (!extension_loaded('curl')) {
             throw new \ErrorException('cURL library is not loaded');
         }
 
-        $this->curl = curl_init();
-        $this->id = uniqid('', true);
+        $this->curl=curl_init();
+        $this->id=uniqid('', true);
         $this->setDefaultUserAgent();
         $this->setDefaultJsonDecoder();
         $this->setDefaultXmlDecoder();
@@ -115,7 +115,7 @@ 
         $this->setOpt(CURLINFO_HEADER_OUT, true);
         $this->setOpt(CURLOPT_HEADERFUNCTION, array($this, 'headerCallback'));
         $this->setOpt(CURLOPT_RETURNTRANSFER, true);
-        $this->headers = [];
+        $this->headers=[];
         $this->setUrl($base_url);
     }
 
@@ -127,7 +127,7 @@ 
      */
     public function beforeSend($callback)
     {
-        $this->beforeSendFunction = $callback;
+        $this->beforeSendFunction=$callback;
     }
 
     /**
@@ -140,21 +140,21 @@ 
      */
     public function buildPostData($data)
     {
-        $binary_data = false;
+        $binary_data=false;
         if (is_array($data)) {
             // Return JSON-encoded string when the request's content-type is JSON.
             if (isset($this->headers['Content-Type']) &&
                 preg_match($this->jsonPattern, $this->headers['Content-Type'])) {
-                $json_str = json_encode($data);
+                $json_str=json_encode($data);
                 if (!($json_str === false)) {
-                    $data = $json_str;
+                    $data=$json_str;
                 }
             } else {
                 // Manually build a single-dimensional array from a multi-dimensional array as using curl_setopt($ch,
                 // CURLOPT_POSTFIELDS, $data) doesn't correctly handle multi-dimensional arrays when files are
                 // referenced.
                 if (Arr::isMultidim($data)) {
-                    $data = Arr::flatten($data);
+                    $data=Arr::flatten($data);
                 }
 
                 // Modify array values to ensure any referenced files are properly handled depending on the support of
@@ -163,19 +163,19 @@ 
                 // non-file values prefixed with the @ character.
                 foreach ($data as $key => $value) {
                     if (is_string($value) && strpos($value, '@') === 0 && is_file(substr($value, 1))) {
-                        $binary_data = true;
+                        $binary_data=true;
                         if (class_exists('CURLFile')) {
-                            $data[$key] = new \CURLFile(substr($value, 1));
+                            $data[$key]=new \CURLFile(substr($value, 1));
                         }
                     } elseif ($value instanceof \CURLFile) {
-                        $binary_data = true;
+                        $binary_data=true;
                     }
                 }
             }
         }
 
         if (!$binary_data && (is_array($data) || is_object($data))) {
-            $data = http_build_query($data, '', '&');
+            $data=http_build_query($data, '', '&');
         }
 
         return $data;
@@ -188,8 +188,8 @@ 
      */
     public function call()
     {
-        $args = func_get_args();
-        $function = array_shift($args);
+        $args=func_get_args();
+        $function=array_shift($args);
         if (is_callable($function)) {
             array_unshift($args, $this);
             call_user_func_array($function, $args);
@@ -206,10 +206,10 @@ 
         if (is_resource($this->curl)) {
             curl_close($this->curl);
         }
-        $this->options = null;
-        $this->jsonDecoder = null;
-        $this->xmlDecoder = null;
-        $this->defaultDecoder = null;
+        $this->options=null;
+        $this->jsonDecoder=null;
+        $this->xmlDecoder=null;
+        $this->defaultDecoder=null;
     }
 
     /**
@@ -220,7 +220,7 @@ 
      */
     public function complete($callback)
     {
-        $this->completeFunction = $callback;
+        $this->completeFunction=$callback;
     }
 
     /**
@@ -245,12 +245,12 @@ 
      *
      * @return string
      */
-    public function delete($url, $query_parameters = array(), $data = array())
+    public function delete($url, $query_parameters=array(), $data=array())
     {
         if (is_array($url)) {
-            $data = $query_parameters;
-            $query_parameters = $url;
-            $url = $this->baseUrl;
+            $data=$query_parameters;
+            $query_parameters=$url;
+            $url=$this->baseUrl;
         }
 
         $this->setUrl($url, $query_parameters);
@@ -270,7 +270,7 @@ 
         if (!$this->error && $this->downloadCompleteFunction) {
             rewind($fh);
             $this->call($this->downloadCompleteFunction, $fh);
-            $this->downloadCompleteFunction = null;
+            $this->downloadCompleteFunction=null;
         }
 
         if (is_resource($fh)) {
@@ -306,29 +306,29 @@ 
     public function download($url, $mixed_filename)
     {
         if (is_callable($mixed_filename)) {
-            $this->downloadCompleteFunction = $mixed_filename;
-            $this->fileHandle = tmpfile();
+            $this->downloadCompleteFunction=$mixed_filename;
+            $this->fileHandle=tmpfile();
         } else {
-            $filename = $mixed_filename;
+            $filename=$mixed_filename;
 
             // Use a temporary file when downloading. Not using a temporary file can cause an error when an existing
             // file has already fully completed downloading and a new download is started with the same destination save
             // path. The download request will include header "Range: bytes=$filesize-" which is syntactically valid,
             // but unsatisfiable.
-            $download_filename = $filename . '.pccdownload';
+            $download_filename=$filename.'.pccdownload';
 
-            $mode = 'wb';
+            $mode='wb';
             // Attempt to resume download only when a temporary download file exists and is not empty.
-            if (file_exists($download_filename) && $filesize = filesize($download_filename)) {
-                $mode = 'ab';
-                $first_byte_position = $filesize;
-                $range = $first_byte_position . '-';
+            if (file_exists($download_filename) && $filesize=filesize($download_filename)) {
+                $mode='ab';
+                $first_byte_position=$filesize;
+                $range=$first_byte_position.'-';
                 $this->setOpt(CURLOPT_RANGE, $range);
             }
-            $this->fileHandle = fopen($download_filename, $mode);
+            $this->fileHandle=fopen($download_filename, $mode);
 
             // Move the downloaded temporary file to the destination save path.
-            $this->downloadCompleteFunction = function ($fh) use ($download_filename, $filename) {
+            $this->downloadCompleteFunction=function($fh) use ($download_filename, $filename) {
                 rename($download_filename, $filename);
             };
         }
@@ -336,7 +336,7 @@ 
         $this->setOpt(CURLOPT_FILE, $this->fileHandle);
         $this->get($url);
 
-        return ! $this->error;
+        return !$this->error;
     }
 
     /**
@@ -347,7 +347,7 @@ 
      */
     public function error($callback)
     {
-        $this->errorFunction = $callback;
+        $this->errorFunction=$callback;
     }
 
     /**
@@ -358,48 +358,48 @@ 
      *
      * @return mixed Returns the value provided by parseResponse.
      */
-    public function exec($ch = null)
+    public function exec($ch=null)
     {
         if ($ch === null) {
-            $this->responseCookies = array();
+            $this->responseCookies=array();
             $this->call($this->beforeSendFunction);
-            $this->rawResponse = curl_exec($this->curl);
-            $this->curlErrorCode = curl_errno($this->curl);
-            $this->curlErrorMessage = curl_error($this->curl);
+            $this->rawResponse=curl_exec($this->curl);
+            $this->curlErrorCode=curl_errno($this->curl);
+            $this->curlErrorMessage=curl_error($this->curl);
         } else {
-            $this->rawResponse = curl_multi_getcontent($ch);
-            $this->curlErrorMessage = curl_error($ch);
+            $this->rawResponse=curl_multi_getcontent($ch);
+            $this->curlErrorMessage=curl_error($ch);
         }
-        $this->curlError = !($this->curlErrorCode === 0);
+        $this->curlError=!($this->curlErrorCode === 0);
         // Include additional error code information in error message when possible.
         if ($this->curlError && function_exists('curl_strerror')) {
-            $this->curlErrorMessage =
-                curl_strerror($this->curlErrorCode) . (
-                empty($this->curlErrorMessage) ? '' : ': ' . $this->curlErrorMessage
+            $this->curlErrorMessage=
+                curl_strerror($this->curlErrorCode).(
+                empty($this->curlErrorMessage) ? '' : ': '.$this->curlErrorMessage
                 );
             print_r($this->rawResponse);
         }
 
-        $this->httpStatusCode = $this->getInfo(CURLINFO_HTTP_CODE);
-        $this->httpError = in_array(floor($this->httpStatusCode / 100), array(4, 5));
-        $this->error = $this->curlError || $this->httpError;
-        $this->errorCode = $this->error ? ($this->curlError ? $this->curlErrorCode : $this->httpStatusCode) : 0;
+        $this->httpStatusCode=$this->getInfo(CURLINFO_HTTP_CODE);
+        $this->httpError=in_array(floor($this->httpStatusCode / 100), array(4, 5));
+        $this->error=$this->curlError || $this->httpError;
+        $this->errorCode=$this->error ? ($this->curlError ? $this->curlErrorCode : $this->httpStatusCode) : 0;
 
         // NOTE: CURLINFO_HEADER_OUT set to true is required for requestHeaders
         // to not be empty (e.g. $curl->setOpt(CURLINFO_HEADER_OUT, true);).
         if ($this->getOpt(CURLINFO_HEADER_OUT) === true) {
-            $this->requestHeaders = $this->parseRequestHeaders($this->getInfo(CURLINFO_HEADER_OUT));
+            $this->requestHeaders=$this->parseRequestHeaders($this->getInfo(CURLINFO_HEADER_OUT));
         }
-        $this->responseHeaders = $this->parseResponseHeaders($this->rawResponseHeaders);
-        $this->response = $this->parseResponse($this->responseHeaders, $this->rawResponse);
+        $this->responseHeaders=$this->parseResponseHeaders($this->rawResponseHeaders);
+        $this->response=$this->parseResponse($this->responseHeaders, $this->rawResponse);
 
-        $this->httpErrorMessage = '';
+        $this->httpErrorMessage='';
         if ($this->error) {
             if (isset($this->responseHeaders['Status-Line'])) {
-                $this->httpErrorMessage = $this->responseHeaders['Status-Line'];
+                $this->httpErrorMessage=$this->responseHeaders['Status-Line'];
             }
         }
-        $this->errorMessage = $this->curlError ? $this->curlErrorMessage : $this->httpErrorMessage;
+        $this->errorMessage=$this->curlError ? $this->curlErrorMessage : $this->httpErrorMessage;
 
         if (!$this->error) {
             $this->call($this->successFunction);
@@ -426,11 +426,11 @@ 
      *
      * @return mixed Returns the value provided by exec.
      */
-    public function get($url, $data = array())
+    public function get($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
         $this->setUrl($url, $data);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
@@ -446,13 +446,13 @@ 
      *
      * @return mixed
      */
-    public function getInfo($opt = null)
+    public function getInfo($opt=null)
     {
-        $args = array();
-        $args[] = $this->curl;
+        $args=array();
+        $args[]=$this->curl;
 
         if (func_num_args()) {
-            $args[] = $opt;
+            $args[]=$opt;
         }
 
         return call_user_func_array('curl_getinfo', $args);
@@ -480,11 +480,11 @@ 
      *
      * @return string
      */
-    public function head($url, $data = array())
+    public function head($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
         $this->setUrl($url, $data);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD');
@@ -504,9 +504,9 @@ 
     public function headerCallback($ch, $header)
     {
         if (preg_match('/^Set-Cookie:\s*([^=]+)=([^;]+)/mi', $header, $cookie) === 1) {
-            $this->responseCookies[$cookie[1]] = trim($cookie[2], " \n\r\t\0\x0B");
+            $this->responseCookies[$cookie[1]]=trim($cookie[2], " \n\r\t\0\x0B");
         }
-        $this->rawResponseHeaders .= $header;
+        $this->rawResponseHeaders.=$header;
         return strlen($header);
     }
 
@@ -519,11 +519,11 @@ 
      *
      * @return string
      */
-    public function options($url, $data = array())
+    public function options($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
         $this->setUrl($url, $data);
         $this->removeHeader('Content-Length');
@@ -540,11 +540,11 @@ 
      *
      * @return string
      */
-    public function patch($url, $data = array())
+    public function patch($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
 
         if (is_array($data) && empty($data)) {
@@ -582,12 +582,12 @@ 
      * [2] https://github.com/php/php-src/pull/531
      * [3] http://php.net/ChangeLog-5.php#5.5.11
      */
-    public function post($url, $data = array(), $follow_303_with_post = false)
+    public function post($url, $data=array(), $follow_303_with_post=false)
     {
         if (is_array($url)) {
-            $follow_303_with_post = (bool)$data;
-            $data = $url;
-            $url = $this->baseUrl;
+            $follow_303_with_post=(bool) $data;
+            $data=$url;
+            $url=$this->baseUrl;
         }
 
         $this->setUrl($url);
@@ -624,15 +624,15 @@ 
      *
      * @return string
      */
-    public function put($url, $data = array())
+    public function put($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
         $this->setUrl($url);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
-        $put_data = $this->buildPostData($data);
+        $put_data=$this->buildPostData($data);
         if (empty($this->options[CURLOPT_INFILE]) && empty($this->options[CURLOPT_INFILESIZE])) {
             if (is_string($put_data)) {
                 $this->setHeader('Content-Length', strlen($put_data));
@@ -653,15 +653,15 @@ 
      *
      * @return string
      */
-    public function search($url, $data = array())
+    public function search($url, $data=array())
     {
         if (is_array($url)) {
-            $data = $url;
-            $url = $this->baseUrl;
+            $data=$url;
+            $url=$this->baseUrl;
         }
         $this->setUrl($url);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH');
-        $put_data = $this->buildPostData($data);
+        $put_data=$this->buildPostData($data);
         if (empty($this->options[CURLOPT_INFILE]) && empty($this->options[CURLOPT_INFILESIZE])) {
             if (is_string($put_data)) {
                 $this->setHeader('Content-Length', strlen($put_data));
@@ -680,10 +680,10 @@ 
      * @param  $username
      * @param  $password
      */
-    public function setBasicAuthentication($username, $password = '')
+    public function setBasicAuthentication($username, $password='')
     {
         $this->setOpt(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-        $this->setOpt(CURLOPT_USERPWD, $username . ':' . $password);
+        $this->setOpt(CURLOPT_USERPWD, $username.':'.$password);
     }
 
     /**
@@ -693,10 +693,10 @@ 
      * @param  $username
      * @param  $password
      */
-    public function setDigestAuthentication($username, $password = '')
+    public function setDigestAuthentication($username, $password='')
     {
         $this->setOpt(CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-        $this->setOpt(CURLOPT_USERPWD, $username . ':' . $password);
+        $this->setOpt(CURLOPT_USERPWD, $username.':'.$password);
     }
 
     /**
@@ -708,27 +708,27 @@ 
      */
     public function setCookie($key, $value)
     {
-        $name_chars = array();
+        $name_chars=array();
         foreach (str_split($key) as $name_char) {
             if (!isset($this->rfc2616[$name_char])) {
-                $name_chars[] = rawurlencode($name_char);
+                $name_chars[]=rawurlencode($name_char);
             } else {
-                $name_chars[] = $name_char;
+                $name_chars[]=$name_char;
             }
         }
 
-        $value_chars = array();
+        $value_chars=array();
         foreach (str_split($value) as $value_char) {
             if (!isset($this->rfc6265[$value_char])) {
-                $value_chars[] = rawurlencode($value_char);
+                $value_chars[]=rawurlencode($value_char);
             } else {
-                $value_chars[] = $value_char;
+                $value_chars[]=$value_char;
             }
         }
 
-        $this->cookies[implode('', $name_chars)] = implode('', $value_chars);
-        $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function ($k, $v) {
-            return $k . '=' . $v;
+        $this->cookies[implode('', $name_chars)]=implode('', $value_chars);
+        $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function($k, $v) {
+            return $k.'='.$v;
         }, array_keys($this->cookies), array_values($this->cookies))));
     }
 
@@ -741,29 +741,29 @@ 
     public function setCookies($cookies)
     {
         foreach ($cookies as $key => $value) {
-            $name_chars = array();
+            $name_chars=array();
             foreach (str_split($key) as $name_char) {
                 if (!isset($this->rfc2616[$name_char])) {
-                    $name_chars[] = rawurlencode($name_char);
+                    $name_chars[]=rawurlencode($name_char);
                 } else {
-                    $name_chars[] = $name_char;
+                    $name_chars[]=$name_char;
                 }
             }
 
-            $value_chars = array();
+            $value_chars=array();
             foreach (str_split($value) as $value_char) {
                 if (!isset($this->rfc6265[$value_char])) {
-                    $value_chars[] = rawurlencode($value_char);
+                    $value_chars[]=rawurlencode($value_char);
                 } else {
-                    $value_chars[] = $value_char;
+                    $value_chars[]=$value_char;
                 }
             }
 
-            $this->cookies[implode('', $name_chars)] = implode('', $value_chars);
+            $this->cookies[implode('', $name_chars)]=implode('', $value_chars);
         }
 
-        $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function ($k, $v) {
-            return $k . '=' . $v;
+        $this->setOpt(CURLOPT_COOKIE, implode('; ', array_map(function($k, $v) {
+            return $k.'='.$v;
         }, array_keys($this->cookies), array_values($this->cookies))));
     }
 
@@ -803,14 +803,14 @@ 
     {
         // Make compatible with PHP version both before and after 5.5.0. PHP 5.5.0 added the cURL resource as the first
         // argument to the CURLOPT_PROGRESSFUNCTION callback.
-        $gte_v550 = version_compare(PHP_VERSION, '5.5.0') >= 0;
+        $gte_v550=version_compare(PHP_VERSION, '5.5.0') >= 0;
         if ($gte_v550) {
-            $callback = function ($resource, $download_size, $downloaded, $upload_size, $uploaded) use ($bytes) {
+            $callback=function($resource, $download_size, $downloaded, $upload_size, $uploaded) use ($bytes) {
                 // Abort the transfer when $downloaded bytes exceeds maximum $bytes by returning a non-zero value.
                 return $downloaded > $bytes ? 1 : 0;
             };
         } else {
-            $callback = function ($download_size, $downloaded, $upload_size, $uploaded) use ($bytes) {
+            $callback=function($download_size, $downloaded, $upload_size, $uploaded) use ($bytes) {
                 return $downloaded > $bytes ? 1 : 0;
             };
         }
@@ -889,20 +889,20 @@ 
      */
     public function setDefaultJsonDecoder()
     {
-        $args = func_get_args();
-        $this->jsonDecoder = function ($response) use ($args) {
+        $args=func_get_args();
+        $this->jsonDecoder=function($response) use ($args) {
             array_unshift($args, $response);
 
             // Call json_decode() without the $options parameter in PHP
             // versions less than 5.4.0 as the $options parameter was added in
             // PHP version 5.4.0.
             if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-                $args = array_slice($args, 0, 3);
+                $args=array_slice($args, 0, 3);
             }
 
-            $json_obj = call_user_func_array('json_decode', $args);
+            $json_obj=call_user_func_array('json_decode', $args);
             if (!($json_obj === null)) {
-                $response = $json_obj;
+                $response=$json_obj;
             }
             return $response;
         };
@@ -915,10 +915,10 @@ 
      */
     public function setDefaultXmlDecoder()
     {
-        $this->xmlDecoder = function ($response) {
-            $xml_obj = @simplexml_load_string($response);
+        $this->xmlDecoder=function($response) {
+            $xml_obj=@simplexml_load_string($response);
             if (!($xml_obj === false)) {
-                $response = $xml_obj;
+                $response=$xml_obj;
             }
             return $response;
         };
@@ -930,15 +930,15 @@ 
      * @access public
      * @param  $decoder string|callable
      */
-    public function setDefaultDecoder($decoder = 'json')
+    public function setDefaultDecoder($decoder='json')
     {
         if (is_callable($decoder)) {
-            $this->defaultDecoder = $decoder;
+            $this->defaultDecoder=$decoder;
         } else {
             if ($decoder === 'json') {
-                $this->defaultDecoder = $this->jsonDecoder;
+                $this->defaultDecoder=$this->jsonDecoder;
             } elseif ($decoder === 'xml') {
-                $this->defaultDecoder = $this->xmlDecoder;
+                $this->defaultDecoder=$this->xmlDecoder;
             }
         }
     }
@@ -960,10 +960,10 @@ 
      */
     public function setDefaultUserAgent()
     {
-        $user_agent = 'puck client' . self::VERSION . ' mini';
-        $user_agent .= ' PHP/' . PHP_VERSION;
-        $curl_version = curl_version();
-        $user_agent .= ' curl/' . $curl_version['version'];
+        $user_agent='puck client'.self::VERSION.' mini';
+        $user_agent.=' PHP/'.PHP_VERSION;
+        $curl_version=curl_version();
+        $user_agent.=' curl/'.$curl_version['version'];
         $this->setUserAgent($user_agent);
     }
 
@@ -978,10 +978,10 @@ 
      */
     public function setHeader($key, $value)
     {
-        $this->headers[$key] = $value;
-        $headers = array();
+        $this->headers[$key]=$value;
+        $headers=array();
         foreach ($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+            $headers[]=$key.': '.$value;
         }
         $this->setOpt(CURLOPT_HTTPHEADER, $headers);
     }
@@ -997,12 +997,12 @@ 
     public function setHeaders($headers)
     {
         foreach ($headers as $key => $value) {
-            $this->headers[$key] = $value;
+            $this->headers[$key]=$value;
         }
 
-        $headers = array();
+        $headers=array();
         foreach ($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+            $headers[]=$key.': '.$value;
         }
         $this->setOpt(CURLOPT_HTTPHEADER, $headers);
     }
@@ -1016,7 +1016,7 @@ 
     public function setJsonDecoder($function)
     {
         if (is_callable($function)) {
-            $this->jsonDecoder = $function;
+            $this->jsonDecoder=$function;
         }
     }
 
@@ -1029,7 +1029,7 @@ 
     public function setXmlDecoder($function)
     {
         if (is_callable($function)) {
-            $this->xmlDecoder = $function;
+            $this->xmlDecoder=$function;
         }
     }
 
@@ -1044,17 +1044,17 @@ 
      */
     public function setOpt($option, $value)
     {
-        $required_options = array(
+        $required_options=array(
             CURLOPT_RETURNTRANSFER => 'CURLOPT_RETURNTRANSFER',
         );
 
         if (in_array($option, array_keys($required_options), true) && !($value === true)) {
-            trigger_error($required_options[$option] . ' is a required option', E_USER_WARNING);
+            trigger_error($required_options[$option].' is a required option', E_USER_WARNING);
         }
 
-        $success = curl_setopt($this->curl, $option, $value);
+        $success=curl_setopt($this->curl, $option, $value);
         if ($success) {
-            $this->options[$option] = $value;
+            $this->options[$option]=$value;
         }
         return $success;
     }
@@ -1119,10 +1119,10 @@ 
      * @param  $url
      * @param  $data
      */
-    public function setUrl($url, $data = array())
+    public function setUrl($url, $data=array())
     {
-        $this->baseUrl = $url;
-        $this->url = $this->buildURL($url, $data);
+        $this->baseUrl=$url;
+        $this->url=$this->buildURL($url, $data);
         $this->setOpt(CURLOPT_URL, $this->url);
     }
 
@@ -1145,7 +1145,7 @@ 
      */
     public function success($callback)
     {
-        $this->successFunction = $callback;
+        $this->successFunction=$callback;
     }
 
     /**
@@ -1159,9 +1159,9 @@ 
     public function unsetHeader($key)
     {
         unset($this->headers[$key]);
-        $headers = array();
+        $headers=array();
         foreach ($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+            $headers[]=$key.': '.$value;
         }
         $this->setOpt(CURLOPT_HTTPHEADER, $headers);
     }
@@ -1187,7 +1187,7 @@ 
      * @param  bool $on
      * @param  resource $output
      */
-    public function verbose($on = true, $output = STDERR)
+    public function verbose($on=true, $output=STDERR)
     {
         // Turn off CURLINFO_HEADER_OUT for verbose to work. This has the side
         // effect of causing Curl::requestHeaders to be empty.
@@ -1210,9 +1210,9 @@ 
 
     public function __get($name)
     {
-        $return = null;
-        if (in_array($name, self::$deferredProperties) && is_callable(array($this, $getter = '__get_' . $name))) {
-            $return = $this->$name = $this->$getter();
+        $return=null;
+        if (in_array($name, self::$deferredProperties) && is_callable(array($this, $getter='__get_'.$name))) {
+            $return=$this->$name=$this->$getter();
         }
         return $return;
     }
@@ -1266,9 +1266,9 @@ 
      *
      * @return string
      */
-    private function buildURL($url, $data = array())
+    private function buildURL($url, $data=array())
     {
-        return $url . (empty($data) ? '' : '?' . http_build_query($data, '', '&'));
+        return $url.(empty($data) ? '' : '?'.http_build_query($data, '', '&'));
     }
 
     /**
@@ -1281,19 +1281,19 @@ 
      */
     private function parseHeaders($raw_headers)
     {
-        $raw_headers = preg_split('/\r\n/', $raw_headers, null, PREG_SPLIT_NO_EMPTY);
-        $http_headers = [];
+        $raw_headers=preg_split('/\r\n/', $raw_headers, null, PREG_SPLIT_NO_EMPTY);
+        $http_headers=[];
 
-        $raw_headers_count = count($raw_headers);
-        for ($i = 1; $i < $raw_headers_count; $i++) {
-            list($key, $value) = explode(':', $raw_headers[$i], 2);
-            $key = trim($key);
-            $value = trim($value);
+        $raw_headers_count=count($raw_headers);
+        for ($i=1; $i < $raw_headers_count; $i++) {
+            list($key, $value)=explode(':', $raw_headers[$i], 2);
+            $key=trim($key);
+            $value=trim($value);
             // Use isset() as array_key_exists() and ArrayAccess are not compatible.
             if (isset($http_headers[$key])) {
-                $http_headers[$key] .= ',' . $value;
+                $http_headers[$key].=','.$value;
             } else {
-                $http_headers[$key] = $value;
+                $http_headers[$key]=$value;
             }
         }
 
@@ -1310,11 +1310,11 @@ 
      */
     private function parseRequestHeaders($raw_headers)
     {
-        $request_headers = [];
-        list($first_line, $headers) = $this->parseHeaders($raw_headers);
-        $request_headers['Request-Line'] = $first_line;
+        $request_headers=[];
+        list($first_line, $headers)=$this->parseHeaders($raw_headers);
+        $request_headers['Request-Line']=$first_line;
         foreach ($headers as $key => $value) {
-            $request_headers[$key] = $value;
+            $request_headers[$key]=$value;
         }
         return $request_headers;
     }
@@ -1333,22 +1333,22 @@ 
      */
     private function parseResponse($response_headers, $raw_response)
     {
-        $response = $raw_response;
+        $response=$raw_response;
         if (isset($response_headers['Content-Type'])) {
             if (preg_match($this->jsonPattern, $response_headers['Content-Type'])) {
-                $json_decoder = $this->jsonDecoder;
+                $json_decoder=$this->jsonDecoder;
                 if (is_callable($json_decoder)) {
-                    $response = $json_decoder($response);
+                    $response=$json_decoder($response);
                 }
             } elseif (preg_match($this->xmlPattern, $response_headers['Content-Type'])) {
-                $xml_decoder = $this->xmlDecoder;
+                $xml_decoder=$this->xmlDecoder;
                 if (is_callable($xml_decoder)) {
-                    $response = $xml_decoder($response);
+                    $response=$xml_decoder($response);
                 }
             } else {
-                $decoder = $this->defaultDecoder;
+                $decoder=$this->defaultDecoder;
                 if (is_callable($decoder)) {
-                    $response = $decoder($response);
+                    $response=$decoder($response);
                 }
             }
         }
@@ -1366,20 +1366,20 @@ 
      */
     private function parseResponseHeaders($raw_response_headers)
     {
-        $response_header_array = explode("\r\n\r\n", $raw_response_headers);
-        $response_header  = '';
-        for ($i = count($response_header_array) - 1; $i >= 0; $i--) {
+        $response_header_array=explode("\r\n\r\n", $raw_response_headers);
+        $response_header='';
+        for ($i=count($response_header_array) - 1; $i >= 0; $i--) {
             if (stripos($response_header_array[$i], 'HTTP/') === 0) {
-                $response_header = $response_header_array[$i];
+                $response_header=$response_header_array[$i];
                 break;
             }
         }
 
-        $response_headers = [];
-        list($first_line, $headers) = $this->parseHeaders($response_header);
-        $response_headers['Status-Line'] = $first_line;
+        $response_headers=[];
+        list($first_line, $headers)=$this->parseHeaders($response_header);
+        $response_headers['Status-Line']=$first_line;
         foreach ($headers as $key => $value) {
-            $response_headers[$key] = $value;
+            $response_headers[$key]=$value;
         }
         return $response_headers;
     }

core/tools/Arr.php

Spacing +46 added lines, -46 removed lines

@@ -42,16 +42,16 @@ 
      * @return array
      */
     public static function collapse($array) {
-        $results = [];
+        $results=[];
 
         foreach ($array as $values) {
             if ($values instanceof Collection) {
-                $values = $values->all();
+                $values=$values->all();
             } elseif (!is_array($values)) {
                 continue;
             }
 
-            $results = array_merge($results, $values);
+            $results=array_merge($results, $values);
         }
 
         return $results;
@@ -74,14 +74,14 @@ 
      * @param  string $prepend
      * @return array
      */
-    public static function dot($array, $prepend = '') {
-        $results = [];
+    public static function dot($array, $prepend='') {
+        $results=[];
 
         foreach ($array as $key => $value) {
             if (is_array($value) && !empty($value)) {
-                $results = array_merge($results, static::dot($value, $prepend . $key . '.'));
+                $results=array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
-                $results[$prepend . $key] = $value;
+                $results[$prepend.$key]=$value;
             }
         }
 
@@ -124,7 +124,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function first($array, callable $callback = null, $default = null) {
+    public static function first($array, callable $callback=null, $default=null) {
         if (is_null($callback)) {
             if (empty($array)) {
                 return value($default);
@@ -152,7 +152,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function last($array, callable $callback = null, $default = null) {
+    public static function last($array, callable $callback=null, $default=null) {
         if (is_null($callback)) {
             return empty($array) ? value($default) : end($array);
         }
@@ -167,9 +167,9 @@ 
      * @param  int $depth
      * @return array
      */
-    public static function flatten($array, $depth = INF) {
-        return array_reduce($array, function ($result, $item) use ($depth) {
-            $item = $item instanceof Collection ? $item->all() : $item;
+    public static function flatten($array, $depth=INF) {
+        return array_reduce($array, function($result, $item) use ($depth) {
+            $item=$item instanceof Collection ? $item->all() : $item;
 
             if (!is_array($item)) {
                 return array_merge($result, [$item]);
@@ -189,9 +189,9 @@ 
      * @return void
      */
     public static function forget(&$array, $keys) {
-        $original = &$array;
+        $original=&$array;
 
-        $keys = (array)$keys;
+        $keys=(array) $keys;
 
         if (count($keys) === 0) {
             return;
@@ -205,16 +205,16 @@ 
                 continue;
             }
 
-            $parts = explode('.', $key);
+            $parts=explode('.', $key);
 
             // clean up before each pass
-            $array = &$original;
+            $array=&$original;
 
             while (count($parts) > 1) {
-                $part = array_shift($parts);
+                $part=array_shift($parts);
 
                 if (isset($array[$part]) && is_array($array[$part])) {
-                    $array = &$array[$part];
+                    $array=&$array[$part];
                 } else {
                     continue 2;
                 }
@@ -232,7 +232,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function get($array, $key, $default = null) {
+    public static function get($array, $key, $default=null) {
         if (!static::accessible($array)) {
             return value($default);
         }
@@ -247,7 +247,7 @@ 
 
         foreach (explode('.', $key) as $segment) {
             if (static::accessible($array) && static::exists($array, $segment)) {
-                $array = $array[$segment];
+                $array=$array[$segment];
             } else {
                 return value($default);
             }
@@ -268,7 +268,7 @@ 
             return false;
         }
 
-        $keys = (array)$keys;
+        $keys=(array) $keys;
 
         if (!$array) {
             return false;
@@ -279,7 +279,7 @@ 
         }
 
         foreach ($keys as $key) {
-            $subKeyArray = $array;
+            $subKeyArray=$array;
 
             if (static::exists($array, $key)) {
                 continue;
@@ -287,7 +287,7 @@ 
 
             foreach (explode('.', $key) as $segment) {
                 if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
-                    $subKeyArray = $subKeyArray[$segment];
+                    $subKeyArray=$subKeyArray[$segment];
                 } else {
                     return false;
                 }
@@ -306,7 +306,7 @@ 
      * @return bool
      */
     public static function isAssoc(array $array) {
-        $keys = array_keys($array);
+        $keys=array_keys($array);
 
         return array_keys($keys) !== $keys;
     }
@@ -324,7 +324,7 @@ 
             return false;
         }
 
-        return (bool)count(array_filter($array, 'is_array'));
+        return (bool) count(array_filter($array, 'is_array'));
     }
 
     /**
@@ -335,7 +335,7 @@ 
      * @return array
      */
     public static function only($array, $keys) {
-        return array_intersect_key($array, array_flip((array)$keys));
+        return array_intersect_key($array, array_flip((array) $keys));
     }
 
     /**
@@ -346,23 +346,23 @@ 
      * @param  string|array|null $key
      * @return array
      */
-    public static function pluck($array, $value, $key = null) {
-        $results = [];
+    public static function pluck($array, $value, $key=null) {
+        $results=[];
 
-        list($value, $key) = static::explodePluckParameters($value, $key);
+        list($value, $key)=static::explodePluckParameters($value, $key);
 
         foreach ($array as $item) {
-            $itemValue = data_get($item, $value);
+            $itemValue=data_get($item, $value);
 
             // If the key is "null", we will just append the value to the array and keep
             // looping. Otherwise we will key the array using the value of the key we
             // received from the developer. Then we'll return the final array form.
             if (is_null($key)) {
-                $results[] = $itemValue;
+                $results[]=$itemValue;
             } else {
-                $itemKey = data_get($item, $key);
+                $itemKey=data_get($item, $key);
 
-                $results[$itemKey] = $itemValue;
+                $results[$itemKey]=$itemValue;
             }
         }
 
@@ -377,9 +377,9 @@ 
      * @return array
      */
     protected static function explodePluckParameters($value, $key) {
-        $value = is_string($value) ? explode('.', $value) : $value;
+        $value=is_string($value) ? explode('.', $value) : $value;
 
-        $key = is_null($key) || is_array($key) ? $key : explode('.', $key);
+        $key=is_null($key) || is_array($key) ? $key : explode('.', $key);
 
         return [$value, $key];
     }
@@ -392,11 +392,11 @@ 
      * @param  mixed $key
      * @return array
      */
-    public static function prepend($array, $value, $key = null) {
+    public static function prepend($array, $value, $key=null) {
         if (is_null($key)) {
             array_unshift($array, $value);
         } else {
-            $array = [$key => $value] + $array;
+            $array=[$key => $value] + $array;
         }
 
         return $array;
@@ -410,8 +410,8 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function pull(&$array, $key, $default = null) {
-        $value = static::get($array, $key, $default);
+    public static function pull(&$array, $key, $default=null) {
+        $value=static::get($array, $key, $default);
 
         static::forget($array, $key);
 
@@ -430,25 +430,25 @@ 
      */
     public static function set(&$array, $key, $value) {
         if (is_null($key)) {
-            return $array = $value;
+            return $array=$value;
         }
 
-        $keys = explode('.', $key);
+        $keys=explode('.', $key);
 
         while (count($keys) > 1) {
-            $key = array_shift($keys);
+            $key=array_shift($keys);
 
             // If the key doesn't exist at this depth, we will just create an empty array
             // to hold the next value, allowing us to create the arrays to hold final
             // values at the correct depth. Then we'll keep digging into the array.
             if (!isset($array[$key]) || !is_array($array[$key])) {
-                $array[$key] = [];
+                $array[$key]=[];
             }
 
-            $array = &$array[$key];
+            $array=&$array[$key];
         }
 
-        $array[array_shift($keys)] = $value;
+        $array[array_shift($keys)]=$value;
 
         return $array;
     }
@@ -485,7 +485,7 @@ 
     public static function sortRecursive($array) {
         foreach ($array as &$value) {
             if (is_array($value)) {
-                $value = static::sortRecursive($value);
+                $value=static::sortRecursive($value);
             }
         }
 

core/App.php

Spacing +22 added lines, -22 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @var array
      */
-    protected $loadedConfigurations = [];
+    protected $loadedConfigurations=[];
 
     /**
      * 应用的根目录.
@@ -32,16 +32,16 @@ 
         $this->initContainer();
         $this->initConfig();
     }
-    private function initConfig(){
+    private function initConfig() {
         $this->configure('core');
     }
 
-    private function initEnv(){
-        $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        $dotEnv=new Dotenv($this->basePath);
         $dotEnv->load();
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));
         define('IS_CLI', $this->runningInConsole());
-        define('IS_DEBUG',env('DEBUG',false));
+        define('IS_DEBUG', env('DEBUG', false));
         if (IS_DEBUG) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
@@ -63,12 +63,12 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->instance('config',new Config());
-        $this->instance('request',new Request($this->config));
-        $this->instance('route',new Route($this->request));
-        $this->bind('pinyin','\puck\helpers\PinYin');
-        $this->bind('curl','\puck\helpers\Curl');
+        $this->instance('app', $this);
+        $this->instance('config', new Config());
+        $this->instance('request', new Request($this->config));
+        $this->instance('route', new Route($this->request));
+        $this->bind('pinyin', '\puck\helpers\PinYin');
+        $this->bind('curl', '\puck\helpers\Curl');
     }
 
     /**
@@ -77,16 +77,16 @@ 
      * @param  string|null  $path
      * @return string
      */
-    public function basePath($path = null)
+    public function basePath($path=null)
     {
         if (isset($this->basePath)) {
             return $this->basePath.($path ? '/'.$path : $path);
         }
 
         if ($this->runningInConsole()) {
-            $this->basePath = getcwd();
+            $this->basePath=getcwd();
         } else {
-            $this->basePath = realpath(getcwd().'/../');
+            $this->basePath=realpath(getcwd().'/../');
         }
 
         return $this->basePath($path);
@@ -112,8 +112,8 @@ 
             return;
         }
         //标记为已加载
-        $this->loadedConfigurations[$name] = true;
-        $path = $this->getConfigurationPath($name);
+        $this->loadedConfigurations[$name]=true;
+        $path=$this->getConfigurationPath($name);
         if ($path) {
             $this->make('config')->set($name, require $path);
         }
@@ -130,21 +130,21 @@ 
      * @param  string|null  $name
      * @return string
      */
-    public function getConfigurationPath($name = null)
+    public function getConfigurationPath($name=null)
     {
-        if (! $name) {
-            $appConfigDir = $this->basePath('configs').'/';
+        if (!$name) {
+            $appConfigDir=$this->basePath('configs').'/';
 
             if (file_exists($appConfigDir)) {
                 return $appConfigDir;
-            } elseif (file_exists($path = __DIR__.'/configs/')) {
+            } elseif (file_exists($path=__DIR__.'/configs/')) {
                 return $path;
             }
         } else {
-            $appConfigPath = $this->basePath('configs').'/'.$name.'.php';
+            $appConfigPath=$this->basePath('configs').'/'.$name.'.php';
             if (file_exists($appConfigPath)) {
                 return $appConfigPath;
-            } elseif (file_exists($path = __DIR__.'/configs/'.$name.'.php')) {
+            } elseif (file_exists($path=__DIR__.'/configs/'.$name.'.php')) {
                 return $path;
             }
         }