8000 rename OptionResolveRoot to ResolveData · symfony/symfony@e351716 · GitHub
[go: up one dir, main page]
Skip to content

Commit e351716

Browse files
DoctrsDoctrs
committed
rename OptionResolveRoot to ResolveData
1 parent 4559269 commit e351716

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

‎src/Symfony/Component/OptionsResolver/OptionsResolver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,13 +1162,13 @@ private function rezolveParentAccess(array $data)
11621162
$reflClosure = new \ReflectionFunction($item);
11631163
$params = $reflClosure->getParameters();
11641164

1165-
// Call closure only if first argunet is OptionResovlerRoot
1165+
// Call closure only if first argunet is ResolveData
11661166
if (
11671167
isset($params[0])
11681168
&& null !== $params[0]->getClass()
1169-
&& OptionResovlerRoot::class === $params[0]->getClass()->name
1169+
&& ResolveData::class === $params[0]->getClass()->name
11701170
) {
1171-
$data[$key] = $item(new OptionResovlerRoot($this->resolvedData));
1171+
$data[$key] = $item(new ResolveData($this->resolvedData));
11721172
}
11731173
}
11741174
}

‎src/Symfony/Component/OptionsResolver/OptionResovlerRoot.php renamed to ‎src/Symfony/Component/OptionsResolver/ResolveData.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\OptionsResolver;
1313

14-
use Doctrine\Common\Collections\ArrayCollection;
15-
16-
class OptionResovlerRoot extends ArrayCollection
14+
class ResolveData extends \ArrayObject
1715
{
1816
}

‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverNestedTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
1717
use Symfony\Component\OptionsResolver\OptionResolverNested;
18-
use Symfony\Component\OptionsResolver\OptionResovlerRoot;
18+
use Symfony\Component\OptionsResolver\ResolveData;
1919
use Symfony\Component\OptionsResolver\Options;
2020
use Symfony\Component\OptionsResolver\OptionsResolver;
2121

@@ -2211,7 +2211,7 @@ public function testParentAccess()
22112211
$this->resolver->setDefault('foo', new OptionResolverNested(array(
22122212
'default1' => 1,
22132213
'default2' => new OptionResolverNested(array(
2214-
'any' => function (OptionResovlerRoot $option) {
2214+
'any' => function (ResolveData $option) {
22152215
return $option['foo']['default1'];
22162216
},
22172217
)),
@@ -2230,7 +2230,7 @@ public function testParentAccessNormalize()
22302230
$this->resolver->setDefault('foo', new OptionResolverNested(array(
22312231
'default1' => 1,
22322232
'default2' => new OptionResolverNested(array(
2233-
'any' => function (OptionResovlerRoot $option) {
2233+
'any' => function (ResolveData $option) {
22342234
return $option['foo']['default1'];
22352235
},
22362236
)),
@@ -2256,7 +2256,7 @@ public function testParentAndChildrenAccessNormalize()
22562256
},
22572257
'default2' => new OptionResolverNested(array(
22582258
'bar' => 'baz',
2259-
'any' => function (OptionResovlerRoot $option) {
2259+
'any' => function (ResolveData $option) {
22602260
return $option['foo']['default2']['bar'];
22612261
},
22622262
)),

0 commit comments

Comments
 (0)
0