Merge branch 'master'

build/build.xml

@@ -265,7 +265,7 @@ Please update yiisite/common/data/versions.php file with the following code:
 
     where <target name> can be one of the following:
 
-    - sync    : synchronize yiilite.php and YiiBase.php
+    - sync    : synchronize yiilite.php and BaseYii.php
     - message : extract i18n messages of the framework
     - src     : build source release
     - doc     : build documentation release (Windows only)

build/controllers/ClassmapController.php

@@ -45,7 +45,7 @@ class ClassmapController extends Controller
 			'only' => array('.php'),
 			'except' => array(
 				'Yii.php',
-				'YiiBase.php',
+				'BaseYii.php',
 				'/debug/',
 				'/console/',
 				'/test/',

build/controllers/PhpDocController.php

@@ -56,7 +56,7 @@ class PhpDocController extends Controller
 			},
 			'only' => array('.php'),
 			'except' => array(
-				'YiiBase.php',
+				'BaseYii.php',
 				'Yii.php',
 				'/debug/views/',
 				'/requirements/',

docs/internals/autoloader.md

@@ -16,4 +16,4 @@ PEAR-style libraries
 References
 ----------
 
-- YiiBase::autoload
+- BaseYii::autoload

framework/yii/BaseYii.php

@@ -49,15 +49,15 @@ defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true);
 
 
 /**
- * YiiBase is the core helper class for the Yii framework.
+ * BaseYii is the core helper class for the Yii framework.
  *
- * Do not use YiiBase directly. Instead, use its child class [[Yii]] where
- * you can customize methods of YiiBase.
+ * Do not use BaseYii directly. Instead, use its child class [[Yii]] where
+ * you can customize methods of BaseYii.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class YiiBase
+class BaseYii
 {
 	/**
 	 * @var array class map used by the Yii autoloading mechanism.

framework/yii/Yii.php

@@ -7,18 +7,18 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require(__DIR__ . '/YiiBase.php');
+require(__DIR__ . '/BaseYii.php');
 
 /**
  * Yii is a helper class serving common framework functionalities.
  *
- * It extends from [[YiiBase]] which provides the actual implementation.
- * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
+ * It extends from [[BaseYii]] which provides the actual implementation.
+ * By writing your own Yii class, you can customize some functionalities of [[BaseYii]].
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Yii extends \yii\YiiBase
+class Yii extends \yii\BaseYii
 {
 }
 

framework/yii/classes.php

@@ -125,27 +125,27 @@ return array(
 	'yii\grid\GridViewAsset' => YII_PATH . '/grid/GridViewAsset.php',
 	'yii\grid\SerialColumn' => YII_PATH . '/grid/SerialColumn.php',
 	'yii\helpers\ArrayHelper' => YII_PATH . '/helpers/ArrayHelper.php',
-	'yii\helpers\ArrayHelperBase' => YII_PATH . '/helpers/ArrayHelperBase.php',
+	'yii\helpers\BaseArrayHelper' => YII_PATH . '/helpers/BaseArrayHelper.php',
 	'yii\helpers\Console' => YII_PATH . '/helpers/Console.php',
-	'yii\helpers\ConsoleBase' => YII_PATH . '/helpers/ConsoleBase.php',
+	'yii\helpers\BaseConsole' => YII_PATH . '/helpers/BaseConsole.php',
 	'yii\helpers\FileHelper' => YII_PATH . '/helpers/FileHelper.php',
-	'yii\helpers\FileHelperBase' => YII_PATH . '/helpers/FileHelperBase.php',
+	'yii\helpers\BaseFileHelper' => YII_PATH . '/helpers/BaseFileHelper.php',
 	'yii\helpers\Html' => YII_PATH . '/helpers/Html.php',
-	'yii\helpers\HtmlBase' => YII_PATH . '/helpers/HtmlBase.php',
+	'yii\helpers\BaseHtml' => YII_PATH . '/helpers/BaseHtml.php',
 	'yii\helpers\HtmlPurifier' => YII_PATH . '/helpers/HtmlPurifier.php',
-	'yii\helpers\HtmlPurifierBase' => YII_PATH . '/helpers/HtmlPurifierBase.php',
+	'yii\helpers\BaseHtmlPurifier' => YII_PATH . '/helpers/BaseHtmlPurifier.php',
 	'yii\helpers\Inflector' => YII_PATH . '/helpers/Inflector.php',
-	'yii\helpers\InflectorBase' => YII_PATH . '/helpers/InflectorBase.php',
+	'yii\helpers\BaseInflector' => YII_PATH . '/helpers/BaseInflector.php',
 	'yii\helpers\Json' => YII_PATH . '/helpers/Json.php',
-	'yii\helpers\JsonBase' => YII_PATH . '/helpers/JsonBase.php',
+	'yii\helpers\BaseJson' => YII_PATH . '/helpers/BaseJson.php',
 	'yii\helpers\Markdown' => YII_PATH . '/helpers/Markdown.php',
-	'yii\helpers\MarkdownBase' => YII_PATH . '/helpers/MarkdownBase.php',
+	'yii\helpers\BaseMarkdown' => YII_PATH . '/helpers/BaseMarkdown.php',
 	'yii\helpers\Security' => YII_PATH . '/helpers/Security.php',
-	'yii\helpers\SecurityBase' => YII_PATH . '/helpers/SecurityBase.php',
+	'yii\helpers\BaseSecurity' => YII_PATH . '/helpers/BaseSecurity.php',
 	'yii\helpers\StringHelper' => YII_PATH . '/helpers/StringHelper.php',
-	'yii\helpers\StringHelperBase' => YII_PATH . '/helpers/StringHelperBase.php',
+	'yii\helpers\BaseStringHelper' => YII_PATH . '/helpers/BaseStringHelper.php',
 	'yii\helpers\VarDumper' => YII_PATH . '/helpers/VarDumper.php',
-	'yii\helpers\VarDumperBase' => YII_PATH . '/helpers/VarDumperBase.php',
+	'yii\helpers\BaseVarDumper' => YII_PATH . '/helpers/BaseVarDumper.php',
 	'yii\i18n\DbMessageSource' => YII_PATH . '/i18n/DbMessageSource.php',
 	'yii\i18n\Formatter' => YII_PATH . '/i18n/Formatter.php',
 	'yii\i18n\GettextFile' => YII_PATH . '/i18n/GettextFile.php',

framework/yii/helpers/ArrayHelper.php

@@ -14,6 +14,6 @@ namespace yii\helpers;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class ArrayHelper extends ArrayHelperBase
+class ArrayHelper extends BaseArrayHelper
 {
 }

framework/yii/helpers/BaseArrayHelper.php

@@ -12,14 +12,14 @@ use yii\base\Arrayable;
 use yii\base\InvalidParamException;
 
 /**
- * ArrayHelperBase provides concrete implementation for [[ArrayHelper]].
+ * BaseArrayHelper provides concrete implementation for [[ArrayHelper]].
  *
- * Do not use ArrayHelperBase. Use [[ArrayHelper]] instead.
+ * Do not use BaseArrayHelper. Use [[ArrayHelper]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class ArrayHelperBase
+class BaseArrayHelper
 {
 	/**
 	 * Converts an object or an array of objects into an array.

framework/yii/helpers/BaseConsole.php

@@ -8,14 +8,14 @@
 namespace yii\helpers;
 
 /**
- * ConsoleBase provides concrete implementation for [[Console]].
+ * BaseConsole provides concrete implementation for [[Console]].
  *
- * Do not use ConsoleBase. Use [[Console]] instead.
+ * Do not use BaseConsole. Use [[Console]] instead.
  *
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-class ConsoleBase
+class BaseConsole
 {
 	const FG_BLACK  = 30;
 	const FG_RED    = 31;

framework/yii/helpers/BaseFileHelper.php

@@ -12,15 +12,15 @@ namespace yii\helpers;
 use Yii;
 
 /**
- * FileHelperBase provides concrete implementation for [[FileHelper]].
+ * BaseFileHelper provides concrete implementation for [[FileHelper]].
  *
- * Do not use FileHelperBase. Use [[FileHelper]] instead.
+ * Do not use BaseFileHelper. Use [[FileHelper]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alex Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class FileHelperBase
+class BaseFileHelper
 {
 	/**
 	 * Normalizes a file/directory path.

framework/yii/helpers/BaseHtml.php

@@ -13,14 +13,14 @@ use yii\web\Request;
 use yii\base\Model;
 
 /**
- * HtmlBase provides concrete implementation for [[Html]].
+ * BaseHtml provides concrete implementation for [[Html]].
  *
- * Do not use HtmlBase. Use [[Html]] instead.
+ * Do not use BaseHtml. Use [[Html]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class HtmlBase
+class BaseHtml
 {
 	/**
 	 * @var array list of void elements (element name => 1)

framework/yii/helpers/BaseHtmlPurifier.php

@@ -7,14 +7,14 @@
 namespace yii\helpers;
 
 /**
- * HtmlPurifierBase provides concrete implementation for [[HtmlPurifier]].
+ * BaseHtmlPurifier provides concrete implementation for [[HtmlPurifier]].
  *
- * Do not use HtmlPurifierBase. Use [[HtmlPurifier]] instead.
+ * Do not use BaseHtmlPurifier. Use [[HtmlPurifier]] instead.
  *
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class HtmlPurifierBase
+class BaseHtmlPurifier
 {
 	/**
 	 * Passes markup through HTMLPurifier making it safe to output to end user

framework/yii/helpers/BaseInflector.php

@@ -10,14 +10,14 @@ namespace yii\helpers;
 use Yii;
 
 /**
- * InflectorBase provides concrete implementation for [[Inflector]].
+ * BaseInflector provides concrete implementation for [[Inflector]].
  *
- * Do not use InflectorBase. Use [[Inflector]] instead.
+ * Do not use BaseInflector. Use [[Inflector]] instead.
  *
  * @author Antonio Ramirez <amigo.cobos@gmail.com>
  * @since 2.0
  */
