import v1.1.0_beta1 | 2009-08-21

This commit is contained in:
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions

View File

@ -22,9 +22,6 @@
/** Zend_Wildfire_Channel_Interface */
require_once 'Zend/Wildfire/Channel/Interface.php';
/** Zend_Wildfire_Exception */
require_once 'Zend/Wildfire/Exception.php';
/** Zend_Controller_Request_Abstract */
require_once('Zend/Controller/Request/Abstract.php');
@ -42,7 +39,7 @@ require_once 'Zend/Controller/Front.php';
/**
* Implements communication via HTTP request and response headers for Wildfire Protocols.
*
*
* @category Zend
* @package Zend_Wildfire
* @subpackage Channel
@ -56,25 +53,25 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
* @var string
*/
protected static $_headerPrefix = 'X-WF-';
/**
* Singleton instance
* @var Zend_Wildfire_Channel_HttpHeaders
*/
protected static $_instance = null;
/**
* The index of the plugin in the controller dispatch loop plugin stack
* @var integer
*/
protected static $_controllerPluginStackIndex = 999;
/**
* The protocol instances for this channel
* @var array
*/
protected $_protocols = null;
/**
* Initialize singleton instance.
*
@ -84,41 +81,50 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
*/
public static function init($class = null)
{
if (self::$_instance!==null) {
if (self::$_instance !== null) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Channel_HttpHeaders already exists!');
}
if ($class!==null) {
if ($class !== null) {
if (!is_string($class)) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Third argument is not a class string');
}
Zend_Loader::loadClass($class);
if (!class_exists($class)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($class);
}
self::$_instance = new $class();
if (!self::$_instance instanceof Zend_Wildfire_Channel_HttpHeaders) {
self::$_instance = null;
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Channel_HttpHeaders.');
}
} else {
self::$_instance = new self();
self::$_instance = new self();
}
return self::$_instance;
}
/**
* Get or create singleton instance
*
*
* @param $skipCreate boolean True if an instance should not be created
* @return Zend_Wildfire_Channel_HttpHeaders
*/
public static function getInstance($skipCreate=false)
{
{
if (self::$_instance===null && $skipCreate!==true) {
return self::init();
return self::init();
}
return self::$_instance;
}
/**
* Destroys the singleton instance
*
@ -130,10 +136,10 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
{
self::$_instance = null;
}
/**
* Get the instance of a give protocol for this channel
*
*
* @param string $uri The URI for the protocol
* @return object Returns the protocol instance for the diven URI
*/
@ -142,15 +148,15 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
if (!isset($this->_protocols[$uri])) {
$this->_protocols[$uri] = $this->_initProtocol($uri);
}
$this->_registerControllerPlugin();
return $this->_protocols[$uri];
}
/**
* Initialize a new protocol
*
*
* @param string $uri The URI for the protocol to be initialized
* @return object Returns the new initialized protocol instance
* @throws Zend_Wildfire_Exception
@ -161,10 +167,11 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
case Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI;
return new Zend_Wildfire_Protocol_JsonStream();
}
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Tyring to initialize unknown protocol for URI "'.$uri.'".');
}
/**
* Flush all data from all protocols and send all data to response headers.
*
@ -190,10 +197,10 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
}
return true;
}
/**
* Set the index of the plugin in the controller dispatch loop plugin stack
*
*
* @param integer $index The index of the plugin in the stack
* @return integer The previous index.
*/
@ -206,7 +213,7 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
/**
* Register this object as a controller plugin.
*
*
* @return void
*/
protected function _registerControllerPlugin()
@ -214,21 +221,54 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
$controller = Zend_Controller_Front::getInstance();
if (!$controller->hasPlugin(get_class($this))) {
$controller->registerPlugin($this, self::$_controllerPluginStackIndex);
}
}
}
/*
* Zend_Wildfire_Channel_Interface
* Zend_Wildfire_Channel_Interface
*/
/**
* Determine if channel is ready.
*
* The channel is ready as long as the request and response objects are initialized,
* can send headers and the FirePHP header exists in the User-Agent.
*
* If the header does not exist in the User-Agent, no appropriate client
* is making this request and the messages should not be sent.
*
* A timing issue arises when messages are logged before the request/response
* objects are initialized. In this case we do not yet know if the client
* will be able to accept the messages. If we consequently indicate that
* the channel is not ready, these messages will be dropped which is in
* most cases not the intended behaviour. The intent is to send them at the
* end of the request when the request/response objects will be available
* for sure.
*
* If the request/response objects are not yet initialized we assume if messages are
* logged, the client will be able to receive them. As soon as the request/response
* objects are availoable and a message is logged this assumption is challenged.
* If the client cannot accept the messages any further messages are dropped
* and messages sent prior are kept but discarded when the channel is finally
* flushed at the end of the request.
*
* When the channel is flushed the $forceCheckRequest option is used to force
* a check of the request/response objects. This is the last verification to ensure
* messages are only sent when the client can accept them.
*
* @param boolean $forceCheckRequest OPTIONAL Set to TRUE if the request must be checked
* @return boolean Returns TRUE if channel is ready.
*/
public function isReady()
public function isReady($forceCheckRequest=false)
{
if (!$forceCheckRequest
&& !$this->_request
&& !$this->_response) {
return true;
}
return ($this->getResponse()->canSendHeaders() &&
preg_match_all('/\s?FirePHP\/([\.|\d]*)\s?/si',
$this->getRequest()->getHeader('User-Agent'),$m));
@ -236,7 +276,7 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
/*
* Zend_Controller_Plugin_Abstract
* Zend_Controller_Plugin_Abstract
*/
/**
@ -248,10 +288,10 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
{
$this->flush();
}
/**
* Get the request object
*
*
* @return Zend_Controller_Request_Abstract
* @throws Zend_Wildfire_Exception
*/
@ -262,6 +302,7 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
$this->setRequest($controller->getRequest());
}
if (!$this->_request) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Request objects not initialized.');
}
return $this->_request;
@ -269,7 +310,7 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
/**
* Get the response object
*
*
* @return Zend_Controller_Response_Abstract
* @throws Zend_Wildfire_Exception
*/
@ -282,6 +323,7 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
}
}
if (!$this->_response) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Response objects not initialized.');
}
return $this->_response;

