diff --git a/build/build.xml b/build/build.xml index 85d5aa5..b0975dc 100644 --- a/build/build.xml +++ b/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 AbstractYii.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) diff --git a/build/controllers/ClassmapController.php b/build/controllers/ClassmapController.php index 10eb134..6a5ac8c 100644 --- a/build/controllers/ClassmapController.php +++ b/build/controllers/ClassmapController.php @@ -45,7 +45,7 @@ class ClassmapController extends Controller 'only' => array('.php'), 'except' => array( 'Yii.php', - 'AbstractYii.php', + 'BaseYii.php', '/debug/', '/console/', '/test/', diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php index 4fed3b2..cb574ff 100644 --- a/build/controllers/PhpDocController.php +++ b/build/controllers/PhpDocController.php @@ -56,7 +56,7 @@ class PhpDocController extends Controller }, 'only' => array('.php'), 'except' => array( - 'AbstractYii.php', + 'BaseYii.php', 'Yii.php', '/debug/views/', '/requirements/', diff --git a/docs/internals/autoloader.md b/docs/internals/autoloader.md index 067773d..76a545b 100644 --- a/docs/internals/autoloader.md +++ b/docs/internals/autoloader.md @@ -16,4 +16,4 @@ PEAR-style libraries References ---------- -- AbstractYii::autoload \ No newline at end of file +- BaseYii::autoload \ No newline at end of file diff --git a/framework/yii/AbstractYii.php b/framework/yii/BaseYii.php similarity index 98% rename from framework/yii/AbstractYii.php rename to framework/yii/BaseYii.php index c40aad9..b586160 100644 --- a/framework/yii/AbstractYii.php +++ b/framework/yii/BaseYii.php @@ -49,15 +49,15 @@ defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true); /** - * AbstractYii is the core helper class for the Yii framework. + * BaseYii is the core helper class for the Yii framework. * - * Do not use AbstractYii directly. Instead, use its child class [[Yii]] where - * you can customize methods of AbstractYii. + * Do not use BaseYii directly. Instead, use its child class [[Yii]] where + * you can customize methods of BaseYii. * * @author Qiang Xue * @since 2.0 */ -abstract class AbstractYii +class BaseYii { /** * @var array class map used by the Yii autoloading mechanism. diff --git a/framework/yii/Yii.php b/framework/yii/Yii.php index 0406463..232117f 100644 --- a/framework/yii/Yii.php +++ b/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 [[AbstractYii]] which provides the actual implementation. - * By writing your own Yii class, you can customize some functionalities of [[AbstractYii]]. + * 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 * @since 2.0 */ -class Yii extends \yii\AbstractYii +class Yii extends \yii\BaseYii { } diff --git a/framework/yii/classes.php b/framework/yii/classes.php index 22472d7..d4f304c 100644 --- a/framework/yii/classes.php +++ b/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\AbstractArrayHelper' => YII_PATH . '/helpers/AbstractArrayHelper.php', + 'yii\helpers\BaseArrayHelper' => YII_PATH . '/helpers/BaseArrayHelper.php', 'yii\helpers\Console' => YII_PATH . '/helpers/Console.php', - 'yii\helpers\AbstractConsole' => YII_PATH . '/helpers/AbstractConsole.php', + 'yii\helpers\BaseConsole' => YII_PATH . '/helpers/BaseConsole.php', 'yii\helpers\FileHelper' => YII_PATH . '/helpers/FileHelper.php', - 'yii\helpers\AbstractFileHelper' => YII_PATH . '/helpers/AbstractFileHelper.php', + 'yii\helpers\BaseFileHelper' => YII_PATH . '/helpers/BaseFileHelper.php', 'yii\helpers\Html' => YII_PATH . '/helpers/Html.php', - 'yii\helpers\AbstractHtml' => YII_PATH . '/helpers/AbstractHtml.php', + 'yii\helpers\BaseHtml' => YII_PATH . '/helpers/BaseHtml.php', 'yii\helpers\HtmlPurifier' => YII_PATH . '/helpers/HtmlPurifier.php', - 'yii\helpers\AbstractHtmlPurifier' => YII_PATH . '/helpers/AbstractHtmlPurifier.php', + 'yii\helpers\BaseHtmlPurifier' => YII_PATH . '/helpers/BaseHtmlPurifier.php', 'yii\helpers\Inflector' => YII_PATH . '/helpers/Inflector.php', - 'yii\helpers\AbstractInflector' => YII_PATH . '/helpers/AbstractInflector.php', + 'yii\helpers\BaseInflector' => YII_PATH . '/helpers/BaseInflector.php', 'yii\helpers\Json' => YII_PATH . '/helpers/Json.php', - 'yii\helpers\AbstractJson' => YII_PATH . '/helpers/AbstractJson.php', + 'yii\helpers\BaseJson' => YII_PATH . '/helpers/BaseJson.php', 'yii\helpers\Markdown' => YII_PATH . '/helpers/Markdown.php', - 'yii\helpers\AbstractMarkdown' => YII_PATH . '/helpers/AbstractMarkdown.php', + 'yii\helpers\BaseMarkdown' => YII_PATH . '/helpers/BaseMarkdown.php', 'yii\helpers\Security' => YII_PATH . '/helpers/Security.php', - 'yii\helpers\AbstractSecurity' => YII_PATH . '/helpers/AbstractSecurity.php', + 'yii\helpers\BaseSecurity' => YII_PATH . '/helpers/BaseSecurity.php', 'yii\helpers\StringHelper' => YII_PATH . '/helpers/StringHelper.php', - 'yii\helpers\AbstractStringHelper' => YII_PATH . '/helpers/AbstractStringHelper.php', + 'yii\helpers\BaseStringHelper' => YII_PATH . '/helpers/BaseStringHelper.php', 'yii\helpers\VarDumper' => YII_PATH . '/helpers/VarDumper.php', - 'yii\helpers\AbstractVarDumper' => YII_PATH . '/helpers/AbstractVarDumper.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', diff --git a/framework/yii/helpers/ArrayHelper.php b/framework/yii/helpers/ArrayHelper.php index a63d3c2..9d428f5 100644 --- a/framework/yii/helpers/ArrayHelper.php +++ b/framework/yii/helpers/ArrayHelper.php @@ -14,6 +14,6 @@ namespace yii\helpers; * @author Qiang Xue * @since 2.0 */ -class ArrayHelper extends AbstractArrayHelper +class ArrayHelper extends BaseArrayHelper { } diff --git a/framework/yii/helpers/AbstractArrayHelper.php b/framework/yii/helpers/BaseArrayHelper.php similarity index 98% rename from framework/yii/helpers/AbstractArrayHelper.php rename to framework/yii/helpers/BaseArrayHelper.php index c26c1cd..0ed584f 100644 --- a/framework/yii/helpers/AbstractArrayHelper.php +++ b/framework/yii/helpers/BaseArrayHelper.php @@ -12,14 +12,14 @@ use yii\base\Arrayable; use yii\base\InvalidParamException; /** - * AbstractArrayHelper provides concrete implementation for [[ArrayHelper]]. + * BaseArrayHelper provides concrete implementation for [[ArrayHelper]]. * - * Do not use AbstractArrayHelper. Use [[ArrayHelper]] instead. + * Do not use BaseArrayHelper. Use [[ArrayHelper]] instead. * * @author Qiang Xue * @since 2.0 */ -abstract class AbstractArrayHelper +class BaseArrayHelper { /** * Converts an object or an array of objects into an array. diff --git a/framework/yii/helpers/AbstractConsole.php b/framework/yii/helpers/BaseConsole.php similarity index 99% rename from framework/yii/helpers/AbstractConsole.php rename to framework/yii/helpers/BaseConsole.php index 8131aae..6796283 100644 --- a/framework/yii/helpers/AbstractConsole.php +++ b/framework/yii/helpers/BaseConsole.php @@ -8,14 +8,14 @@ namespace yii\helpers; /** - * AbstractConsole provides concrete implementation for [[Console]]. + * BaseConsole provides concrete implementation for [[Console]]. * - * Do not use AbstractConsole. Use [[Console]] instead. + * Do not use BaseConsole. Use [[Console]] instead. * * @author Carsten Brandt * @since 2.0 */ -abstract class AbstractConsole +class BaseConsole { const FG_BLACK = 30; const FG_RED = 31; diff --git a/framework/yii/helpers/AbstractFileHelper.php b/framework/yii/helpers/BaseFileHelper.php similarity index 98% rename from framework/yii/helpers/AbstractFileHelper.php rename to framework/yii/helpers/BaseFileHelper.php index 5eab927..2c911b0 100644 --- a/framework/yii/helpers/AbstractFileHelper.php +++ b/framework/yii/helpers/BaseFileHelper.php @@ -12,15 +12,15 @@ namespace yii\helpers; use Yii; /** - * AbstractFileHelper provides concrete implementation for [[FileHelper]]. + * BaseFileHelper provides concrete implementation for [[FileHelper]]. * - * Do not use AbstractFileHelper. Use [[FileHelper]] instead. + * Do not use BaseFileHelper. Use [[FileHelper]] instead. * * @author Qiang Xue * @author Alex Makarov * @since 2.0 */ -abstract class AbstractFileHelper +class BaseFileHelper { /** * Normalizes a file/directory path. diff --git a/framework/yii/helpers/AbstractHtml.php b/framework/yii/helpers/BaseHtml.php similarity index 99% rename from framework/yii/helpers/AbstractHtml.php rename to framework/yii/helpers/BaseHtml.php index 37e926c..2baa679 100644 --- a/framework/yii/helpers/AbstractHtml.php +++ b/framework/yii/helpers/BaseHtml.php @@ -13,14 +13,14 @@ use yii\web\Request; use yii\base\Model; /** - * AbstractHtml provides concrete implementation for [[Html]]. + * BaseHtml provides concrete implementation for [[Html]]. * - * Do not use AbstractHtml. Use [[Html]] instead. + * Do not use BaseHtml. Use [[Html]] instead. * * @author Qiang Xue * @since 2.0 */ -abstract class AbstractHtml +class BaseHtml { /** * @var array list of void elements (element name => 1) diff --git a/framework/yii/helpers/AbstractHtmlPurifier.php b/framework/yii/helpers/BaseHtmlPurifier.php similarity index 80% rename from framework/yii/helpers/AbstractHtmlPurifier.php rename to framework/yii/helpers/BaseHtmlPurifier.php index 221fc37..17d2122 100644 --- a/framework/yii/helpers/AbstractHtmlPurifier.php +++ b/framework/yii/helpers/BaseHtmlPurifier.php @@ -7,14 +7,14 @@ namespace yii\helpers; /** - * AbstractHtmlPurifier provides concrete implementation for [[HtmlPurifier]]. + * BaseHtmlPurifier provides concrete implementation for [[HtmlPurifier]]. * - * Do not use AbstractHtmlPurifier. Use [[HtmlPurifier]] instead. + * Do not use BaseHtmlPurifier. Use [[HtmlPurifier]] instead. * * @author Alexander Makarov * @since 2.0 */ -abstract class AbstractHtmlPurifier +class BaseHtmlPurifier { /** * Passes markup through HTMLPurifier making it safe to output to end user diff --git a/framework/yii/helpers/AbstractInflector.php b/framework/yii/helpers/BaseInflector.php similarity index 98% rename from framework/yii/helpers/AbstractInflector.php rename to framework/yii/helpers/BaseInflector.php index 27ee4f7..affd3dd 100644 --- a/framework/yii/helpers/AbstractInflector.php +++ b/framework/yii/helpers/BaseInflector.php @@ -10,14 +10,14 @@ namespace yii\helpers; use Yii; /** - * AbstractInflector provides concrete implementation for [[Inflector]]. + * BaseInflector provides concrete implementation for [[Inflector]]. * - * Do not use AbstractInflector. Use [[Inflector]] instead. + * Do not use BaseInflector. Use [[Inflector]] instead. * * @author Antonio Ramirez * @since 2.0 */ -abstract class AbstractInflector +class BaseInflector { /** * @var array the rules for converting a word into its plural form. diff --git a/framework/yii/helpers/AbstractJson.php b/framework/yii/helpers/BaseJson.php similarity index 96% rename from framework/yii/helpers/AbstractJson.php rename to framework/yii/helpers/BaseJson.php index cda71a0..bd6ede5 100644 --- a/framework/yii/helpers/AbstractJson.php +++ b/framework/yii/helpers/BaseJson.php @@ -12,14 +12,14 @@ use yii\base\Arrayable; use yii\web\JsExpression; /** - * AbstractJson provides concrete implementation for [[Json]]. + * BaseJson provides concrete implementation for [[Json]]. * - * Do not use AbstractJson. Use [[Json]] instead. + * Do not use BaseJson. Use [[Json]] instead. * * @author Qiang Xue * @since 2.0 */ -abstract class AbstractJson +class BaseJson { /** * Encodes the given value into a JSON string. diff --git a/framework/yii/helpers/AbstractMarkdown.php b/framework/yii/helpers/BaseMarkdown.php similarity index 82% rename from framework/yii/helpers/AbstractMarkdown.php rename to framework/yii/helpers/BaseMarkdown.php index 6b76b44..40a1dc4 100644 --- a/framework/yii/helpers/AbstractMarkdown.php +++ b/framework/yii/helpers/BaseMarkdown.php @@ -10,14 +10,14 @@ namespace yii\helpers; use Michelf\MarkdownExtra; /** - * AbstractMarkdown provides concrete implementation for [[Markdown]]. + * BaseMarkdown provides concrete implementation for [[Markdown]]. * - * Do not use AbstractMarkdown. Use [[Markdown]] instead. + * Do not use BaseMarkdown. Use [[Markdown]] instead. * * @author Alexander Makarov * @since 2.0 */ -abstract class AbstractMarkdown +class BaseMarkdown { /** * @var MarkdownExtra diff --git a/framework/yii/helpers/AbstractSecurity.php b/framework/yii/helpers/BaseSecurity.php similarity index 98% rename from framework/yii/helpers/AbstractSecurity.php rename to framework/yii/helpers/BaseSecurity.php index d308b7f..3be07b4 100644 --- a/framework/yii/helpers/AbstractSecurity.php +++ b/framework/yii/helpers/BaseSecurity.php @@ -13,15 +13,15 @@ use yii\base\InvalidConfigException; use yii\base\InvalidParamException; /** - * AbstractSecurity provides concrete implementation for [[Security]]. + * BaseSecurity provides concrete implementation for [[Security]]. * - * Do not use AbstractSecurity. Use [[Security]] instead. + * Do not use BaseSecurity. Use [[Security]] instead. * * @author Qiang Xue * @author Tom Worster * @since 2.0 */ -abstract class AbstractSecurity +class BaseSecurity { /** * Encrypts data. diff --git a/framework/yii/helpers/AbstractStringHelper.php b/framework/yii/helpers/BaseStringHelper.php similarity index 96% rename from framework/yii/helpers/AbstractStringHelper.php rename to framework/yii/helpers/BaseStringHelper.php index 050481e..e1622b9 100644 --- a/framework/yii/helpers/AbstractStringHelper.php +++ b/framework/yii/helpers/BaseStringHelper.php @@ -10,15 +10,15 @@ namespace yii\helpers; use yii\base\InvalidParamException; /** - * AbstractStringHelper provides concrete implementation for [[StringHelper]]. + * BaseStringHelper provides concrete implementation for [[StringHelper]]. * - * Do not use AbstractStringHelper. Use [[StringHelper]] instead. + * Do not use BaseStringHelper. Use [[StringHelper]] instead. * * @author Qiang Xue * @author Alex Makarov * @since 2.0 */ -abstract class AbstractStringHelper +class BaseStringHelper { /** * Returns the number of bytes in the given string. diff --git a/framework/yii/helpers/AbstractVarDumper.php b/framework/yii/helpers/BaseVarDumper.php similarity index 95% rename from framework/yii/helpers/AbstractVarDumper.php rename to framework/yii/helpers/BaseVarDumper.php index 2c9f194..f109125 100644 --- a/framework/yii/helpers/AbstractVarDumper.php +++ b/framework/yii/helpers/BaseVarDumper.php @@ -9,14 +9,14 @@ namespace yii\helpers; /** - * AbstractVarDumper provides concrete implementation for [[VarDumper]]. + * BaseVarDumper provides concrete implementation for [[VarDumper]]. * - * Do not use AbstractVarDumper. Use [[VarDumper]] instead. + * Do not use BaseVarDumper. Use [[VarDumper]] instead. * * @author Qiang Xue * @since 2.0 */ -abstract class AbstractVarDumper +class BaseVarDumper { private static $_objects; private static $_output; diff --git a/framework/yii/helpers/Console.php b/framework/yii/helpers/Console.php index 9b0656e..a34dc96 100644 --- a/framework/yii/helpers/Console.php +++ b/framework/yii/helpers/Console.php @@ -14,6 +14,6 @@ namespace yii\helpers; * @author Carsten Brandt * @since 2.0 */ -class Console extends AbstractConsole +class Console extends BaseConsole { } diff --git a/framework/yii/helpers/FileHelper.php b/framework/yii/helpers/FileHelper.php index 919dc09..63954a4 100644 --- a/framework/yii/helpers/FileHelper.php +++ b/framework/yii/helpers/FileHelper.php @@ -16,6 +16,6 @@ namespace yii\helpers; * @author Alex Makarov * @since 2.0 */ -class FileHelper extends AbstractFileHelper +class FileHelper extends BaseFileHelper { } diff --git a/framework/yii/helpers/Html.php b/framework/yii/helpers/Html.php index 0715c6c..f4fbbba 100644 --- a/framework/yii/helpers/Html.php +++ b/framework/yii/helpers/Html.php @@ -13,6 +13,6 @@ namespace yii\helpers; * @author Qiang Xue * @since 2.0 */ -class Html extends AbstractHtml +class Html extends BaseHtml { } diff --git a/framework/yii/helpers/HtmlPurifier.php b/framework/yii/helpers/HtmlPurifier.php index ca7e485..e1511e4 100644 --- a/framework/yii/helpers/HtmlPurifier.php +++ b/framework/yii/helpers/HtmlPurifier.php @@ -32,6 +32,6 @@ namespace yii\helpers; * @author Alexander Makarov * @since 2.0 */ -class HtmlPurifier extends AbstractHtmlPurifier +class HtmlPurifier extends BaseHtmlPurifier { } diff --git a/framework/yii/helpers/Inflector.php b/framework/yii/helpers/Inflector.php index 71e7f05..ab4713e 100644 --- a/framework/yii/helpers/Inflector.php +++ b/framework/yii/helpers/Inflector.php @@ -13,6 +13,6 @@ namespace yii\helpers; * @author Antonio Ramirez * @since 2.0 */ -class Inflector extends AbstractInflector +class Inflector extends BaseInflector { } diff --git a/framework/yii/helpers/Json.php b/framework/yii/helpers/Json.php index 8544a61..8ca436a 100644 --- a/framework/yii/helpers/Json.php +++ b/framework/yii/helpers/Json.php @@ -14,6 +14,6 @@ namespace yii\helpers; * @author Qiang Xue * @since 2.0 */ -class Json extends AbstractJson +class Json extends BaseJson { } diff --git a/framework/yii/helpers/Markdown.php b/framework/yii/helpers/Markdown.php index 89f8801..3dcc750 100644 --- a/framework/yii/helpers/Markdown.php +++ b/framework/yii/helpers/Markdown.php @@ -30,6 +30,6 @@ namespace yii\helpers; * @author Alexander Makarov * @since 2.0 */ -class Markdown extends AbstractMarkdown +class Markdown extends BaseMarkdown { } diff --git a/framework/yii/helpers/Security.php b/framework/yii/helpers/Security.php index e2c0314..0e3ee38 100644 --- a/framework/yii/helpers/Security.php +++ b/framework/yii/helpers/Security.php @@ -24,6 +24,6 @@ namespace yii\helpers; * @author Tom Worster * @since 2.0 */ -class Security extends AbstractSecurity +class Security extends BaseSecurity { } diff --git a/framework/yii/helpers/StringHelper.php b/framework/yii/helpers/StringHelper.php index e367c59..5ecd390 100644 --- a/framework/yii/helpers/StringHelper.php +++ b/framework/yii/helpers/StringHelper.php @@ -14,6 +14,6 @@ namespace yii\helpers; * @author Alex Makarov * @since 2.0 */ -class StringHelper extends AbstractStringHelper +class StringHelper extends BaseStringHelper { } diff --git a/framework/yii/helpers/VarDumper.php b/framework/yii/helpers/VarDumper.php index 0aae16e..1ac5aa7 100644 --- a/framework/yii/helpers/VarDumper.php +++ b/framework/yii/helpers/VarDumper.php @@ -23,6 +23,6 @@ namespace yii\helpers; * @author Qiang Xue * @since 2.0 */ -class VarDumper extends AbstractVarDumper +class VarDumper extends BaseVarDumper { } diff --git a/framework/yii/log/Logger.php b/framework/yii/log/Logger.php index 76354d4..2046ecc 100644 --- a/framework/yii/log/Logger.php +++ b/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 [[AbstractYii]] class file. + * of [[BaseYii]] class file. * @return float the total elapsed time in seconds for current request. */ public function getElapsedTime()