-class InflectorBase
+class BaseInflector
 {
 	/**
 	 * @var array the rules for converting a word into its plural form.

framework/yii/helpers/BaseJson.php

@@ -12,14 +12,14 @@ use yii\base\Arrayable;
 use yii\web\JsExpression;
 
 /**
- * JsonBase provides concrete implementation for [[Json]].
+ * BaseJson provides concrete implementation for [[Json]].
  *
- * Do not use JsonBase. Use [[Json]] instead.
+ * Do not use BaseJson. Use [[Json]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class JsonBase
+class BaseJson
 {
 	/**
 	 * Encodes the given value into a JSON string.

framework/yii/helpers/BaseMarkdown.php

@@ -10,14 +10,14 @@ namespace yii\helpers;
 use Michelf\MarkdownExtra;
 
 /**
- * MarkdownBase provides concrete implementation for [[Markdown]].
+ * BaseMarkdown provides concrete implementation for [[Markdown]].
  *
- * Do not use MarkdownBase. Use [[Markdown]] instead.
+ * Do not use BaseMarkdown. Use [[Markdown]] instead.
  *
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class MarkdownBase
+class BaseMarkdown
 {
 	/**
 	 * @var MarkdownExtra

framework/yii/helpers/BaseSecurity.php

@@ -13,15 +13,15 @@ use yii\base\InvalidConfigException;
 use yii\base\InvalidParamException;
 
 /**
- * SecurityBase provides concrete implementation for [[Security]].
+ * BaseSecurity provides concrete implementation for [[Security]].
  *
- * Do not use SecurityBase. Use [[Security]] instead.
+ * Do not use BaseSecurity. Use [[Security]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Tom Worster <fsb@thefsb.org>
  * @since 2.0
  */
-class SecurityBase
+class BaseSecurity
 {
 	/**
 	 * Encrypts data.

framework/yii/helpers/BaseStringHelper.php

@@ -10,15 +10,15 @@ namespace yii\helpers;
 use yii\base\InvalidParamException;
 
 /**
- * StringHelperBase provides concrete implementation for [[StringHelper]].
+ * BaseStringHelper provides concrete implementation for [[StringHelper]].
  *
- * Do not use StringHelperBase. Use [[StringHelper]] instead.
+ * Do not use BaseStringHelper. Use [[StringHelper]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alex Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class StringHelperBase
+class BaseStringHelper
 {
 	/**
 	 * Returns the number of bytes in the given string.

framework/yii/helpers/BaseVarDumper.php

@@ -9,14 +9,14 @@
 namespace yii\helpers;
 
 /**
- * VarDumperBase provides concrete implementation for [[VarDumper]].
+ * BaseVarDumper provides concrete implementation for [[VarDumper]].
  *
- * Do not use VarDumperBase. Use [[VarDumper]] instead.
+ * Do not use BaseVarDumper. Use [[VarDumper]] instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class VarDumperBase
+class BaseVarDumper
 {
 	private static $_objects;
 	private static $_output;

framework/yii/helpers/Console.php

@@ -14,6 +14,6 @@ namespace yii\helpers;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-class Console extends ConsoleBase
+class Console extends BaseConsole
 {
 }

framework/yii/helpers/FileHelper.php

@@ -16,6 +16,6 @@ namespace yii\helpers;
  * @author Alex Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class FileHelper extends FileHelperBase
+class FileHelper extends BaseFileHelper
 {
 }

framework/yii/helpers/Html.php

@@ -13,6 +13,6 @@ namespace yii\helpers;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Html extends HtmlBase
+class Html extends BaseHtml
 {
 }

framework/yii/helpers/HtmlPurifier.php

@@ -32,6 +32,6 @@ namespace yii\helpers;
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class HtmlPurifier extends HtmlPurifierBase
+class HtmlPurifier extends BaseHtmlPurifier
 {
 }

framework/yii/helpers/Inflector.php

@@ -13,6 +13,6 @@ namespace yii\helpers;
  * @author Antonio Ramirez <amigo.cobos@gmail.com>
  * @since 2.0
  */
-class Inflector extends InflectorBase
+class Inflector extends BaseInflector
 {
 }

framework/yii/helpers/Json.php

@@ -14,6 +14,6 @@ namespace yii\helpers;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Json extends JsonBase
+class Json extends BaseJson
 {
 }

framework/yii/helpers/Markdown.php

@@ -30,6 +30,6 @@ namespace yii\helpers;
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class Markdown extends MarkdownBase
+class Markdown extends BaseMarkdown
 {
 }

framework/yii/helpers/Security.php

@@ -24,6 +24,6 @@ namespace yii\helpers;
  * @author Tom Worster <fsb@thefsb.org>
  * @since 2.0
  */
-class Security extends SecurityBase
+class Security extends BaseSecurity
 {
 }

framework/yii/helpers/StringHelper.php

@@ -14,6 +14,6 @@ namespace yii\helpers;
  * @author Alex Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class StringHelper extends StringHelperBase
+class StringHelper extends BaseStringHelper
 {
 }

framework/yii/helpers/VarDumper.php

@@ -23,6 +23,6 @@ namespace yii\helpers;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class VarDumper extends VarDumperBase
+class VarDumper extends BaseVarDumper
 {
 }

framework/yii/log/Logger.php

@@ -220,7 +220,7 @@ class Logger extends Component
 	 * Returns the total elapsed time since the start of the current request.
 	 * This method calculates the difference between now and the timestamp
 	 * defined by constant `YII_BEGIN_TIME` which is evaluated at the beginning
-	 * of [[YiiBase]] class file.
+	 * of [[BaseYii]] class file.
 	 * @return float the total elapsed time in seconds for current request.
 	 */
 	public function getElapsedTime()

framework/yii/web/Response.php

@@ -581,7 +581,7 @@ class Response extends \yii\base\Response
 	 * In a controller action you may use this method like this:
 	 *
 	 * ~~~
-	 * return Yii::$app->getResponse()->redirect($url)->send();
+	 * return Yii::$app->getResponse()->redirect($url);
 	 * ~~~
 	 *
 	 * @param string|array $url the URL to be redirected to. This can be in one of the following formats: