修改协议为BSD，并修改README

Author: lishipeng

BaseCurlHttp.php

@@ -1,10 +1,12 @@
 <?php
+
 namespace lspbupt\curl;
+
 use Yii;
-use \yii\helpers\ArrayHelper;
-use \yii\base\Component;
-use \yii\base\InvalidParamException;
-use Closure;
+use yii\helpers\ArrayHelper;
+use yii\base\Component;
+use yii\base\InvalidParamException;
+
 /*encapsulate normal Http Request*/
 class BaseCurlHttp extends Component
 {
@@ -16,40 +18,40 @@ class BaseCurlHttp extends Component
  public $connectTimeout = 5;
  public $returnTransfer = 1;
  public $followLocation = 1;
- public $protocol = "http";
+ public $protocol = 'http';
  public $port = 80;
  public $host;
  public $method = self::METHOD_GET;
  public $headers = array(
  'User-Agent' => 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1',
- 'Accept-Charset' => 'GBK,utf-8' ,
+ 'Accept-Charset' => 'GBK,utf-8',
  );
  public $action;
  public $params;
  private $debug = false;
  //默认为非formData的模式,传文件时需要开启
  private $isFormData = false;
  private static $methodDesc = [
- self::METHOD_GET => "GET",
- self::METHOD_POST => "POST",
- self::METHOD_POSTJSON => "POST",
+ self::METHOD_GET => 'GET',
+ self::METHOD_POST => 'POST',
+ self::METHOD_POSTJSON => 'POST',
  ];
 
  private $_curl;
 
  public function init()
  {
  parent::init();
- if(empty($this->host)) {
- throw new InvalidParamException("Please config host.");
+ if (empty($this->host)) {
+ throw new InvalidParamException('Please config host.');
  }
  }
 
  public function getUrl()
  {
- $url = $this->protocol."://".$this->host;
- if($this->port != 80) {
- $url .= ":".$this->port;
+ $url = $this->protocol.'://'.$this->host;
+ if ($this->port != 80) {
+ $url .= ':'.$this->port;
  }
  return $url.$this->getAction();
  }
@@ -82,24 +84,24 @@ public function setMethod($method)
 
  public function setGet()
  {
- if(!empty($this->headers['Content-Type'])) {
- unset($this->headers["Content-Type"]);
+ if (!empty($this->headers['Content-Type'])) {
+ unset($this->headers['Content-Type']);
  }
  return $this->setMethod(self::METHOD_GET);
  }
 
  public function getMethod()
  {
- if(isset(self::$methodDesc[$this->method])) {
+ if (isset(self::$methodDesc[$this->method])) {
  return self::$methodDesc[$this->method];
  }
- return "GET";
+ return 'GET';
  }
 
  public function setPost()
  {
- if(!empty($this->headers['Content-Type'])) {
- unset($this->headers["Content-Type"]);
+ if (!empty($this->headers['Content-Type'])) {
+ unset($this->headers['Content-Type']);
  }
  return $this->setMethod(self::METHOD_POST);
  }
@@ -110,31 +112,44 @@ public function setPostJson()
  return $this->setMethod(self::METHOD_POSTJSON);
  }
 
-
  public function setProtocol($protocol)
  {
  $this->protocol = $protocol;
  return $this;
  }
 
+ public function setHeaders($arr = [])
+ {
+ if (!ArrayHelper::isIndexed($arr)) {
+ foreach ($arr as $key => $value) {
+ $this->setHeader($key, $value);
+ }
+ }
+ return $this;
+ }
+
  public function setHeader($key, $value)
  {
- $this->headers[$key] = $value;
+ if ($value === null) {
+ unset($this->headers[$key]);
+ } else {
+ $this->headers[$key] = $value;
+ }
  return $this;
  }
 
  private function getHeads()
  {
  $heads = [];
- foreach($this->headers as $key => $val) {
- $heads[] = $key.":".$val;
+ foreach ($this->headers as $key => $val) {
+ $heads[] = $key.':'.$val;
  }
  return $heads;
  }
 
  public function getCurl()
  {
- if($this->_curl) {
+ if ($this->_curl) {
  return $this->_curl;
  }
  $this->_curl = curl_init();
@@ -146,7 +161,7 @@ public function setDebug($debug = true)
  $this->debug = $debug;
  return $this;
  }
- 
+
  public function setFormData($isFormData = true)
  {
  $this->isFormData = $isFormData;
@@ -156,8 +171,13 @@ public function setFormData($isFormData = true)
  public function isDebug()
  {
  return $this->debug;
- } 
+ }
 
+ public function setOpt($option, $value)
+ {
+ curl_setopt($this->getCurl(), $option, $value);
+ return $this;
+ }
 
  //请求之前的操作
  protected function beforeCurl($params)
@@ -171,78 +191,103 @@ protected function afterCurl($data)
  return $data;
  }
 
- public function httpExec($action = "/", $params = [])
+ /**
+ * @deprecated 推荐使用send方法
+ *
+ * @param string $action
+ * @param array $params
+ */
+ public function httpExec($action = '/', $params = [])
+ {
+ return $this->send($action, $params);
+ }
+
+ public function send($action = '/', $params = [])
  {
  $this->setAction($action);
  $this->setParams($params);
- if($this->isDebug()) {
+ if ($this->isDebug()) {
  echo "\n开始请求之前:\nurl:".$this->getUrl()."\n参数列表:".json_encode($this->getParams())."\n方法:".$this->getMethod()."\n";
  }
  $ret = $this->beforeCurl($params);
- if(!$ret) {
- return ""; 
+ if (!$ret) {
+ return '';
  }
  $ch = $this->getCurl();
  $url = $this->getUrl();
  if ($this->method == self::METHOD_POST) {
  curl_setopt($ch, CURLOPT_POST, 1);
- if($this->isFormData) {
+ if ($this->isFormData) {
  curl_setopt($ch, CURLOPT_POSTFIELDS, $this->getParams());
- }else {
+ } else {
  curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($this->getParams()));
  }
  } elseif ($this->method == self::METHOD_POSTJSON) {
  curl_setopt($ch, CURLOPT_POST, 1);
  curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($this->getParams()));
  } else {
- if(!empty($params)) {
- $temp = explode("?", $url);
- if(count($temp) > 1) {
- $url = $temp[0]."?".$temp[1].'&'.http_build_query($this->getParams());
+ if (!empty($params)) {
+ $temp = explode('?', $url);
+ if (count($temp) > 1) {
+ $url = $temp[0].'?'.$temp[1].'&'.http_build_query($this->getParams());
  } else {
- $url = $url."?".http_build_query($this->getParams());
+ $url = $url.'?'.http_build_query($this->getParams());
  }
  }
  }
- if($this->isDebug()) {
+ if ($this->isDebug()) {
  echo "\n开始请求:\nurl:${url}\n参数列表:".json_encode($this->getParams())."\n方法:".$this->getMethod()."\n";
  }
  curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
  curl_setopt($ch, CURLOPT_URL, $url);
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, $this->returnTransfer);
- curl_setopt($ch, CURLOPT_HTTPHEADER , $this->getHeads());
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $this->getHeads());
  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $this->followLocation);
+ $this->beforeCurlExec($ch);
  $data = curl_exec($ch);
- if($this->isDebug()) {
+ $this->afterCurlExec($ch);
+ if ($this->isDebug()) {
  echo "\n请求结果:".$data."\n";
  }
  $data = $this->afterCurl($data);
  curl_close($ch);
- $this->_curl = null;
+ $this->refreshCurl();
  return $data;
  }
 
- public static function requestByUrl($url, $params = [], $method=self::METHOD_GET)
+ public function beforeCurlExec(&$ch)
+ {
+ }
+
+ public function afterCurlExec(&$ch)
+ {
+ }
+
+ public function refreshCurl()
+ {
+ $this->_curl = null;
+ }
+
+ public static function requestByUrl($url, $params = [], $method = self::METHOD_GET)
  {
  $data = parse_url($url);
  $config = [];
- $config['protocol'] = ArrayHelper::getValue($data, "scheme", "http");
- $config['host'] = ArrayHelper::getValue($data, "host", "");
- $config['port'] = ArrayHelper::getValue($data, "port", 80);
+ $config['protocol'] = ArrayHelper::getValue($data, 'scheme', 'http');
+ $config['host'] = ArrayHelper::getValue($data, 'host', '');
+ $config['port'] = ArrayHelper::getValue($data, 'port', 80);
  $config['method'] = $method;
- $action = ArrayHelper::getValue($data, "path", "");
- $queryStr = ArrayHelper::getValue($data, "query", "");
- $fragment = ArrayHelper::getValue($data, "fragment", "");
- if($queryStr) {
- $action .= "?".$queryStr;
+ $action = ArrayHelper::getValue($data, 'path', '');
+ $queryStr = ArrayHelper::getValue($data, 'query', '');
+ $fragment = ArrayHelper::getValue($data, 'fragment', '');
+ if ($queryStr) {
+ $action .= '?'.$queryStr;
  }
- if($fragment) {
- $action .= "#".$fragment;
+ if ($fragment) {
+ $action .= '#'.$fragment;
  }
  $config['class'] = get_called_class();
  $obj = Yii::createObject($config);
  return $obj->httpExec($action, $params);
  }
-
 }

BrowserCurl.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace lspbupt\curl;
+
+/**
+ * Class BrowserCurl
+ * 这个Curl主要设计用来更好的模拟浏览器的行为, 可以供简单爬虫使用
+ * 支持 加载浏览器Cookie文件 和 保存
+ *
+ * @package lspbupt\curl
+ */
+class BrowserCurl extends CurlHttp
+{
+ /* 直接从File里加载cookie */
+ public $cookieFile = '';
+
+ /*
+ * NOTE 这个不能和cookieFile同时使用, cookieFile适用于比 cookie适用于临时性、一次Session的情况了
+ * 从数组里加载cookie
+ * $cookie = ['test1'=> 'cookie1', 'test2' => 'cookie110'];
+ */
+ public $cookie = [];
+
+ /* 是否存储新的cookie, 默认会记到cookieFile里面 */
+ public $enableCookieFileSave = false;
+
+ public function beforeCurlExec(&$ch)
+ {
+ $this->bulidCookie($ch);
+ return parent::beforeCurlExec($ch);
+ }
+
+ public function bulidCookie(&$ch)
+ {
+ // sending manually set cookie
+ if ($this->cookie) {
+ $this->setHeader('Cookie', $this->genCookieStr());
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $this->getHeads());
+ } elseif ($this->cookieFile) {
+ // sending cookies from file
+ curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookieFile);
+ }
+ // 使用临时cookie的时候也可以记录到file 供下次使用
+ if ($this->enableCookieFileSave) {
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookieFile);
+ }
+ }
+
+ private function genCookieStr()
+ {
+ $ret = array_map(
+ function ($key, $value) {
+ return $key . '=' . $value;
+ },
+ array_keys($this->cookie),
+ $this->cookie
+ );
+ return implode('; ', $ret);
+ }
+}