Merge branch 'master' of github.com:yiisoft/yii2

docs/guide/security-authorization.md

@@ -460,7 +460,7 @@ of the rule class, you need to respect this hierarchy as well. That is why when
 the `execute()` method will return true if the user group is either 1 or 2 (meaning the user is in either "admin"
 group or "author" group).
 
-Next, configure `authManager` by listing the two roles in [[yii\rbac\ManagerInterface::defaultRoles]]:
+Next, configure `authManager` by listing the two roles in [[yii\rbac\BaseManager::$defaultRoles]]:
 
 ```php
 return [

framework/base/Widget.php

@@ -54,7 +54,7 @@ class Widget extends Component implements ViewContextInterface
         $config['class'] = get_called_class();
         /** @var Widget $widget */
         $widget = Yii::createObject($config);
-        self::$stack[] = $widget;
+        static::$stack[] = $widget;
 
         return $widget;
     }
@@ -67,8 +67,8 @@ class Widget extends Component implements ViewContextInterface
      */
     public static function end()
     {
-        if (!empty(self::$stack)) {
-            $widget = array_pop(self::$stack);
+        if (!empty(static::$stack)) {
+            $widget = array_pop(static::$stack);
             if (get_class($widget) === get_called_class()) {
                 echo $widget->run();
                 return $widget;
@@ -108,7 +108,7 @@ class Widget extends Component implements ViewContextInterface
     public function getId($autoGenerate = true)
     {
         if ($autoGenerate && $this->_id === null) {
-            $this->_id = self::$autoIdPrefix . self::$counter++;
+            $this->_id = static::$autoIdPrefix . static::$counter++;
         }
 
         return $this->_id;

framework/i18n/GettextMessageSource.php

@@ -98,9 +98,9 @@ class GettextMessageSource extends MessageSource
     {
         $messageFile = Yii::getAlias($this->basePath) . '/' . $language . '/' . $this->catalog;
         if ($this->useMoFile) {
-            $messageFile .= static::MO_FILE_EXT;
+            $messageFile .= self::MO_FILE_EXT;
         } else {
-            $messageFile .= static::PO_FILE_EXT;
+            $messageFile .= self::PO_FILE_EXT;
         }
 
         return $messageFile;