View File

@ -19,12 +19,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Loader */
require_once 'Zend/Loader.php';
/** Zend_Wildfire_Exception */
require_once 'Zend/Wildfire/Exception.php';
/** Zend_Controller_Request_Abstract */
require_once('Zend/Controller/Request/Abstract.php');
@ -42,7 +36,7 @@ require_once 'Zend/Wildfire/Plugin/Interface.php';
/**
* Primary class for communicating with the FirePHP Firefox Extension.
*
*
* @category Zend
* @package Zend_Wildfire
* @subpackage Plugin
@ -55,33 +49,33 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
* Plain log style.
*/
const LOG = 'LOG';
/**
* Information style.
*/
const INFO = 'INFO';
/**
* Warning style.
*/
const WARN = 'WARN';
/**
* Error style that increments Firebug's error counter.
*/
const ERROR = 'ERROR';
/**
* Trace style showing message and expandable full stack trace.
*/
const TRACE = 'TRACE';
/**
* Exception style showing message and expandable full stack trace.
* Also increments Firebug's error counter.
*/
const EXCEPTION = 'EXCEPTION';
/**
* Table style showing summary line and expandable table
*/
@ -91,27 +85,27 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
* Dump variable to Server panel in Firebug Request Inspector
*/
const DUMP = 'DUMP';
/**
* Start a group in the Firebug Console
*/
const GROUP_START = 'GROUP_START';
/**
* End a group in the Firebug Console
*/
const GROUP_END = 'GROUP_END';
/**
* The plugin URI for this plugin
*/
const PLUGIN_URI = 'http://meta.firephp.org/Wildfire/Plugin/ZendFramework/FirePHP/1.6.2';
/**
* The protocol URI for this plugin
*/
const PROTOCOL_URI = Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI;
/**
* The structure URI for the Dump structure
*/
@ -121,7 +115,7 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
* The structure URI for the Firebug Console structure
*/
const STRUCTURE_URI_FIREBUGCONSOLE = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1';
/**
* Singleton instance
* @var Zend_Wildfire_Plugin_FirePhp
@ -133,37 +127,43 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
* @var boolean
*/
protected $_enabled = true;
/**
* The channel via which to send the encoded messages.
* @var Zend_Wildfire_Channel_Interface
*/
protected $_channel = null;
/**
* Messages that are buffered to be sent when protocol flushes
* @var array
*/
protected $_messages = array();
/**
* The maximum depth to traverse objects when encoding
* @var int
*/
protected $_maxObjectDepth = 10;
* Options for the object
* @var array
*/
protected $_options = array(
'traceOffset' => 1, /* The offset in the trace which identifies the source of the message */
'maxTraceDepth' => 99, /* Maximum depth for stack traces */
'maxObjectDepth' => 10, /* The maximum depth to traverse objects when encoding */
'maxArrayDepth' => 20, /* The maximum depth to traverse nested arrays when encoding */
'includeLineNumbers' => true /* Whether to include line and file info for each message */
);
/**
* The maximum depth to traverse nested arrays when encoding
* @var int
*/
protected $_maxArrayDepth = 20;
* Filters used to exclude object members when encoding
* @var array
*/
protected $_objectFilters = array();
/**
* A stack of objects used during encoding to detect recursion
* @var array
*/
protected $_objectStack = array();
/**
* Create singleton instance.
*
@ -173,26 +173,33 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
*/
public static function init($class = null)
{
if (self::$_instance!==null) {
if (self::$_instance !== null) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Plugin_FirePhp already exists!');
}
if ($class!==null) {
if ($class !== null) {
if (!is_string($class)) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Third argument is not a class string');
}
Zend_Loader::loadClass($class);
if (!class_exists($class)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($class);
}
self::$_instance = new $class();
if (!self::$_instance instanceof Zend_Wildfire_Plugin_FirePhp) {
self::$_instance = null;
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Plugin_FirePhp.');
}
} else {
self::$_instance = new self();
}
return self::$_instance;
}
/**
* Constructor
* @return void
@ -205,18 +212,18 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
/**
* Get or create singleton instance
*
*
* @param $skipCreate boolean True if an instance should not be created
* @return Zend_Wildfire_Plugin_FirePhp
*/
public static function getInstance($skipCreate=false)
{
{
if (self::$_instance===null && $skipCreate!==true) {
return self::init();
return self::init();
}
return self::$_instance;
}
/**
* Destroys the singleton instance
*
@ -227,13 +234,13 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
public static function destroyInstance()
{
self::$_instance = null;
}
}
/**
* Enable or disable sending of messages to user-agent.
* If disabled all headers to be sent will be removed.
*
* @param boolean $enabled Set to TRUE to enable sending of messages.
*
* @param boolean $enabled Set to TRUE to enable sending of messages.
* @return boolean The previous value.
*/
public function setEnabled($enabled)
@ -246,20 +253,74 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
}
return $previous;
}
/**
* Determine if logging to user-agent is enabled.
*
*
* @return boolean Returns TRUE if logging is enabled.
*/
public function getEnabled()
{
return $this->_enabled;
}
/**
* Set a single option
*
* @param string $key The name of the option
* @param mixed $value The value of the option
* @return mixed The previous value of the option
*/
public function setOption($key, $value)
{
if (!array_key_exists($key,$this->_options)) {
throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
}
$previous = $this->_options[$key];
$this->_options[$key] = $value;
return $previous;
}
/**
* Retrieve a single option
*
* @param string $key The name of the option
* @return mixed The value of the option
*/
public function getOption($key)
{
if (!array_key_exists($key,$this->_options)) {
throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
}
return $this->_options[$key];
}
/**
* Retrieve all options
*
* @return array All options
*/
public function getOptions()
{
return $this->_options;
}
/**
* Specify a filter to be used when encoding an object
*
* Filters are used to exclude object members.
*
* @param string $Class The class name of the object
* @param array $Filter An array of members to exclude
* @return void
*/
public function setObjectFilter($class, $filter) {
$this->_objectFilters[$class] = $filter;
}
/**
* Starts a group in the Firebug Console
*
*
* @param string $title The title of the group
* @return TRUE if the group instruction was added to the response headers or buffered.
*/
@ -267,17 +328,17 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
{
return self::send(null, $title, self::GROUP_START);
}
/**
* Ends a group in the Firebug Console
*
*
* @return TRUE if the group instruction was added to the response headers or buffered.
*/
public static function groupEnd()
{
return self::send(null, null, self::GROUP_END);
}
/**
* Logs variables to the Firebug Console
* via HTTP response headers and the FirePHP Firefox Extension.
@ -285,17 +346,16 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
* @param mixed $var The variable to log.
* @param string $label OPTIONAL Label to prepend to the log event.
* @param string $style OPTIONAL Style of the log event.
* @param array $options OPTIONAL Options to change how messages are processed and sent
* @return boolean Returns TRUE if the variable was added to the response headers or buffered.
* @throws Zend_Wildfire_Exception
*/
public static function send($var, $label=null, $style=null)
public static function send($var, $label=null, $style=null, $options=array())
{
if (self::$_instance===null) {
self::getInstance();
}
$firephp = self::getInstance();
if (!self::$_instance->_enabled) {
return false;
if (!$firephp->getEnabled()) {
return false;
}
if ($var instanceof Zend_Wildfire_Plugin_FirePhp_Message) {
@ -304,68 +364,95 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
if (!in_array($var, self::$_instance->_messages)) {
self::$_instance->_messages[] = $var;
}
return true;
return true;
}
if ($var->getDestroy()) {
return false;
return false;
}
$style = $var->getStyle();
$label = $var->getLabel();
$options = $var->getOptions();
$var = $var->getMessage();
}
if (!self::$_instance->_channel->isReady()) {
return false;
return false;
}
foreach ($options as $name => $value) {
if ($value===null) {
unset($options[$name]);
}
}
$options = array_merge($firephp->getOptions(), $options);
$trace = null;
$skipFinalEncode = false;
$meta = array();
$meta['Type'] = $style;
if ($var instanceof Exception) {
$eTrace = $var->getTrace();
$eTrace = array_splice($eTrace, 0, $options['maxTraceDepth']);
$var = array('Class'=>get_class($var),
'Message'=>$var->getMessage(),
'File'=>$var->getFile(),
'Line'=>$var->getLine(),
'Type'=>'throw',
'Trace'=>$var->getTrace());
$style = self::EXCEPTION;
'Trace'=>$firephp->_encodeTrace($eTrace));
$meta['Type'] = self::EXCEPTION;
$skipFinalEncode = true;
} else
if ($style==self::TRACE) {
$trace = debug_backtrace();
if(!$trace) return false;
if ($meta['Type']==self::TRACE) {
for ( $i=0 ; $i<sizeof($trace) ; $i++ ) {
if (isset($trace[$i]['class']) &&
substr($trace[$i]['class'],0,8)!='Zend_Log' &&
substr($trace[$i]['class'],0,13)!='Zend_Wildfire') {
$i--;
break;
}
if (!$label && $var) {
$label = $var;
$var = null;
}
if ($i==sizeof($trace)) {
$i = 0;
if (!$trace) {
$trace = $firephp->_getStackTrace(array_merge($options,
array('maxTraceDepth'=>$options['maxTraceDepth']+1)));
}
$var = array('Class'=>$trace[$i]['class'],
'Type'=>$trace[$i]['type'],
'Function'=>$trace[$i]['function'],
'Message'=>(isset($trace[$i]['args'][0]))?$trace[$i]['args'][0]:'',
'File'=>(isset($trace[$i]['file']))?$trace[$i]['file']:'',
'Line'=>(isset($trace[$i]['line']))?$trace[$i]['line']:'',
'Args'=>$trace[$i]['args'],
'Trace'=>array_splice($trace,$i+1));
$var = array('Class'=>$trace[0]['class'],
'Type'=>$trace[0]['type'],
'Function'=>$trace[0]['function'],
'Message'=>$label,
'File'=>isset($trace[0]['file'])?$trace[0]['file']:'',
'Line'=>isset($trace[0]['line'])?$trace[0]['line']:'',
'Args'=>isset($trace[0]['args'])?$firephp->_encodeObject($trace[0]['args']):'',
'Trace'=>$firephp->_encodeTrace(array_splice($trace,1)));
$skipFinalEncode = true;
} else
if ($meta['Type']==self::TABLE) {
$var = $firephp->_encodeTable($var);
$skipFinalEncode = true;
} else {
if ($style===null) {
$style = self::LOG;
if ($meta['Type']===null) {
$meta['Type'] = self::LOG;
}
}
switch ($style) {
if ($label!=null) {
$meta['Label'] = $label;
}
switch ($meta['Type']) {
case self::LOG:
case self::INFO:
case self::WARN:
@ -378,182 +465,282 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
case self::GROUP_END:
break;
default:
throw new Zend_Wildfire_Exception('Log style "'.$style.'" not recognized!');
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Log style "'.$meta['Type'].'" not recognized!');
break;
}
if ($style == self::DUMP) {
return self::$_instance->_recordMessage(self::STRUCTURE_URI_DUMP,
array('key'=>$label,
'data'=>$var));
if ($meta['Type'] != self::DUMP && $options['includeLineNumbers']) {
if (!isset($meta['File']) || !isset($meta['Line'])) {
if (!$trace) {
$trace = $firephp->_getStackTrace($options);
}
$meta['File'] = isset($trace[0]['file'])?$trace[0]['file']:'';
$meta['Line'] = isset($trace[0]['line'])?$trace[0]['line']:'';
}
} else {
unset($meta['File']);
unset($meta['Line']);
}
if ($meta['Type'] == self::DUMP) {
return $firephp->_recordMessage(self::STRUCTURE_URI_DUMP,
array('key'=>$meta['Label'],
'data'=>$var),
$skipFinalEncode);
} else {
$meta = array('Type'=>$style);
if ($label!=null) {
$meta['Label'] = $label;
}
return self::$_instance->_recordMessage(self::STRUCTURE_URI_FIREBUGCONSOLE,
array('data'=>$var,
'meta'=>$meta));
return $firephp->_recordMessage(self::STRUCTURE_URI_FIREBUGCONSOLE,
array('data'=>$var,
'meta'=>$meta),
$skipFinalEncode);
}
}
/**
* Gets a stack trace
*
* @param array $options Options to change how the stack trace is returned
* @return array The stack trace
*/
protected function _getStackTrace($options)
{
$trace = debug_backtrace();
return array_splice($trace, $options['traceOffset'], $options['maxTraceDepth']);
}
/**
* Record a message with the given data in the given structure
*
*
* @param string $structure The structure to be used for the data
* @param array $data The data to be recorded
* @param boolean $skipEncode TRUE if variable encoding should be skipped
* @return boolean Returns TRUE if message was recorded
* @throws Zend_Wildfire_Exception
*/
protected function _recordMessage($structure, $data)
protected function _recordMessage($structure, $data, $skipEncode=false)
{
switch($structure) {
case self::STRUCTURE_URI_DUMP:
if (!isset($data['key'])) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('You must supply a key.');
}
if (!array_key_exists('data',$data)) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('You must supply data.');
}
$value = $data['data'];
if (!$skipEncode) {
$value = $this->_encodeObject($data['data']);
}
return $this->_channel->getProtocol(self::PROTOCOL_URI)->
recordMessage($this,
$structure,
array($data['key']=>$this->_encodeObject($data['data'])));
array($data['key']=>$value));
case self::STRUCTURE_URI_FIREBUGCONSOLE:
if (!isset($data['meta']) ||
!is_array($data['meta']) ||
!array_key_exists('Type',$data['meta'])) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('You must supply a "Type" in the meta information.');
}
if (!array_key_exists('data',$data)) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('You must supply data.');
}
$value = $data['data'];
if (!$skipEncode) {
$value = $this->_encodeObject($data['data']);
}
return $this->_channel->getProtocol(self::PROTOCOL_URI)->
recordMessage($this,
$structure,
array($data['meta'],
$this->_encodeObject($data['data'])));
$value));
default:
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Structure of name "'.$structure.'" is not recognized.');
break;
break;
}
return false;
return false;
}
/**
* Encodes a table by encoding each row and column with _encodeObject()
*
* @param array $Table The table to be encoded
* @return array
*/
protected function _encodeTable($table)
{
if (!$table) {
return $table;
}
for ($i=0 ; $i<count($table) ; $i++) {
if (is_array($table[$i])) {
for ($j=0 ; $j<count($table[$i]) ; $j++) {
$table[$i][$j] = $this->_encodeObject($table[$i][$j]);
}
}
}
return $table;
}
/**
* Encodes a trace by encoding all "args" with _encodeObject()
*
* @param array $Trace The trace to be encoded
* @return array The encoded trace
*/
protected function _encodeTrace($trace)
{
if (!$trace) {
return $trace;
}
for ($i=0 ; $i<sizeof($trace) ; $i++) {
if (isset($trace[$i]['args'])) {
$trace[$i]['args'] = $this->_encodeObject($trace[$i]['args']);
}
}
return $trace;
}
/**
* Encode an object by generating an array containing all object members.
*
*
* All private and protected members are included. Some meta info about
* the object class is added.
*
*
* @param mixed $object The object/array/value to be encoded
* @return array The encoded object
*/
protected function _encodeObject($object, $depth = 1)
protected function _encodeObject($object, $objectDepth = 1, $arrayDepth = 1)
{
$return = array();
if (is_resource($object)) {
return '** '.(string)$object.' **';
} else
} else
if (is_object($object)) {
if ($depth > $this->_maxObjectDepth) {
return '** Max Depth **';
if ($objectDepth > $this->_options['maxObjectDepth']) {
return '** Max Object Depth ('.$this->_options['maxObjectDepth'].') **';
}
foreach ($this->_objectStack as $refVal) {
if ($refVal === $object) {
return '** Recursion ('.get_class($object).') **';
}
}
array_push($this->_objectStack, $object);
$return['__className'] = $class = get_class($object);
$reflectionClass = new ReflectionClass($class);
$reflectionClass = new ReflectionClass($class);
$properties = array();
foreach ( $reflectionClass->getProperties() as $property) {
$properties[$property->getName()] = $property;
}
$members = (array)$object;
foreach ($properties as $raw_name => $property) {
$name = $raw_name;
if ($property->isStatic()) {
$name = 'static:'.$name;
}
if ($property->isPublic()) {
$name = 'public:'.$name;
} else
if ($property->isPrivate()) {
$name = 'private:'.$name;
$raw_name = "\0".$class."\0".$raw_name;
} else
if ($property->isProtected()) {
$name = 'protected:'.$name;
$raw_name = "\0".'*'."\0".$raw_name;
}
if (array_key_exists($raw_name,$members)
&& !$property->isStatic()) {
$return[$name] = $this->_encodeObject($members[$raw_name], $depth + 1);
} else {
if (method_exists($property,'setAccessible')) {
$property->setAccessible(true);
$return[$name] = $this->_encodeObject($property->getValue($object), $depth + 1);
} else
if ($property->isPublic()) {
$return[$name] = $this->_encodeObject($property->getValue($object), $depth + 1);
} else {
$return[$name] = '** Need PHP 5.3 to get value **';
}
}
foreach ($properties as $just_name => $property) {
$name = $raw_name = $just_name;
if ($property->isStatic()) {
$name = 'static:'.$name;
}
if ($property->isPublic()) {
$name = 'public:'.$name;
} else
if ($property->isPrivate()) {
$name = 'private:'.$name;
$raw_name = "\0".$class."\0".$raw_name;
} else
if ($property->isProtected()) {
$name = 'protected:'.$name;
$raw_name = "\0".'*'."\0".$raw_name;
}
if (!(isset($this->_objectFilters[$class])
&& is_array($this->_objectFilters[$class])
&& in_array($just_name,$this->_objectFilters[$class]))) {
if (array_key_exists($raw_name,$members)
&& !$property->isStatic()) {
$return[$name] = $this->_encodeObject($members[$raw_name], $objectDepth + 1, 1);
} else {
if (method_exists($property,'setAccessible')) {
$property->setAccessible(true);
$return[$name] = $this->_encodeObject($property->getValue($object), $objectDepth + 1, 1);
} else
if ($property->isPublic()) {
$return[$name] = $this->_encodeObject($property->getValue($object), $objectDepth + 1, 1);
} else {
$return[$name] = '** Need PHP 5.3 to get value **';
}
}
} else {
$return[$name] = '** Excluded by Filter **';
}
}
// Include all members that are not defined in the class
// but exist in the object
foreach($members as $name => $value) {
foreach($members as $just_name => $value) {
$name = $raw_name = $just_name;
if ($name{0} == "\0") {
$parts = explode("\0", $name);
$name = $parts[2];
}
if (!isset($properties[$name])) {
$name = 'undeclared:'.$name;
$return[$name] = $this->_encodeObject($value, $depth + 1);
if (!(isset($this->objectFilters[$class])
&& is_array($this->objectFilters[$class])
&& in_array($just_name,$this->objectFilters[$class]))) {
$return[$name] = $this->_encodeObject($value, $objectDepth + 1, 1);
} else {
$return[$name] = '** Excluded by Filter **';
}
}
}
array_pop($this->_objectStack);
} elseif (is_array($object)) {
if ($depth > $this->_maxArrayDepth) {
return '** Max Depth **';
if ($arrayDepth > $this->_options['maxArrayDepth']) {
return '** Max Array Depth ('.$this->_options['maxArrayDepth'].') **';
}
foreach ($object as $key => $val) {
// Encoding the $GLOBALS PHP array causes an infinite loop
// if the recursion is not reset here as it contains
// a reference to itself. This is the only way I have come up
@ -561,50 +748,52 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
if ($key=='GLOBALS'
&& is_array($val)
&& array_key_exists('GLOBALS',$val)) {
$val['GLOBALS'] = '** Recursion (GLOBALS) **';
}
$return[$key] = $this->_encodeObject($val, $depth + 1);
$return[$key] = $this->_encodeObject($val, 1, $arrayDepth + 1);
}
} else {
return $object;
}
return $return;
}
}
/*
* Zend_Wildfire_Plugin_Interface
*/
/**
* Get the unique indentifier for this plugin.
*
*
* @return string Returns the URI of the plugin.
*/
public function getUri()
{
return self::PLUGIN_URI;
}
/**
* Flush any buffered data.
*
*
* @param string $protocolUri The URI of the protocol that should be flushed to
* @return void
*/
public function flushMessages($protocolUri)
{
if(!$this->_messages || $protocolUri!=self::PROTOCOL_URI) {
if (!$this->_messages || $protocolUri!=self::PROTOCOL_URI) {
return;
}
foreach( $this->_messages as $message ) {
if (!$message->getDestroy()) {
$this->send($message->getMessage(), $message->getLabel(), $message->getStyle());
$this->send($message->getMessage(),
$message->getLabel(),
$message->getStyle(),
$message->getOptions());
}
}
$this->_messages = array();
}
}

View File

@ -68,6 +68,15 @@ class Zend_Wildfire_Plugin_FirePhp_Message
*/
protected $_ruid = false;
/**
* Options for the object
* @var array
*/
protected $_options = array(
'traceOffset' => null, /* The offset in the trace which identifies the source of the message */
'includeLineNumbers' => null /* Whether to include line and file info for this message */
);
/**
* Creates a new message with the given style and message
*
@ -191,5 +200,46 @@ class Zend_Wildfire_Plugin_FirePhp_Message
{
return $this->_message;
}
/**
* Set a single option
*
* @param string $key The name of the option
* @param mixed $value The value of the option
* @return mixed The previous value of the option
*/
public function setOption($key, $value)
{
if(!array_key_exists($key,$this->_options)) {
throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
}
$previous = $this->_options[$key];
$this->_options[$key] = $value;
return $previous;
}
/**
* Retrieve a single option
*
* @param string $key The name of the option
* @return mixed The value of the option
*/
public function getOption($key)
{
if(!array_key_exists($key,$this->_options)) {
throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
}
return $this->_options[$key];
}
/**
* Retrieve all options
*
* @return array All options
*/
public function getOptions()
{
return $this->_options;
}
}

View File

@ -90,9 +90,75 @@ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_Fir
public function getMessage()
{
$table = $this->_rows;
array_unshift($table,$this->_header);
if($this->_header) {
array_unshift($table,$this->_header);
}
return $table;
}
}
/**
* Returns the row at the given index
*
* @param integer $index The index of the row
* @return array Returns the row
* @throws Zend_Wildfire_Exception
*/
public function getRowAt($index)
{
$count = $this->getRowCount();
if($index < 0 || $index > $count-1) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!');
}
return $this->_rows[$index];
}
/**
* Sets the row on the given index to a new row
*
* @param integer $index The index of the row
* @param array $row The new data for the row
* @throws Zend_Wildfire_Exception
*/
public function setRowAt($index, $row)
{
$count = $this->getRowCount();
if($index < 0 || $index > $count-1) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!');
}
$this->_rows[$index] = $row;
}
/**
* Returns the number of rows
*
* @return integer
*/
public function getRowCount()
{
return count($this->_rows);
}
/**
* Returns the last row of the table
*
* @return array Returns the last row
* @throws Zend_Wildfire_Exception
*/
public function getLastRow()
{
$count = $this->getRowCount();
if($count==0) {
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Cannot get last row as no rows exist!');
}
return $this->_rows[$count-1];
}
}

