forked from yiisoft/yii2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
30 changed files
with
124 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,12 +8,12 @@ | |
| namespace yii\helpers; | ||
|
|
||
| /** | ||
| * ArrayHelper provides additional array functionality you can use in your | ||
| * ArrayHelper provides additional array functionality that you can use in your | ||
| * application. | ||
| * | ||
| * @author Qiang Xue <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class ArrayHelper extends base\ArrayHelper | ||
| class ArrayHelper extends ArrayHelperBase | ||
| { | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,20 +5,21 @@ | |
| * @license http://www.yiiframework.com/license/ | ||
| */ | ||
|
|
||
| namespace yii\helpers\base; | ||
| namespace yii\helpers; | ||
|
|
||
| use Yii; | ||
| use yii\base\Arrayable; | ||
| use yii\base\InvalidParamException; | ||
|
|
||
| /** | ||
| * ArrayHelper provides additional array functionality you can use in your | ||
| * application. | ||
| * ArrayHelperBase provides concrete implementation for [[ArrayHelper]]. | ||
| * | ||
| * Do not use ArrayHelperBase. Use [[ArrayHelper]] instead. | ||
| * | ||
| * @author Qiang Xue <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class ArrayHelper | ||
| class ArrayHelperBase | ||
| { | ||
| /** | ||
| * Converts an object or an array of objects into an array. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,6 @@ | |
| * @author Carsten Brandt <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class Console extends base\Console | ||
| class Console extends ConsoleBase | ||
| { | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,27 +5,17 @@ | |
| * @license http://www.yiiframework.com/license/ | ||
| */ | ||
|
|
||
| namespace yii\helpers\base; | ||
| namespace yii\helpers; | ||
|
|
||
| /** | ||
| * TODO adjust phpdoc | ||
| * TODO test this on all kinds of terminals, especially windows (check out lib ncurses) | ||
| * | ||
| * Console View is the base class for console view components | ||
| * | ||
| * A console view provides functionality to create rich console application by allowing to format output | ||
| * by adding color and font style to it. | ||
| * | ||
| * The following constants are available for formatting: | ||
| * | ||
| * TODO document constants | ||
| * | ||
| * ConsoleBase provides concrete implementation for [[Console]]. | ||
| * | ||
| * Do not use ConsoleBase. Use [[Console]] instead. | ||
| * | ||
| * @author Carsten Brandt <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class Console | ||
| class ConsoleBase | ||
| { | ||
| const FG_BLACK = 30; | ||
| const FG_RED = 31; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,6 @@ | |
| * @author Alex Makarov <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class FileHelper extends base\FileHelper | ||
| class FileHelper extends FileHelperBase | ||
| { | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,19 +7,20 @@ | |
| * @license http://www.yiiframework.com/license/ | ||
| */ | ||
|
|
||
| namespace yii\helpers\base; | ||
| namespace yii\helpers; | ||
|
|
||
| use Yii; | ||
| use yii\helpers\StringHelper as StringHelper2; | ||
|
|
||
| /** | ||
| * Filesystem helper | ||
| * FileHelperBase provides concrete implementation for [[FileHelper]]. | ||
| * | ||
| * Do not use FileHelperBase. Use [[FileHelper]] instead. | ||
| * | ||
| * @author Qiang Xue <[email protected]> | ||
| * @author Alex Makarov <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class FileHelper | ||
| class FileHelperBase | ||
| { | ||
| /** | ||
| * Normalizes a file/directory path. | ||
|
|
@@ -279,19 +280,19 @@ public static function filterPath($path, $options) | |
| if ($isDir = is_dir($path)) { | ||
| $path .= '/'; | ||
| } | ||
| $n = StringHelper2::strlen($path); | ||
| $n = StringHelper::strlen($path); | ||
|
|
||
| if (!empty($options['except'])) { | ||
| foreach ($options['except'] as $name) { | ||
| if (StringHelper2::substr($path, -StringHelper2::strlen($name), $n) === $name) { | ||
| if (StringHelper::substr($path, -StringHelper::strlen($name), $n) === $name) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!$isDir && !empty($options['only'])) { | ||
| foreach ($options['only'] as $name) { | ||
| if (StringHelper2::substr($path, -StringHelper2::strlen($name), $n) === $name) { | ||
| if (StringHelper::substr($path, -StringHelper::strlen($name), $n) === $name) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,6 @@ | |
| * @author Qiang Xue <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class Html extends base\Html | ||
| class Html extends HtmlBase | ||
| { | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,20 +5,22 @@ | |
| * @license http://www.yiiframework.com/license/ | ||
| */ | ||
|
|
||
| namespace yii\helpers\base; | ||
| namespace yii\helpers; | ||
|
|
||
| use Yii; | ||
| use yii\base\InvalidParamException; | ||
| use yii\web\Request; | ||
| use yii\base\Model; | ||
|
|
||
| /** | ||
| * Html provides a set of static methods for generating commonly used HTML tags. | ||
| * HtmlBase provides concrete implementation for [[Html]]. | ||
| * | ||
| * Do not use HtmlBase. Use [[Html]] instead. | ||
| * | ||
| * @author Qiang Xue <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class Html | ||
| class HtmlBase | ||
| { | ||
| /** | ||
| * @var array list of void elements (element name => 1) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,6 @@ | |
| * @author Alexander Makarov <[email protected]> | ||
| * @since 2.0 | ||
| */ | ||
| class HtmlPurifier extends base\HtmlPurifier | ||
| class HtmlPurifier extends HtmlPurifierBase | ||
| { | ||
| } | ||
Oops, something went wrong.