php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-11 19:20:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into di-support-instance-by-property-and-setters

Browse Source
This commit is contained in:
KoJIT2009
2017-12-13 16:14:18 +05:00
parent a34f93c972 edc8ec120d
commit aadbe89106
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guide/security-authorization.md
View File

@@ -225,6 +225,8 @@ return [
'components' => [ 'components' => [
'authManager' => [ 'authManager' => [
'class' => 'yii\rbac\DbManager', 'class' => 'yii\rbac\DbManager',
// uncomment if you want to cache RBAC items hierarchy
// 'cache' => 'cache',
], ],
// ... // ...
], ],

1
framework/CHANGELOG.md
View File

@@ -27,6 +27,7 @@ Yii Framework 2 Change Log
- Enh #15221: Added support for specifying `--camelCase` console options in `--kebab-case` (brandonkelly) - Enh #15221: Added support for specifying `--camelCase` console options in `--kebab-case` (brandonkelly)
- Enh #15221: Added support for the `--<option> <value>` console option syntax (brandonkelly) - Enh #15221: Added support for the `--<option> <value>` console option syntax (brandonkelly)
- Enh #15221: Improved the `help/list-action-options` console command output for command options without a description (brandonkelly) - Enh #15221: Improved the `help/list-action-options` console command output for command options without a description (brandonkelly)
- Enh #15332: Always check for availability of `openssl_pseudo_random_bytes`, even if LibreSSL is available (sammousa)
- Enh #15335: Added `FileHelper::unlink()` that works well under all OSes (samdark) - Enh #15335: Added `FileHelper::unlink()` that works well under all OSes (samdark)
- Enh #15347: Add support Instance for object property in dic (kojit2009) - Enh #15347: Add support Instance for object property in dic (kojit2009)

6
framework/base/Security.php
View File

@@ -478,12 +478,12 @@ class Security extends Component
// Since 5.4.0, openssl_random_pseudo_bytes() reads from CryptGenRandom on Windows instead // Since 5.4.0, openssl_random_pseudo_bytes() reads from CryptGenRandom on Windows instead
// of using OpenSSL library. LibreSSL is OK everywhere but don't use OpenSSL on non-Windows. // of using OpenSSL library. LibreSSL is OK everywhere but don't use OpenSSL on non-Windows.
if ($this->_useLibreSSL if (function_exists('openssl_random_pseudo_bytes')
&& ($this->_useLibreSSL
|| ( || (
DIRECTORY_SEPARATOR !== '/' DIRECTORY_SEPARATOR !== '/'
&& substr_compare(PHP_OS, 'win', 0, 3, true) === 0 && substr_compare(PHP_OS, 'win', 0, 3, true) === 0
&& function_exists('openssl_random_pseudo_bytes') ))
)
) { ) {
$key = openssl_random_pseudo_bytes($length, $cryptoStrong); $key = openssl_random_pseudo_bytes($length, $cryptoStrong);
if ($cryptoStrong === false) { if ($cryptoStrong === false) {