View File

@ -19,9 +19,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Wildfire_Exception */
require_once 'Zend/Wildfire/Exception.php';
/** Zend_Wildfire_Plugin_Interface */
require_once 'Zend/Wildfire/Plugin/Interface.php';
@ -33,7 +30,7 @@ require_once 'Zend/Json.php';
/**
* Encodes messages into the Wildfire JSON Stream Communication Protocol.
*
*
* @category Zend
* @package Zend_Wildfire
* @subpackage Protocol
@ -58,10 +55,10 @@ class Zend_Wildfire_Protocol_JsonStream
* @var array
*/
protected $_plugins = array();
/**
* Register a plugin that uses this protocol
*
*
* @param Zend_Wildfire_Plugin_Interface $plugin The plugin to be registered
* @return boolean Returns TRUE if plugin was registered, false if it was already registered
*/
@ -76,7 +73,7 @@ class Zend_Wildfire_Protocol_JsonStream
/**
* Record a message with the given data in the given structure
*
*
* @param Zend_Wildfire_Plugin_Interface $plugin The plugin recording the message
* @param string $structure The structure to be used for the data
* @param array $data The data to be recorded
@ -85,40 +82,40 @@ class Zend_Wildfire_Protocol_JsonStream
public function recordMessage(Zend_Wildfire_Plugin_Interface $plugin, $structure, $data)
{
if(!isset($this->_messages[$structure])) {
$this->_messages[$structure] = array();
$this->_messages[$structure] = array();
}
$uri = $plugin->getUri();
if(!isset($this->_messages[$structure][$uri])) {
$this->_messages[$structure][$uri] = array();
$this->_messages[$structure][$uri] = array();
}
$this->_messages[$structure][$uri][] = $this->_encode($data);
return true;
}
/**
* Remove all qued messages
*
*
* @param Zend_Wildfire_Plugin_Interface $plugin The plugin for which to clear messages
* @return boolean Returns TRUE if messages were present
*/
public function clearMessages(Zend_Wildfire_Plugin_Interface $plugin)
{
$uri = $plugin->getUri();
$present = false;
foreach ($this->_messages as $structure => $messages) {
if(!isset($this->_messages[$structure][$uri])) {
continue;
}
$present = true;
unset($this->_messages[$structure][$uri]);
if (!$this->_messages[$structure]) {
unset($this->_messages[$structure]);
}
@ -128,7 +125,7 @@ class Zend_Wildfire_Protocol_JsonStream
/**
* Get all qued messages
*
*
* @return mixed Returns qued messages or FALSE if no messages are qued
*/
public function getMessages()
@ -152,7 +149,7 @@ class Zend_Wildfire_Protocol_JsonStream
/**
* Retrieves all formatted data ready to be sent by the channel.
*
*
* @param Zend_Wildfire_Channel_Interface $channel The instance of the channel that will be transmitting the data
* @return mixed Returns the data to be sent by the channel.
* @throws Zend_Wildfire_Exception
@ -160,19 +157,20 @@ class Zend_Wildfire_Protocol_JsonStream
public function getPayload(Zend_Wildfire_Channel_Interface $channel)
{
if (!$channel instanceof Zend_Wildfire_Channel_HttpHeaders) {
throw new Zend_Wildfire_Exception('The '.get_class($channel).' channel is not supported by the '.get_class($this).' protocol.');
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('The '.get_class($channel).' channel is not supported by the '.get_class($this).' protocol.');
}
if ($this->_plugins) {
foreach ($this->_plugins as $plugin) {
$plugin->flushMessages(self::PROTOCOL_URI);
}
}
if (!$this->_messages) {
return false;
}
$protocol_index = 1;
$structure_index = 1;
$plugin_index = 1;
@ -181,19 +179,19 @@ class Zend_Wildfire_Protocol_JsonStream
$payload = array();
$payload[] = array('Protocol-'.$protocol_index, self::PROTOCOL_URI);
foreach ($this->_messages as $structure_uri => $plugin_messages ) {
$payload[] = array($protocol_index.'-Structure-'.$structure_index, $structure_uri);
foreach ($plugin_messages as $plugin_uri => $messages ) {
$payload[] = array($protocol_index.'-Plugin-'.$plugin_index, $plugin_uri);
foreach ($messages as $message) {
$parts = explode("\n",chunk_split($message, 5000, "\n"));
for ($i=0 ; $i<count($parts) ; $i++) {
$part = $parts[$i];
@ -216,9 +214,10 @@ class Zend_Wildfire_Protocol_JsonStream
$msg);
$message_index++;
if ($message_index > 99999) {
throw new Zend_Wildfire_Exception('Maximum number (99,999) of messages reached!');
require_once 'Zend/Wildfire/Exception.php';
throw new Zend_Wildfire_Exception('Maximum number (99,999) of messages reached!');
}
}
}