|
@@ -2,6 +2,8 @@
|
|
|
|
|
|
namespace Qii\Base;
|
|
namespace Qii\Base;
|
|
|
|
|
|
|
|
+use controller\base;
|
|
|
|
+
|
|
class Response
|
|
class Response
|
|
{
|
|
{
|
|
/**
|
|
/**
|
|
@@ -35,11 +37,15 @@ class Response
|
|
* @var bool $_sendHeader 是否发送头信息
|
|
* @var bool $_sendHeader 是否发送头信息
|
|
*/
|
|
*/
|
|
protected $_sendHeader = false;
|
|
protected $_sendHeader = false;
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @var bool|string 返回数据格式
|
|
|
|
+ */
|
|
|
|
+ private $format;
|
|
|
|
+
|
|
|
|
+
|
|
public function __construct($data = array())
|
|
public function __construct($data = array())
|
|
{
|
|
{
|
|
- $this->format = isset($data['format']) ? isset($data['format']) : self::FORMAT_HTML;
|
|
|
|
|
|
+ $this->format = isset($data['format']) ? $data['format'] : self::FORMAT_HTML;
|
|
$this->data = $data;
|
|
$this->data = $data;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -57,7 +63,7 @@ class Response
|
|
*
|
|
*
|
|
* @param string $content
|
|
* @param string $content
|
|
* @param string $key
|
|
* @param string $key
|
|
- * @return Qii_Response_Abstract
|
|
|
|
|
|
+ * @return $this
|
|
*/
|
|
*/
|
|
public function appendBody($body, $key = NULL)
|
|
public function appendBody($body, $key = NULL)
|
|
{
|
|
{
|
|
@@ -143,7 +149,8 @@ class Response
|
|
return $this;
|
|
return $this;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
- * 是否需要view来渲染页面
|
|
|
|
|
|
+ * 是否需要view来渲染页面
|
|
|
|
+ * @return bool
|
|
*/
|
|
*/
|
|
public function needRender()
|
|
public function needRender()
|
|
{
|
|
{
|
|
@@ -187,17 +194,29 @@ class Response
|
|
}
|
|
}
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if ($this->_sendHeader == true) {
|
|
|
|
|
|
+ if ($this->_sendHeader) {
|
|
$this->sendHeaders();
|
|
$this->sendHeaders();
|
|
}
|
|
}
|
|
foreach ($this->body as $key => $body) {
|
|
foreach ($this->body as $key => $body) {
|
|
echo IS_CLI ? new \Qii\Response\Cli($body) : $body;
|
|
echo IS_CLI ? new \Qii\Response\Cli($body) : $body;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- public function setAllHeaders()
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param $headers 头信息 [['name' => 'value'], ...]
|
|
|
|
+ * @return $this
|
|
|
|
+ */
|
|
|
|
+ public function setAllHeaders($headers = array())
|
|
{
|
|
{
|
|
- return false;
|
|
|
|
|
|
+ if (is_array($headers)) {
|
|
|
|
+ foreach ($headers as $value) {
|
|
|
|
+ if (!isset($value['name'])) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ $this->setHeader($value['name'], $value['value']);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return $this;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -205,7 +224,7 @@ class Response
|
|
*
|
|
*
|
|
* @param string $body
|
|
* @param string $body
|
|
* @param string $key
|
|
* @param string $key
|
|
- * @return Qii_Response_Abstract
|
|
|
|
|
|
+ * @return $this
|
|
*/
|
|
*/
|
|
public function setBody($body, $key = NULL)
|
|
public function setBody($body, $key = NULL)
|
|
{
|
|
{
|