php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 15:31:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added UrlRule::name.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-06 08:24:33 -04:00
parent 840a84db5c
commit ec28988a37
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/yii/log/Logger.php
View File

@@ -101,14 +101,6 @@ class Logger extends Component
const LEVEL_PROFILE_END = 0x60; const LEVEL_PROFILE_END = 0x60;
/**
* @var integer how many messages should be logged before they are flushed from memory and sent to targets.
* Defaults to 1000, meaning the [[flush]] method will be invoked once every 1000 messages logged.
* Set this property to be 0 if you don't want to flush messages until the application terminates.
* This property mainly affects how much memory will be taken by the logged messages.
* A smaller value means less memory, but will increase the execution time due to the overhead of [[flush()]].
*/
public $flushInterval = 1000;
/** /**
* @var array logged messages. This property is managed by [[log()]] and [[flush()]]. * @var array logged messages. This property is managed by [[log()]] and [[flush()]].
* Each log message is of the following structure: * Each log message is of the following structure:
@@ -123,11 +115,24 @@ class Logger extends Component
* ~~~ * ~~~
*/ */
public $messages = array(); public $messages = array();
/**
* @var array debug data. This property stores various types of debug data reported at
* different instrument places.
*/
public $data = array();
/** /**
* @var array|Target[] the log targets. Each array element represents a single [[Target|log target]] instance * @var array|Target[] the log targets. Each array element represents a single [[Target|log target]] instance
* or the configuration for creating the log target instance. * or the configuration for creating the log target instance.
*/ */
public $targets = array(); public $targets = array();
/**
* @var integer how many messages should be logged before they are flushed from memory and sent to targets.
* Defaults to 1000, meaning the [[flush]] method will be invoked once every 1000 messages logged.
* Set this property to be 0 if you don't want to flush messages until the application terminates.
* This property mainly affects how much memory will be taken by the logged messages.
* A smaller value means less memory, but will increase the execution time due to the overhead of [[flush()]].
*/
public $flushInterval = 1000;
/** /**
* Initializes the logger by registering [[flush()]] as a shutdown function. * Initializes the logger by registering [[flush()]] as a shutdown function.

7
framework/yii/web/UrlRule.php
View File

@@ -27,6 +27,10 @@ class UrlRule extends Object
*/ */
const CREATION_ONLY = 2; const CREATION_ONLY = 2;
/**
* @var string the name of this rule. If not set, it will use [[pattern]] as the name.
*/
public $name;
/** /**
* @var string the pattern used to parse and create the path info part of a URL. * @var string the pattern used to parse and create the path info part of a URL.
* @see host * @see host
@@ -106,6 +110,9 @@ class UrlRule extends Object
$this->verb = array(strtoupper($this->verb)); $this->verb = array(strtoupper($this->verb));
} }
} }
if ($this->name === null) {
$this->name = $this->pattern;
}
$this->pattern = trim($this->pattern, '/'); $this->pattern = trim($this->pattern, '/');