From 6578cfbdab6b03411c8134420eb6ae66f8b78e86 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Wed, 25 Jun 2014 18:23:41 +0200 Subject: [PATCH] updated phpdoc and classmap --- build/controllers/PhpDocController.php | 1 + .../apidoc/helpers/ApiMarkdownTrait.php | 2 +- .../apidoc/helpers/IndexFileAnalyzer.php | 2 +- extensions/authclient/clients/VKontakte.php | 2 +- extensions/elasticsearch/ActiveRecord.php | 4 ++-- framework/classes.php | 3 +++ framework/db/MigrationInterface.php | 2 +- framework/db/Schema.php | 4 ++++ framework/db/Transaction.php | 4 ++++ framework/db/sqlite/Schema.php | 3 +++ framework/helpers/BaseConsole.php | 2 -- framework/mutex/Mutex.php | Bin 3491 -> 3489 bytes framework/web/Request.php | 1 + framework/widgets/MaskedInput.php | 2 +- framework/widgets/MaskedInputAsset.php | 2 +- 15 files changed, 24 insertions(+), 10 deletions(-) diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php index e345f1c2e6..dca2156b61 100644 --- a/build/controllers/PhpDocController.php +++ b/build/controllers/PhpDocController.php @@ -126,6 +126,7 @@ class PhpDocController extends Controller '/docs/', '/extensions/apidoc/helpers/PrettyPrinter.php', '/extensions/apidoc/helpers/ApiIndexer.php', + '/extensions/apidoc/helpers/ApiMarkdownLaTeX.php', '/extensions/codeception/TestCase.php', '/extensions/codeception/DbTestCase.php', '/extensions/composer/', diff --git a/extensions/apidoc/helpers/ApiMarkdownTrait.php b/extensions/apidoc/helpers/ApiMarkdownTrait.php index c3cc48c0f0..78837805fc 100644 --- a/extensions/apidoc/helpers/ApiMarkdownTrait.php +++ b/extensions/apidoc/helpers/ApiMarkdownTrait.php @@ -107,4 +107,4 @@ trait ApiMarkdownTrait return ['[[', 2]; } -} \ No newline at end of file +} diff --git a/extensions/apidoc/helpers/IndexFileAnalyzer.php b/extensions/apidoc/helpers/IndexFileAnalyzer.php index 06753415e8..1093813d87 100644 --- a/extensions/apidoc/helpers/IndexFileAnalyzer.php +++ b/extensions/apidoc/helpers/IndexFileAnalyzer.php @@ -63,4 +63,4 @@ class IndexFileAnalyzer extends Markdown } return parent::renderList($block); } -} \ No newline at end of file +} diff --git a/extensions/authclient/clients/VKontakte.php b/extensions/authclient/clients/VKontakte.php index 515362864e..d5589c9889 100644 --- a/extensions/authclient/clients/VKontakte.php +++ b/extensions/authclient/clients/VKontakte.php @@ -101,4 +101,4 @@ class VKontakte extends OAuth2 { return 'VKontakte'; } -} \ No newline at end of file +} diff --git a/extensions/elasticsearch/ActiveRecord.php b/extensions/elasticsearch/ActiveRecord.php index b4b7abd5b5..7caa0864af 100644 --- a/extensions/elasticsearch/ActiveRecord.php +++ b/extensions/elasticsearch/ActiveRecord.php @@ -40,9 +40,9 @@ use yii\helpers\StringHelper; * * You may override [[index()]] and [[type()]] to define the index and type this record represents. * - * @property float $score Returns the score of this record when it was retrieved via a [[find()]] query. This + * @property array|null $highlight A list of arrays with highlighted excerpts indexed by field names. This * property is read-only. - * @property array $highlight Returns a list of arrays with highlighted excerpts indexed by field names. This + * @property float $score Returns the score of this record when it was retrieved via a [[find()]] query. This * property is read-only. * * @author Carsten Brandt diff --git a/framework/classes.php b/framework/classes.php index b0da35cf56..d604b2fe55 100644 --- a/framework/classes.php +++ b/framework/classes.php @@ -54,6 +54,7 @@ return [ 'yii\base\Widget' => YII_PATH . '/base/Widget.php', 'yii\behaviors\AttributeBehavior' => YII_PATH . '/behaviors/AttributeBehavior.php', 'yii\behaviors\BlameableBehavior' => YII_PATH . '/behaviors/BlameableBehavior.php', + 'yii\behaviors\SluggableBehavior' => YII_PATH . '/behaviors/SluggableBehavior.php', 'yii\behaviors\TimestampBehavior' => YII_PATH . '/behaviors/TimestampBehavior.php', 'yii\caching\ApcCache' => YII_PATH . '/caching/ApcCache.php', 'yii\caching\Cache' => YII_PATH . '/caching/Cache.php', @@ -96,7 +97,9 @@ return [ 'yii\db\DataReader' => YII_PATH . '/db/DataReader.php', 'yii\db\Exception' => YII_PATH . '/db/Exception.php', 'yii\db\Expression' => YII_PATH . '/db/Expression.php', + 'yii\db\IntegrityException' => YII_PATH . '/db/IntegrityException.php', 'yii\db\Migration' => YII_PATH . '/db/Migration.php', + 'yii\db\MigrationInterface' => YII_PATH . '/db/MigrationInterface.php', 'yii\db\Query' => YII_PATH . '/db/Query.php', 'yii\db\QueryBuilder' => YII_PATH . '/db/QueryBuilder.php', 'yii\db\QueryInterface' => YII_PATH . '/db/QueryInterface.php', diff --git a/framework/db/MigrationInterface.php b/framework/db/MigrationInterface.php index 7f69c6499f..8f9d157369 100644 --- a/framework/db/MigrationInterface.php +++ b/framework/db/MigrationInterface.php @@ -32,4 +32,4 @@ interface MigrationInterface * and should not proceed further. All other return values mean the migration succeeds. */ public function down(); -} \ No newline at end of file +} diff --git a/framework/db/Schema.php b/framework/db/Schema.php index a2c7bfda94..d03f049467 100644 --- a/framework/db/Schema.php +++ b/framework/db/Schema.php @@ -25,6 +25,10 @@ use yii\caching\GroupDependency; * @property string[] $tableNames All table names in the database. This property is read-only. * @property TableSchema[] $tableSchemas The metadata for all tables in the database. Each array element is an * instance of [[TableSchema]] or its child class. This property is read-only. + * @property string $transactionIsolationLevel The transaction isolation level to use for this transaction. + * This can be one of [[Transaction::READ_UNCOMMITTED]], [[Transaction::READ_COMMITTED]], + * [[Transaction::REPEATABLE_READ]] and [[Transaction::SERIALIZABLE]] but also a string containing DBMS specific + * syntax to be used after `SET TRANSACTION ISOLATION LEVEL`. This property is write-only. * * @author Qiang Xue * @since 2.0 diff --git a/framework/db/Transaction.php b/framework/db/Transaction.php index 33853d7fd1..3082a071c4 100644 --- a/framework/db/Transaction.php +++ b/framework/db/Transaction.php @@ -32,6 +32,10 @@ use yii\base\InvalidConfigException; * * @property boolean $isActive Whether this transaction is active. Only an active transaction can [[commit()]] * or [[rollBack()]]. This property is read-only. + * @property string $isolationLevel The transaction isolation level to use for this transaction. This can be + * one of [[READ_UNCOMMITTED]], [[READ_COMMITTED]], [[REPEATABLE_READ]] and [[SERIALIZABLE]] but also a string + * containing DBMS specific syntax to be used after `SET TRANSACTION ISOLATION LEVEL`. This property is + * write-only. * * @author Qiang Xue * @since 2.0 diff --git a/framework/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php index e2f2f33663..13e9307cb5 100644 --- a/framework/db/sqlite/Schema.php +++ b/framework/db/sqlite/Schema.php @@ -16,6 +16,9 @@ use yii\db\Transaction; /** * Schema is the class for retrieving metadata from a SQLite (2/3) database. * + * @property string $transactionIsolationLevel The transaction isolation level to use for this transaction. + * This can be either [[Transaction::READ_UNCOMMITTED]] or [[Transaction::SERIALIZABLE]]. + * * @author Qiang Xue * @since 2.0 */ diff --git a/framework/helpers/BaseConsole.php b/framework/helpers/BaseConsole.php index 2ac9f67476..d0a839454b 100644 --- a/framework/helpers/BaseConsole.php +++ b/framework/helpers/BaseConsole.php @@ -380,8 +380,6 @@ class BaseConsole self::CROSSED_OUT => ['text-decoration' => ['line-through']], self::BLINK => ['text-decoration' => ['blink']], self::CONCEALED => ['visibility' => 'hidden'], -// self::ENCIRCLED: -// self::FRAMED: ] + $styleMap; $tags = 0; diff --git a/framework/mutex/Mutex.php b/framework/mutex/Mutex.php index 871d5daa26f5869cc9542d32eb0b8d39fb486e44..25e7fcd4e0beb44d75a99f320f614b71af5679ac 100644 GIT binary patch delta 12 TcmZ21y-<3C6w_uIrgm-s8)gHl delta 15 WcmZ1|y;ypK6cdvI!)7U_c5VP89|Ot& diff --git a/framework/web/Request.php b/framework/web/Request.php index e521415db2..551827e000 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -42,6 +42,7 @@ use yii\helpers\StringHelper; * @property string $csrfToken The token used to perform CSRF validation. This property is read-only. * @property string $csrfTokenFromHeader The CSRF token sent via [[CSRF_HEADER]] by browser. Null is returned * if no such header is sent. This property is read-only. + * @property array $eTags The entity tags. This property is read-only. * @property HeaderCollection $headers The header collection. This property is read-only. * @property string $hostInfo Schema and hostname part (with port number if needed) of the request URL (e.g. * `http://www.yiiframework.com`). diff --git a/framework/widgets/MaskedInput.php b/framework/widgets/MaskedInput.php index d791c5d395..f920ba3382 100644 --- a/framework/widgets/MaskedInput.php +++ b/framework/widgets/MaskedInput.php @@ -50,7 +50,7 @@ class MaskedInput extends InputWidget * - `9`: represents a numeric character (0-9) * - `*`: represents an alphanumeric character (A-Z, a-z, 0-9) * - `[` and `]`: anything entered between the square brackets is considered optional user input. This is - * based on the `optionalmarker` setting in [[clientOptions]]. + * based on the `optionalmarker` setting in [[clientOptions]]. * * Additional definitions can be set through the [[definitions]] property. */ diff --git a/framework/widgets/MaskedInputAsset.php b/framework/widgets/MaskedInputAsset.php index 6b20d5a9af..fea33d053b 100644 --- a/framework/widgets/MaskedInputAsset.php +++ b/framework/widgets/MaskedInputAsset.php @@ -13,7 +13,7 @@ use yii\web\AssetBundle; * The asset bundle for the [[MaskedInput]] widget. * * Includes client assets of [jQuery input mask plugin](https://github.com/RobinHerbots/jquery.inputmask). - * + * * @author Kartik Visweswaran * @since 2.0 */