diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed explicitly ignores a depreciation

Browse Source
This commit is contained in:
Yonel Ceruto 2018-10-24 08:06:04 -04:00
parent 8c24c35fe8
commit 8398947c9c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/OptionsResolver/OptionsResolver.php
View File

@ -801,7 +801,7 @@ class OptionsResolver implements Options
// Shortcut for resolved options
if (array_key_exists($option, $this->resolved)) {
if ($triggerDeprecation && isset($this->deprecated[$option]) && \is_string($this->deprecated[$option])) {
if ($triggerDeprecation && isset($this->deprecated[$option]) && (isset($this->given[$option]) || $this->calling) && \is_string($this->deprecated[$option])) {
@trigger_error(strtr($this->deprecated[$option], array('%name%' => $option)), E_USER_DEPRECATED);
}

3
src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
View File

@ -754,6 +754,9 @@ class OptionsResolverTest extends TestCase
yield 'It explicitly ignores a depreciation' => array(
function (OptionsResolver $resolver) {
$resolver
->setDefault('baz', function (Options $options) {
return $options->offsetGet('foo', false);
})
->setDefault('foo', null)
->setDeprecated('foo')
->setDefault('bar', function (Options $options) {