From 76cab3ea6449ef90bbfade7683b1c83aa2336a35 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 28 Sep 2013 02:01:06 +0400 Subject: [PATCH 1/4] Renamed base helper classes --- framework/yii/classes.php | 22 +++++++++---------- ...HelperBase.php => AbstractArrayHelper.php} | 6 ++--- .../{ConsoleBase.php => AbstractConsole.php} | 6 ++--- ...eHelperBase.php => AbstractFileHelper.php} | 6 ++--- .../{HtmlBase.php => AbstractHtml.php} | 6 ++--- ...ifierBase.php => AbstractHtmlPurifier.php} | 6 ++--- ...nflectorBase.php => AbstractInflector.php} | 6 ++--- .../{JsonBase.php => AbstractJson.php} | 6 ++--- ...{MarkdownBase.php => AbstractMarkdown.php} | 6 ++--- ...{SecurityBase.php => AbstractSecurity.php} | 6 ++--- ...elperBase.php => AbstractStringHelper.php} | 6 ++--- ...arDumperBase.php => AbstractVarDumper.php} | 6 ++--- framework/yii/helpers/ArrayHelper.php | 2 +- framework/yii/helpers/Console.php | 2 +- framework/yii/helpers/FileHelper.php | 2 +- framework/yii/helpers/Html.php | 2 +- framework/yii/helpers/HtmlPurifier.php | 2 +- framework/yii/helpers/Inflector.php | 2 +- framework/yii/helpers/Json.php | 2 +- framework/yii/helpers/Markdown.php | 2 +- framework/yii/helpers/Security.php | 2 +- framework/yii/helpers/StringHelper.php | 2 +- framework/yii/helpers/VarDumper.php | 2 +- 23 files changed, 55 insertions(+), 55 deletions(-) rename framework/yii/helpers/{ArrayHelperBase.php => AbstractArrayHelper.php} (98%) rename framework/yii/helpers/{ConsoleBase.php => AbstractConsole.php} (99%) rename framework/yii/helpers/{FileHelperBase.php => AbstractFileHelper.php} (98%) rename framework/yii/helpers/{HtmlBase.php => AbstractHtml.php} (99%) rename framework/yii/helpers/{HtmlPurifierBase.php => AbstractHtmlPurifier.php} (80%) rename framework/yii/helpers/{InflectorBase.php => AbstractInflector.php} (98%) rename framework/yii/helpers/{JsonBase.php => AbstractJson.php} (96%) rename framework/yii/helpers/{MarkdownBase.php => AbstractMarkdown.php} (82%) rename framework/yii/helpers/{SecurityBase.php => AbstractSecurity.php} (98%) rename framework/yii/helpers/{StringHelperBase.php => AbstractStringHelper.php} (96%) rename framework/yii/helpers/{VarDumperBase.php => AbstractVarDumper.php} (95%) diff --git a/framework/yii/classes.php b/framework/yii/classes.php index 40ca2251e0..22472d76c3 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\ArrayHelperBase' => YII_PATH . '/helpers/ArrayHelperBase.php', + 'yii\helpers\AbstractArrayHelper' => YII_PATH . '/helpers/AbstractArrayHelper.php', 'yii\helpers\Console' => YII_PATH . '/helpers/Console.php', - 'yii\helpers\ConsoleBase' => YII_PATH . '/helpers/ConsoleBase.php', + 'yii\helpers\AbstractConsole' => YII_PATH . '/helpers/AbstractConsole.php', 'yii\helpers\FileHelper' => YII_PATH . '/helpers/FileHelper.php', - 'yii\helpers\FileHelperBase' => YII_PATH . '/helpers/FileHelperBase.php', + 'yii\helpers\AbstractFileHelper' => YII_PATH . '/helpers/AbstractFileHelper.php', 'yii\helpers\Html' => YII_PATH . '/helpers/Html.php', - 'yii\helpers\HtmlBase' => YII_PATH . '/helpers/HtmlBase.php', + 'yii\helpers\AbstractHtml' => YII_PATH . '/helpers/AbstractHtml.php', 'yii\helpers\HtmlPurifier' => YII_PATH . '/helpers/HtmlPurifier.php', - 'yii\helpers\HtmlPurifierBase' => YII_PATH . '/helpers/HtmlPurifierBase.php', + 'yii\helpers\AbstractHtmlPurifier' => YII_PATH . '/helpers/AbstractHtmlPurifier.php', 'yii\helpers\Inflector' => YII_PATH . '/helpers/Inflector.php', - 'yii\helpers\InflectorBase' => YII_PATH . '/helpers/InflectorBase.php', + 'yii\helpers\AbstractInflector' => YII_PATH . '/helpers/AbstractInflector.php', 'yii\helpers\Json' => YII_PATH . '/helpers/Json.php', - 'yii\helpers\JsonBase' => YII_PATH . '/helpers/JsonBase.php', + 'yii\helpers\AbstractJson' => YII_PATH . '/helpers/AbstractJson.php', 'yii\helpers\Markdown' => YII_PATH . '/helpers/Markdown.php', - 'yii\helpers\MarkdownBase' => YII_PATH . '/helpers/MarkdownBase.php', + 'yii\helpers\AbstractMarkdown' => YII_PATH . '/helpers/AbstractMarkdown.php', 'yii\helpers\Security' => YII_PATH . '/helpers/Security.php', - 'yii\helpers\SecurityBase' => YII_PATH . '/helpers/SecurityBase.php', + 'yii\helpers\AbstractSecurity' => YII_PATH . '/helpers/AbstractSecurity.php', 'yii\helpers\StringHelper' => YII_PATH . '/helpers/StringHelper.php', - 'yii\helpers\StringHelperBase' => YII_PATH . '/helpers/StringHelperBase.php', + 'yii\helpers\AbstractStringHelper' => YII_PATH . '/helpers/AbstractStringHelper.php', 'yii\helpers\VarDumper' => YII_PATH . '/helpers/VarDumper.php', - 'yii\helpers\VarDumperBase' => YII_PATH . '/helpers/VarDumperBase.php', + 'yii\helpers\AbstractVarDumper' => YII_PATH . '/helpers/AbstractVarDumper.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/ArrayHelperBase.php b/framework/yii/helpers/AbstractArrayHelper.php similarity index 98% rename from framework/yii/helpers/ArrayHelperBase.php rename to framework/yii/helpers/AbstractArrayHelper.php index 59129de4d5..c26c1cdb8a 100644 --- a/framework/yii/helpers/ArrayHelperBase.php +++ b/framework/yii/helpers/AbstractArrayHelper.php @@ -12,14 +12,14 @@ use yii\base\Arrayable; use yii\base\InvalidParamException; /** - * ArrayHelperBase provides concrete implementation for [[ArrayHelper]]. + * AbstractArrayHelper provides concrete implementation for [[ArrayHelper]]. * - * Do not use ArrayHelperBase. Use [[ArrayHelper]] instead. + * Do not use AbstractArrayHelper. Use [[ArrayHelper]] instead. * * @author Qiang Xue * @since 2.0 */ -class ArrayHelperBase +abstract class AbstractArrayHelper { /** * Converts an object or an array of objects into an array. diff --git a/framework/yii/helpers/ConsoleBase.php b/framework/yii/helpers/AbstractConsole.php similarity index 99% rename from framework/yii/helpers/ConsoleBase.php rename to framework/yii/helpers/AbstractConsole.php index a985291cc5..8131aaea33 100644 --- a/framework/yii/helpers/ConsoleBase.php +++ b/framework/yii/helpers/AbstractConsole.php @@ -8,14 +8,14 @@ namespace yii\helpers; /** - * ConsoleBase provides concrete implementation for [[Console]]. + * AbstractConsole provides concrete implementation for [[Console]]. * - * Do not use ConsoleBase. Use [[Console]] instead. + * Do not use AbstractConsole. Use [[Console]] instead. * * @author Carsten Brandt * @since 2.0 */ -class ConsoleBase +abstract class AbstractConsole { const FG_BLACK = 30; const FG_RED = 31; diff --git a/framework/yii/helpers/FileHelperBase.php b/framework/yii/helpers/AbstractFileHelper.php similarity index 98% rename from framework/yii/helpers/FileHelperBase.php rename to framework/yii/helpers/AbstractFileHelper.php index 0e480da6c3..5eab9276c4 100644 --- a/framework/yii/helpers/FileHelperBase.php +++ b/framework/yii/helpers/AbstractFileHelper.php @@ -12,15 +12,15 @@ namespace yii\helpers; use Yii; /** - * FileHelperBase provides concrete implementation for [[FileHelper]]. + * AbstractFileHelper provides concrete implementation for [[FileHelper]]. * - * Do not use FileHelperBase. Use [[FileHelper]] instead. + * Do not use AbstractFileHelper. Use [[FileHelper]] instead. * * @author Qiang Xue * @author Alex Makarov * @since 2.0 */ -class FileHelperBase +abstract class AbstractFileHelper { /** * Normalizes a file/directory path. diff --git a/framework/yii/helpers/HtmlBase.php b/framework/yii/helpers/AbstractHtml.php similarity index 99% rename from framework/yii/helpers/HtmlBase.php rename to framework/yii/helpers/AbstractHtml.php index a5786cbfed..37e926cbc9 100644 --- a/framework/yii/helpers/HtmlBase.php +++ b/framework/yii/helpers/AbstractHtml.php @@ -13,14 +13,14 @@ use yii\web\Request; use yii\base\Model; /** - * HtmlBase provides concrete implementation for [[Html]]. + * AbstractHtml provides concrete implementation for [[Html]]. * - * Do not use HtmlBase. Use [[Html]] instead. + * Do not use AbstractHtml. Use [[Html]] instead. * * @author Qiang Xue * @since 2.0 */ -class HtmlBase +abstract class AbstractHtml { /** * @var array list of void elements (element name => 1) diff --git a/framework/yii/helpers/HtmlPurifierBase.php b/framework/yii/helpers/AbstractHtmlPurifier.php similarity index 80% rename from framework/yii/helpers/HtmlPurifierBase.php rename to framework/yii/helpers/AbstractHtmlPurifier.php index e89a589e0f..221fc376ca 100644 --- a/framework/yii/helpers/HtmlPurifierBase.php +++ b/framework/yii/helpers/AbstractHtmlPurifier.php @@ -7,14 +7,14 @@ namespace yii\helpers; /** - * HtmlPurifierBase provides concrete implementation for [[HtmlPurifier]]. + * AbstractHtmlPurifier provides concrete implementation for [[HtmlPurifier]]. * - * Do not use HtmlPurifierBase. Use [[HtmlPurifier]] instead. + * Do not use AbstractHtmlPurifier. Use [[HtmlPurifier]] instead. * * @author Alexander Makarov * @since 2.0 */ -class HtmlPurifierBase +abstract class AbstractHtmlPurifier { /** * Passes markup through HTMLPurifier making it safe to output to end user diff --git a/framework/yii/helpers/InflectorBase.php b/framework/yii/helpers/AbstractInflector.php similarity index 98% rename from framework/yii/helpers/InflectorBase.php rename to framework/yii/helpers/AbstractInflector.php index 87c1ff456f..27ee4f71e7 100644 --- a/framework/yii/helpers/InflectorBase.php +++ b/framework/yii/helpers/AbstractInflector.php @@ -10,14 +10,14 @@ namespace yii\helpers; use Yii; /** - * InflectorBase provides concrete implementation for [[Inflector]]. + * AbstractInflector provides concrete implementation for [[Inflector]]. * - * Do not use InflectorBase. Use [[Inflector]] instead. + * Do not use AbstractInflector. Use [[Inflector]] instead. * * @author Antonio Ramirez * @since 2.0 */ -class InflectorBase +abstract class AbstractInflector { /** * @var array the rules for converting a word into its plural form. diff --git a/framework/yii/helpers/JsonBase.php b/framework/yii/helpers/AbstractJson.php similarity index 96% rename from framework/yii/helpers/JsonBase.php rename to framework/yii/helpers/AbstractJson.php index fa3fb01073..cda71a0e91 100644 --- a/framework/yii/helpers/JsonBase.php +++ b/framework/yii/helpers/AbstractJson.php @@ -12,14 +12,14 @@ use yii\base\Arrayable; use yii\web\JsExpression; /** - * JsonBase provides concrete implementation for [[Json]]. + * AbstractJson provides concrete implementation for [[Json]]. * - * Do not use JsonBase. Use [[Json]] instead. + * Do not use AbstractJson. Use [[Json]] instead. * * @author Qiang Xue * @since 2.0 */ -class JsonBase +abstract class AbstractJson { /** * Encodes the given value into a JSON string. diff --git a/framework/yii/helpers/MarkdownBase.php b/framework/yii/helpers/AbstractMarkdown.php similarity index 82% rename from framework/yii/helpers/MarkdownBase.php rename to framework/yii/helpers/AbstractMarkdown.php index 9db5b1eb7b..6b76b4453e 100644 --- a/framework/yii/helpers/MarkdownBase.php +++ b/framework/yii/helpers/AbstractMarkdown.php @@ -10,14 +10,14 @@ namespace yii\helpers; use Michelf\MarkdownExtra; /** - * MarkdownBase provides concrete implementation for [[Markdown]]. + * AbstractMarkdown provides concrete implementation for [[Markdown]]. * - * Do not use MarkdownBase. Use [[Markdown]] instead. + * Do not use AbstractMarkdown. Use [[Markdown]] instead. * * @author Alexander Makarov * @since 2.0 */ -class MarkdownBase +abstract class AbstractMarkdown { /** * @var MarkdownExtra diff --git a/framework/yii/helpers/SecurityBase.php b/framework/yii/helpers/AbstractSecurity.php similarity index 98% rename from framework/yii/helpers/SecurityBase.php rename to framework/yii/helpers/AbstractSecurity.php index 5b192de2a4..d308b7fef1 100644 --- a/framework/yii/helpers/SecurityBase.php +++ b/framework/yii/helpers/AbstractSecurity.php @@ -13,15 +13,15 @@ use yii\base\InvalidConfigException; use yii\base\InvalidParamException; /** - * SecurityBase provides concrete implementation for [[Security]]. + * AbstractSecurity provides concrete implementation for [[Security]]. * - * Do not use SecurityBase. Use [[Security]] instead. + * Do not use AbstractSecurity. Use [[Security]] instead. * * @author Qiang Xue * @author Tom Worster * @since 2.0 */ -class SecurityBase +abstract class AbstractSecurity { /** * Encrypts data. diff --git a/framework/yii/helpers/StringHelperBase.php b/framework/yii/helpers/AbstractStringHelper.php similarity index 96% rename from framework/yii/helpers/StringHelperBase.php rename to framework/yii/helpers/AbstractStringHelper.php index cbb696ebf1..050481e192 100644 --- a/framework/yii/helpers/StringHelperBase.php +++ b/framework/yii/helpers/AbstractStringHelper.php @@ -10,15 +10,15 @@ namespace yii\helpers; use yii\base\InvalidParamException; /** - * StringHelperBase provides concrete implementation for [[StringHelper]]. + * AbstractStringHelper provides concrete implementation for [[StringHelper]]. * - * Do not use StringHelperBase. Use [[StringHelper]] instead. + * Do not use AbstractStringHelper. Use [[StringHelper]] instead. * * @author Qiang Xue * @author Alex Makarov * @since 2.0 */ -class StringHelperBase +abstract class AbstractStringHelper { /** * Returns the number of bytes in the given string. diff --git a/framework/yii/helpers/VarDumperBase.php b/framework/yii/helpers/AbstractVarDumper.php similarity index 95% rename from framework/yii/helpers/VarDumperBase.php rename to framework/yii/helpers/AbstractVarDumper.php index c7da208c7a..2c9f19410c 100644 --- a/framework/yii/helpers/VarDumperBase.php +++ b/framework/yii/helpers/AbstractVarDumper.php @@ -9,14 +9,14 @@ namespace yii\helpers; /** - * VarDumperBase provides concrete implementation for [[VarDumper]]. + * AbstractVarDumper provides concrete implementation for [[VarDumper]]. * - * Do not use VarDumperBase. Use [[VarDumper]] instead. + * Do not use AbstractVarDumper. Use [[VarDumper]] instead. * * @author Qiang Xue * @since 2.0 */ -class VarDumperBase +abstract class AbstractVarDumper { private static $_objects; private static $_output; diff --git a/framework/yii/helpers/ArrayHelper.php b/framework/yii/helpers/ArrayHelper.php index 085104bf2d..a63d3c2c44 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 ArrayHelperBase +class ArrayHelper extends AbstractArrayHelper { } diff --git a/framework/yii/helpers/Console.php b/framework/yii/helpers/Console.php index c0b7b32a74..9b0656ed59 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 ConsoleBase +class Console extends AbstractConsole { } diff --git a/framework/yii/helpers/FileHelper.php b/framework/yii/helpers/FileHelper.php index 9241025412..919dc092b4 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 FileHelperBase +class FileHelper extends AbstractFileHelper { } diff --git a/framework/yii/helpers/Html.php b/framework/yii/helpers/Html.php index 8e4f1c967b..0715c6cbab 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 HtmlBase +class Html extends AbstractHtml { } diff --git a/framework/yii/helpers/HtmlPurifier.php b/framework/yii/helpers/HtmlPurifier.php index f7203e4ab9..ca7e485987 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 HtmlPurifierBase +class HtmlPurifier extends AbstractHtmlPurifier { } diff --git a/framework/yii/helpers/Inflector.php b/framework/yii/helpers/Inflector.php index ba9c0695a4..71e7f05bf5 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 InflectorBase +class Inflector extends AbstractInflector { } diff --git a/framework/yii/helpers/Json.php b/framework/yii/helpers/Json.php index 424de1feaf..8544a6135f 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 JsonBase +class Json extends AbstractJson { } diff --git a/framework/yii/helpers/Markdown.php b/framework/yii/helpers/Markdown.php index 690df5d7f6..89f8801a74 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 MarkdownBase +class Markdown extends AbstractMarkdown { } diff --git a/framework/yii/helpers/Security.php b/framework/yii/helpers/Security.php index d0ca2ed3a7..e2c03140fd 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 SecurityBase +class Security extends AbstractSecurity { } diff --git a/framework/yii/helpers/StringHelper.php b/framework/yii/helpers/StringHelper.php index ef75790d63..e367c5909b 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 StringHelperBase +class StringHelper extends AbstractStringHelper { } diff --git a/framework/yii/helpers/VarDumper.php b/framework/yii/helpers/VarDumper.php index 50e543c166..0aae16ee10 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 VarDumperBase +class VarDumper extends AbstractVarDumper { } From b59812507acfac516b12dbc8364b67506406438f Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 27 Sep 2013 18:39:33 -0400 Subject: [PATCH 2/4] reverted doc change: the original one is correct. --- framework/yii/web/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/web/Response.php b/framework/yii/web/Response.php index b353e7caa9..e6505fd4f8 100644 --- a/framework/yii/web/Response.php +++ b/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: From 558f499439fe9adfd9416dfde8944181ae35c3aa Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 28 Sep 2013 02:48:54 +0400 Subject: [PATCH 3/4] Renamed YiiBase to AbstractYii --- build/build.xml | 2 +- build/controllers/ClassmapController.php | 2 +- build/controllers/PhpDocController.php | 2 +- docs/internals/autoloader.md | 2 +- framework/yii/{YiiBase.php => AbstractYii.php} | 8 ++++---- framework/yii/Yii.php | 6 +++--- framework/yii/log/Logger.php | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename framework/yii/{YiiBase.php => AbstractYii.php} (98%) diff --git a/build/build.xml b/build/build.xml index 9c18af0cae..85d5aa50aa 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 YiiBase.php + - sync : synchronize yiilite.php and AbstractYii.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 2a0483cf5b..10eb13441d 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', - 'YiiBase.php', + 'AbstractYii.php', '/debug/', '/console/', '/test/', diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php index 5aac7e53e7..4fed3b2421 100644 --- a/build/controllers/PhpDocController.php +++ b/build/controllers/PhpDocController.php @@ -56,7 +56,7 @@ class PhpDocController extends Controller }, 'only' => array('.php'), 'except' => array( - 'YiiBase.php', + 'AbstractYii.php', 'Yii.php', '/debug/views/', '/requirements/', diff --git a/docs/internals/autoloader.md b/docs/internals/autoloader.md index b7696d7d1c..067773dbc5 100644 --- a/docs/internals/autoloader.md +++ b/docs/internals/autoloader.md @@ -16,4 +16,4 @@ PEAR-style libraries References ---------- -- YiiBase::autoload \ No newline at end of file +- AbstractYii::autoload \ No newline at end of file diff --git a/framework/yii/YiiBase.php b/framework/yii/AbstractYii.php similarity index 98% rename from framework/yii/YiiBase.php rename to framework/yii/AbstractYii.php index f04903d619..c40aad9e6d 100644 --- a/framework/yii/YiiBase.php +++ b/framework/yii/AbstractYii.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. + * AbstractYii 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 AbstractYii directly. Instead, use its child class [[Yii]] where + * you can customize methods of AbstractYii. * * @author Qiang Xue * @since 2.0 */ -class YiiBase +abstract class AbstractYii { /** * @var array class map used by the Yii autoloading mechanism. diff --git a/framework/yii/Yii.php b/framework/yii/Yii.php index bde15ccd9d..040646390f 100644 --- a/framework/yii/Yii.php +++ b/framework/yii/Yii.php @@ -12,13 +12,13 @@ require(__DIR__ . '/YiiBase.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 [[AbstractYii]] which provides the actual implementation. + * By writing your own Yii class, you can customize some functionalities of [[AbstractYii]]. * * @author Qiang Xue * @since 2.0 */ -class Yii extends \yii\YiiBase +class Yii extends \yii\AbstractYii { } diff --git a/framework/yii/log/Logger.php b/framework/yii/log/Logger.php index 54f3a490f1..76354d4e30 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 [[YiiBase]] class file. + * of [[AbstractYii]] class file. * @return float the total elapsed time in seconds for current request. */ public function getElapsedTime() From b873f9f242b3b927fcc9fe9b34ab1ec5e48f69d0 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 28 Sep 2013 16:25:43 +0400 Subject: [PATCH 4/4] Fixes #915: helper classes renamed again --- build/build.xml | 2 +- build/controllers/ClassmapController.php | 2 +- build/controllers/PhpDocController.php | 2 +- docs/internals/autoloader.md | 2 +- .../yii/{AbstractYii.php => BaseYii.php} | 8 +++---- framework/yii/Yii.php | 8 +++---- framework/yii/classes.php | 22 +++++++++---------- framework/yii/helpers/ArrayHelper.php | 2 +- ...actArrayHelper.php => BaseArrayHelper.php} | 6 ++--- .../{AbstractConsole.php => BaseConsole.php} | 6 ++--- ...tractFileHelper.php => BaseFileHelper.php} | 6 ++--- .../{AbstractHtml.php => BaseHtml.php} | 6 ++--- ...tHtmlPurifier.php => BaseHtmlPurifier.php} | 6 ++--- ...bstractInflector.php => BaseInflector.php} | 6 ++--- .../{AbstractJson.php => BaseJson.php} | 6 ++--- ...{AbstractMarkdown.php => BaseMarkdown.php} | 6 ++--- ...{AbstractSecurity.php => BaseSecurity.php} | 6 ++--- ...tStringHelper.php => BaseStringHelper.php} | 6 ++--- ...bstractVarDumper.php => BaseVarDumper.php} | 6 ++--- framework/yii/helpers/Console.php | 2 +- framework/yii/helpers/FileHelper.php | 2 +- framework/yii/helpers/Html.php | 2 +- framework/yii/helpers/HtmlPurifier.php | 2 +- framework/yii/helpers/Inflector.php | 2 +- framework/yii/helpers/Json.php | 2 +- framework/yii/helpers/Markdown.php | 2 +- framework/yii/helpers/Security.php | 2 +- framework/yii/helpers/StringHelper.php | 2 +- framework/yii/helpers/VarDumper.php | 2 +- framework/yii/log/Logger.php | 2 +- 30 files changed, 68 insertions(+), 68 deletions(-) rename framework/yii/{AbstractYii.php => BaseYii.php} (98%) rename framework/yii/helpers/{AbstractArrayHelper.php => BaseArrayHelper.php} (98%) rename framework/yii/helpers/{AbstractConsole.php => BaseConsole.php} (99%) rename framework/yii/helpers/{AbstractFileHelper.php => BaseFileHelper.php} (98%) rename framework/yii/helpers/{AbstractHtml.php => BaseHtml.php} (99%) rename framework/yii/helpers/{AbstractHtmlPurifier.php => BaseHtmlPurifier.php} (80%) rename framework/yii/helpers/{AbstractInflector.php => BaseInflector.php} (98%) rename framework/yii/helpers/{AbstractJson.php => BaseJson.php} (96%) rename framework/yii/helpers/{AbstractMarkdown.php => BaseMarkdown.php} (82%) rename framework/yii/helpers/{AbstractSecurity.php => BaseSecurity.php} (98%) rename framework/yii/helpers/{AbstractStringHelper.php => BaseStringHelper.php} (96%) rename framework/yii/helpers/{AbstractVarDumper.php => BaseVarDumper.php} (95%) diff --git a/build/build.xml b/build/build.xml index 85d5aa50aa..b0975dcf15 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 10eb13441d..6a5ac8c56f 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 4fed3b2421..cb574ffdbd 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 067773dbc5..76a545bc9e 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 c40aad9e6d..b586160126 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 040646390f..232117fde0 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 22472d76c3..d4f304c1d4 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 a63d3c2c44..9d428f52e8 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 c26c1cdb8a..0ed584f3b3 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 8131aaea33..679628372e 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 5eab9276c4..2c911b0ee1 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 37e926cbc9..2baa679430 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 221fc376ca..17d21226bc 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 27ee4f71e7..affd3dd991 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 cda71a0e91..bd6ede51f7 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 6b76b4453e..40a1dc4571 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 d308b7fef1..3be07b4a2b 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 050481e192..e1622b9c53 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 2c9f19410c..f10912592b 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 9b0656ed59..a34dc96874 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 919dc092b4..63954a423c 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 0715c6cbab..f4fbbba84d 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 ca7e485987..e1511e4cc1 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 71e7f05bf5..ab4713ea57 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 8544a6135f..8ca436a32b 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 89f8801a74..3dcc750e9e 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 e2c03140fd..0e3ee3816f 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 e367c5909b..5ecd39080a 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 0aae16ee10..1ac5aa7afe 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 76354d4e30..2046ecc584 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()