Merge branch 'master' of github.com:yiisoft/yii2 into asset-command

tests/unit/framework/YiiBaseTest.php

@@ -45,6 +45,9 @@ class YiiBaseTest extends TestCase
 		Yii::setAlias('@yii', null);
 		$this->assertFalse(Yii::getAlias('@yii', false));
 		$this->assertEquals('/yii/gii/file', Yii::getAlias('@yii/gii/file'));
+
+		Yii::setAlias('@some/alias', '/www');
+		$this->assertEquals('/www', Yii::getAlias('@some/alias'));
 	}
 
 	public function testGetVersion()

yii/YiiBase.php

@@ -287,7 +287,11 @@ class YiiBase
 		if ($path !== null) {
 			$path = strncmp($path, '@', 1) ? rtrim($path, '\\/') : static::getAlias($path);
 			if (!isset(self::$aliases[$root])) {
+				if ($pos === false) {
 					self::$aliases[$root] = $path;
+				} else {
+					self::$aliases[$root] = array($alias => $path);
+				}
 			} elseif (is_string(self::$aliases[$root])) {
 				if ($pos === false) {
 					self::$aliases[$root] = $path;

yii/debug/Toolbar.php

@@ -26,8 +26,9 @@ class Toolbar extends Widget
 			$url = Yii::$app->getUrlManager()->createUrl($this->debugAction, array(
 				'tag' => Yii::getLogger()->tag,
 			));
-			$this->view->registerJs("yii.debug.load('$id', '$url');");
+			$view = $this->getView();
-			$this->view->registerAssetBundle('yii/debug');
+			$view->registerJs("yii.debug.load('$id', '$url');");
+			$view->registerAssetBundle('yii/debug');
 			echo Html::tag('div', '', array(
 				'id' => $id,
 				'style' => 'display: none',

yii/widgets/LinkPager.php

@@ -122,7 +122,7 @@ class LinkPager extends Widget
 	{
 		$buttons = array();
 
-		$pageCount = $this->pagination->pageCount;
+		$pageCount = $this->pagination->getPageCount();
 		$currentPage = $this->pagination->getPage();
 
 		// first page

yii/widgets/ListPager.php

@@ -63,7 +63,7 @@ class ListPager extends Widget
 	 */
 	public function run()
 	{
-		$pageCount = $this->pagination->pageCount;
+		$pageCount = $this->pagination->getPageCount();
 		$currentPage = $this->pagination->getPage();
 
 		$pages = array();