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

Fixed public property naming.

Browse Source
This commit is contained in:
Qiang Xue
2013-11-20 16:04:38 -05:00
parent fb945866c7
commit c6ecf4f2de
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/base/Widget.php
View File

@@ -27,13 +27,13 @@ class Widget extends Component implements ViewContextInterface
* @var integer a counter used to generate [[id]] for widgets.
* @internal
*/
public static $_counter = 0;
public static $counter = 0;
/**
* @var Widget[] the widgets that are currently being rendered (not ended). This property
* is maintained by [[begin()]] and [[end()]] methods.
* @internal
*/
public static $_stack = [];
public static $stack = [];
/**
@@ -48,7 +48,7 @@ class Widget extends Component implements ViewContextInterface
$config['class'] = get_called_class();
/** @var Widget $widget */
$widget = Yii::createObject($config);
self::$_stack[] = $widget;
self::$stack[] = $widget;
return $widget;
}
@@ -60,8 +60,8 @@ class Widget extends Component implements ViewContextInterface
*/
public static function end()
{
if (!empty(self::$_stack)) {
$widget = array_pop(self::$_stack);
if (!empty(self::$stack)) {
$widget = array_pop(self::$stack);
if (get_class($widget) === get_called_class()) {
$widget->run();
return $widget;
@@ -100,7 +100,7 @@ class Widget extends Component implements ViewContextInterface
public function getId($autoGenerate = true)
{
if ($autoGenerate && $this->_id === null) {
$this->_id = 'w' . self::$_counter++;
$this->_id = 'w' . self::$counter++;
}
return $this->_id;
}