Php Inspections (EA Extended): squash all PR-13813 commits

This commit is contained in:
Vladimir Reznichenko 2015-03-06 21:37:14 +01:00 committed by Fabien Potencier
parent 2f7bd7cf8c
commit 1530c355d5
2 changed files with 3 additions and 9 deletions

View File

@ -208,7 +208,7 @@ class QuestionHelperTest extends \PHPUnit_Framework_TestCase
protected function getInputStream($input)
{
$stream = fopen('php://memory', 'r+', false);
fputs($stream, $input);
fwrite($stream, $input);
rewind($stream);
return $stream;

View File

@ -670,14 +670,8 @@ class OptionsResolver implements Options, OptionsResolverInterface
}
foreach ((array) $optionNames as $option) {
unset($this->defined[$option]);
unset($this->defaults[$option]);
unset($this->required[$option]);
unset($this->resolved[$option]);
unset($this->lazy[$option]);
unset($this->normalizers[$option]);
unset($this->allowedTypes[$option]);
unset($this->allowedValues[$option]);
unset($this->defined[$option], $this->defaults[$option], $this->required[$option], $this->resolved[$option]);
unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option]);
}
return $this;