Skip to content

Commit 9b5f6cb

Browse files
committed
prepare for 2.0.7 release
- adjust version - build classmap - build phpdoc @Property annotations - build mime-type file
1 parent a1846cd commit 9b5f6cb

File tree

10 files changed

+25
-9
lines changed

10 files changed

+25
-9
lines changed

build/controllers/PhpDocController.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ protected function findFiles($root)
133133
'/extensions/composer/',
134134
'/extensions/gii/components/DiffRendererHtmlInline.php',
135135
'/extensions/gii/generators/extension/default/*',
136+
'/extensions/twig/Extension.php',
137+
'/extensions/twig/Optimizer.php',
138+
'/extensions/twig/Template.php',
136139
'/extensions/twig/TwigSimpleFileLoader.php',
140+
'/extensions/twig/ViewRendererStaticClassProxy.php',
137141
'/framework/BaseYii.php',
138142
'/framework/Yii.php',
139143
'assets/',

build/controllers/ReleaseController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ protected function resortChangelog($changelog)
135135

136136
$i = 0;
137137
ArrayHelper::multisort($changelog, function($line) use (&$i) {
138-
if (preg_match('/^- (Chg|Enh|Bug)( #\d+(, #\d+)*)?: .+$/', $line, $m)) {
139-
$o = ['Bug' => 'C', 'Enh' => 'D', 'Chg' => 'E'];
138+
if (preg_match('/^- (Chg|Enh|Bug|New)( #\d+(, #\d+)*)?: .+$/', $line, $m)) {
139+
$o = ['Bug' => 'C', 'Enh' => 'D', 'Chg' => 'E', 'New' => 'F'];
140140
return $o[$m[1]] . ' ' . (!empty($m[2]) ? $m[2] : 'AAAA' . $i++);
141141
}
142142
return 'B' . $i++;

framework/BaseYii.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class BaseYii
9393
*/
9494
public static function getVersion()
9595
{
96-
return '2.0.7-dev';
96+
return '2.0.7';
9797
}
9898

9999
/**

framework/CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Yii Framework 2 Change Log
22
==========================
33

4-
2.0.7 under development
4+
2.0.7 February 14, 2016
55
-----------------------
66

77
- Bug #6351: Find MySQL FK constraints from `information_schema` tables instead of `SHOW CREATE TABLE` to improve reliability (nineinchnick)
@@ -121,12 +121,12 @@ Yii Framework 2 Change Log
121121
- Enh #10797: Cleaned up requirements checker CSS (muhammadcahya)
122122
- Enh: Added last resort measure for `FileHelper::removeDirectory()` fail to unlink symlinks under Windows (samdark)
123123
- Enh: `AttributeBehavior::getValue()` now respects the callable in array format (silverfire)
124+
- Chg #6419: Added `yii\web\ErrorHandler::displayVars` make list of displayed vars customizable. `$_ENV` and `$_SERVER` are not displayed by default anymore (silverfire)
124125
- Chg #9369: `Yii::$app->user->can()` now returns `false` instead of erroring in case `authManager` component is not configured (creocoder)
125126
- Chg #9411: `DetailView` now automatically sets container tag ID in case it's not specified (samdark)
126-
- Chg #9953: `TimestampBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)
127-
- Chg #6419: Added `yii\web\ErrorHandler::displayVars` make list of displayed vars customizable. `$_ENV` and `$_SERVER` are not displayed by default anymore (silverfire)
128127
- Chg #9528: Traversable objects are now formatted as arrays in `yii\web\XmlResponseFormatter` to support SPL objects and Generators (MaXL-ru)
129-
- Chg #9878,9879,9880: Make `\base\Security` use `random_bytes()`, LibreSSL, mcrypt, limit OpenSSL to Windows, and to prefer `password_hash()` over `crypt()` (tom--)
128+
- Chg #9878, #9879, #9880: Make `\base\Security` use `random_bytes()`, LibreSSL, mcrypt, limit OpenSSL to Windows, and to prefer `password_hash()` over `crypt()` (tom--)
129+
- Chg #9953: `TimestampBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)
130130
- Chg #10296: Methods mset, mget and madd of `\yii\caching\Cache` have been marked as deprecated (trejder, githubjeka)
131131
- Chg: ApcCache is now able to handle PHP 7 APCu (samdark)
132132
- Chg: `BlameableBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)

framework/base/Theme.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* @property string $basePath The root path of this theme. All resources of this theme are located under this
6565
* directory.
6666
* @property string $baseUrl The base URL (without ending slash) for this theme. All resources of this theme
67-
* are considered to be under this base URL. This property is read-only.
67+
* are considered to be under this base URL.
6868
*
6969
* @author Qiang Xue <[email protected]>
7070
* @since 2.0

framework/classes.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
'yii\db\Transaction' => YII2_PATH . '/db/Transaction.php',
116116
'yii\db\cubrid\QueryBuilder' => YII2_PATH . '/db/cubrid/QueryBuilder.php',
117117
'yii\db\cubrid\Schema' => YII2_PATH . '/db/cubrid/Schema.php',
118+
'yii\db\mssql\ColumnSchemaBuilder' => YII2_PATH . '/db/mssql/ColumnSchemaBuilder.php',
118119
'yii\db\mssql\PDO' => YII2_PATH . '/db/mssql/PDO.php',
119120
'yii\db\mssql\QueryBuilder' => YII2_PATH . '/db/mssql/QueryBuilder.php',
120121
'yii\db\mssql\Schema' => YII2_PATH . '/db/mssql/Schema.php',
@@ -125,6 +126,7 @@
125126
'yii\db\oci\ColumnSchemaBuilder' => YII2_PATH . '/db/oci/ColumnSchemaBuilder.php',
126127
'yii\db\oci\QueryBuilder' => YII2_PATH . '/db/oci/QueryBuilder.php',
127128
'yii\db\oci\Schema' => YII2_PATH . '/db/oci/Schema.php',
129+
'yii\db\pgsql\ColumnSchemaBuilder' => YII2_PATH . '/db/pgsql/ColumnSchemaBuilder.php',
128130
'yii\db\pgsql\QueryBuilder' => YII2_PATH . '/db/pgsql/QueryBuilder.php',
129131
'yii\db\pgsql\Schema' => YII2_PATH . '/db/pgsql/Schema.php',
130132
'yii\db\sqlite\QueryBuilder' => YII2_PATH . '/db/sqlite/QueryBuilder.php',
@@ -243,6 +245,7 @@
243245
'yii\validators\FilterValidator' => YII2_PATH . '/validators/FilterValidator.php',
244246
'yii\validators\ImageValidator' => YII2_PATH . '/validators/ImageValidator.php',
245247
'yii\validators\InlineValidator' => YII2_PATH . '/validators/InlineValidator.php',
248+
'yii\validators\IpValidator' => YII2_PATH . '/validators/IpValidator.php',
246249
'yii\validators\NumberValidator' => YII2_PATH . '/validators/NumberValidator.php',
247250
'yii\validators\PunycodeAsset' => YII2_PATH . '/validators/PunycodeAsset.php',
248251
'yii\validators\RangeValidator' => YII2_PATH . '/validators/RangeValidator.php',
@@ -295,6 +298,7 @@
295298
'yii\web\SessionIterator' => YII2_PATH . '/web/SessionIterator.php',
296299
'yii\web\TooManyRequestsHttpException' => YII2_PATH . '/web/TooManyRequestsHttpException.php',
297300
'yii\web\UnauthorizedHttpException' => YII2_PATH . '/web/UnauthorizedHttpException.php',
301+
'yii\web\UnprocessableEntityHttpException' => YII2_PATH . '/web/UnprocessableEntityHttpException.php',
298302
'yii\web\UnsupportedMediaTypeHttpException' => YII2_PATH . '/web/UnsupportedMediaTypeHttpException.php',
299303
'yii\web\UploadedFile' => YII2_PATH . '/web/UploadedFile.php',
300304
'yii\web\UrlManager' => YII2_PATH . '/web/UrlManager.php',

framework/console/Controller.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
*
3030
* @property string $help This property is read-only.
3131
* @property string $helpSummary This property is read-only.
32+
* @property array $passedOptionValues The properties corresponding to the passed options. This property is
33+
* read-only.
34+
* @property array $passedOptions The names of the options passed during execution. This property is
35+
* read-only.
3236
*
3337
* @author Qiang Xue <[email protected]>
3438
* @since 2.0

framework/helpers/mimeTypes.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@
414414
'm3a' => 'audio/mpeg',
415415
'm3u' => 'audio/x-mpegurl',
416416
'm3u8' => 'application/vnd.apple.mpegurl',
417+
'm4a' => 'audio/mp4',
417418
'm4u' => 'video/vnd.mpegurl',
418419
'm4v' => 'video/x-m4v',
419420
'ma' => 'application/mathematica',

framework/validators/IpValidator.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
* ['ip_address', 'ip', 'expandIPv6' => true], // expands IPv6 address to a full notation format
3333
* ```
3434
*
35+
* @property array $ranges The IPv4 or IPv6 ranges that are allowed or forbidden. See [[setRanges()]] for
36+
* detailed description.
37+
*
3538
* @author Dmitry Naumenko <[email protected]>
3639
* @since 2.0.7
3740
*/

framework/web/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* @property array $queryParams The request GET parameter values.
6565
* @property string $queryString Part of the request URL that is after the question mark. This property is
6666
* read-only.
67-
* @property string $rawBody The request body. This property is read-only.
67+
* @property string $rawBody The request body.
6868
* @property string $referrer URL referrer, null if not present. This property is read-only.
6969
* @property string $scriptFile The entry script file path.
7070
* @property string $scriptUrl The relative URL of the entry script.

0 commit comments

Comments
 (0)