diff --git a/framework/yii/classes.php b/framework/yii/classes.php index 40ca225..22472d7 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 59129de..c26c1cd 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 a985291..8131aae 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 0e480da..5eab927 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 a5786cb..37e926c 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 e89a589..221fc37 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 87c1ff4..27ee4f7 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 fa3fb01..cda71a0 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 9db5b1e..6b76b44 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 5b192de..d308b7f 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 cbb696e..050481e 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 c7da208..2c9f194 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 085104b..a63d3c2 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 c0b7b32..9b0656e 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 9241025..919dc09 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 8e4f1c9..0715c6c 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 f7203e4..ca7e485 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 ba9c069..71e7f05 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 424de1f..8544a61 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 690df5d..89f8801 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 d0ca2ed..e2c0314 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 ef75790..e367c59 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 50e543c..0aae16e 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 { }