symfony
diff --git a/‎src/Symfony/Component/OptionsResolver/NestedOptions.php
Copy file name to clipboard
+98Lines changed: 98 additions & 0 deletions b/‎src/Symfony/Component/OptionsResolver/NestedOptions.php
Copy file name to clipboard
+98Lines changed: 98 additions & 0 deletions
diff --git a/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+20-7Lines changed: 20 additions & 7 deletions b/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+20-7Lines changed: 20 additions & 7 deletions
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\OptionsResolver;
+
+use Symfony\Component\OptionsResolver\Exception\AccessException;
+
+/**
+ * Validates nested options and merges them with default values.
+ *
+ * This class is used internally by the OptionsResolver.
+ * See {@link OptionsResolver::setNested()}.
+ *
+ * @author Jules Pietri <jules@heahprod.com>
+ *
+ * @internal
+ */
+class NestedOptions extends OptionsResolver
+{
+    /**
+     * The root options instance.
+     *
+     * @var OptionsResolver
+     */
+    private $root;
+
+    /**
+     * The root option name.
+     *
+     * @var string
+     */
+    private $rootName;
+
+    /**
+     * This class should only be instantiated from an OptionsResolver.
+     *
+     * See {@link OptionsResolver::setNested()}.
+     *
+     * @param string $rootName The root option name
+     */
+    public function __construct($rootName)
+    {
+        $this->rootName = $rootName;
+    }
+
+    /**
+     * Binds the root options.
+     *
+     * This method should only be called from root OptionsResolver instance.
+     * See {@link OptionsResolver::__clone()}.
+     *
+     * @param OptionsResolver $root The root options
+     *
+     * @return NestedOptions This instance
+     */
+    public function setRoot(OptionsResolver $root)
+    {
+        $this->root = $root;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * This method should only be called while the root option is resolved
+     * {@link OptionsResolver::OffsetGet()}
+     *
+     * @throws AccessException If the root option is not locked
+     */
+    public function resolve(array $options = array())
+    {
+        if (!$this->root->isLocked()) {
+            throw new AccessException(sprintf('The Nested options of "%s" can only be resolved internally while their root is resolved.', $this->rootName));
+        }
+
+        return parent::resolve($options);
+    }
+
+    /**
+     * @param string   $option
+     * @param \Closure $normalizer
+     *
+     * @return NestedOptions
+     */
+    public function setNormalizer($option, \Closure $normalizer)
+    {
+        return parent::setNormalizer($option, $normalizer); // TODO: Change the autogenerated stub
+    }
+}
@@ -44,7 +44,7 @@ class OptionsResolver implements Options
     /**
      * The nested options.
      *
-     * @var OptionsResolver[]
+     * @var NestedOptions[]
      */
     private $nested = array();
 
@@ -187,7 +187,7 @@ class OptionsResolver implements Options
      * @param string $option The name of the option
      * @param mixed  $value  The default value of the option
      *
-     * @return OptionsResolver This instance or the nested instance
+     * @return OptionsResolver|NestedOptions This instance or the nested instance
      *
      * @throws AccessException If called from a lazy option or normalizer
      */
@@ -291,9 +291,9 @@ public function hasDefault($option)
     }
 
     /**
-     * Defines an option as a new self.
+     * Defines an option as a new NestedOptions instance.
      *
-     * Returns a new OptionsResolver instance to configure nested options.
+     * Returns a new NestedOptions instance to configure nested options.
      *
      *     $nestedOptions = $options->setNested('connexion', array(
      *         'host' => 'localhost',
@@ -313,7 +313,7 @@ public function hasDefault($option)
      * @param string $option   The option name
      * @param array  $defaults The default nested options
      *
-     * @return OptionsResolver The nested options resolver
+     * @return NestedOptions The nested options resolver
      *
      * @throws AccessException If called from a lazy option or normalizer
      */
@@ -323,7 +323,7 @@ public function setNested($option, array $defaults = array())
             throw new AccessException('Options cannot be made nested from a lazy option or normalizer.');
         }
 
-        $nestedOptions = new self();
+        $nestedOptions = new NestedOptions($option);
 
         foreach ($defaults as $name => $default) {
             $nestedOptions->setDefault($name, $default);
@@ -979,6 +979,18 @@ public function allowExtraOptions($allow = true)
         return $this;
     }
 
+    /**
+     * Returns whether this instance is locked.
+     *
+     * @return bool Whether this instance is locked
+     *
+     * @internal Used by {@see NestedOptions} to prevent external resolving
+     */
+    public function isLocked()
+    {
+        return $this->locked;
+    }
+
     /**
      * Removes the option with the given name.
      *
@@ -1383,7 +1395,8 @@ public function count()
     public function __clone()
     {
         foreach ($this->nested as $name => $options) {
-            $this->nested[$name] = clone $options;
+            $nestedOptions = clone $options;
+            $this->nested[$name] = $nestedOptions->setRoot($this);
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class OptionsResolver implements Options`
`44`	`44`	`/**`
`45`	`45`	`* The nested options.`
`46`	`46`	`*`
`47`		`- * @var OptionsResolver[]`
	`47`	`+ * @var NestedOptions[]`
`48`	`48`	`*/`
`49`	`49`	`private $nested = array();`
`50`	`50`
`@@ -187,7 +187,7 @@ class OptionsResolver implements Options`
`187`	`187`	`* @param string $option The name of the option`
`188`	`188`	`* @param mixed $value The default value of the option`
`189`	`189`	`*`
`190`		`- * @return OptionsResolver This instance or the nested instance`
	`190`	`+ * @return OptionsResolver\|NestedOptions This instance or the nested instance`
`191`	`191`	`*`
`192`	`192`	`* @throws AccessException If called from a lazy option or normalizer`
`193`	`193`	`*/`
`@@ -291,9 +291,9 @@ public function hasDefault($option)`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`294`		`- * Defines an option as a new self.`
	`294`	`+ * Defines an option as a new NestedOptions instance.`
`295`	`295`	`*`
`296`		`- * Returns a new OptionsResolver instance to configure nested options.`
	`296`	`+ * Returns a new NestedOptions instance to configure nested options.`
`297`	`297`	`*`
`298`	`298`	`* $nestedOptions = $options->setNested('connexion', array(`
`299`	`299`	`* 'host' => 'localhost',`
`@@ -313,7 +313,7 @@ public function hasDefault($option)`
`313`	`313`	`* @param string $option The option name`
`314`	`314`	`* @param array $defaults The default nested options`
`315`	`315`	`*`
`316`		`- * @return OptionsResolver The nested options resolver`
	`316`	`+ * @return NestedOptions The nested options resolver`
`317`	`317`	`*`
`318`	`318`	`* @throws AccessException If called from a lazy option or normalizer`
`319`	`319`	`*/`
`@@ -323,7 +323,7 @@ public function setNested($option, array $defaults = array())`
`323`	`323`	`throw new AccessException('Options cannot be made nested from a lazy option or normalizer.');`
`324`	`324`	`}`
`325`	`325`
`326`		`- $nestedOptions = new self();`
	`326`	`+ $nestedOptions = new NestedOptions($option);`
`327`	`327`
`328`	`328`	`foreach ($defaults as $name => $default) {`
`329`	`329`	`$nestedOptions->setDefault($name, $default);`
`@@ -979,6 +979,18 @@ public function allowExtraOptions($allow = true)`
`979`	`979`	`return $this;`
`980`	`980`	`}`
`981`	`981`
	`982`	`+ /**`
	`983`	`+ * Returns whether this instance is locked.`
	`984`	`+ *`
	`985`	`+ * @return bool Whether this instance is locked`
	`986`	`+ *`
	`987`	`+ * @internal Used by {@see NestedOptions} to prevent external resolving`
	`988`	`+ */`
	`989`	`+ public function isLocked()`
	`990`	`+ {`
	`991`	`+ return $this->locked;`
	`992`	`+ }`
	`993`	`+`
`982`	`994`	`/**`
`983`	`995`	`* Removes the option with the given name.`
`984`	`996`	`*`
`@@ -1383,7 +1395,8 @@ public function count()`
`1383`	`1395`	`public function __clone()`
`1384`	`1396`	`{`
`1385`	`1397`	`foreach ($this->nested as $name => $options) {`
`1386`		`- $this->nested[$name] = clone $options;`
	`1398`	`+ $nestedOptions = clone $options;`
	`1399`	`+ $this->nested[$name] = $nestedOptions->setRoot($this);`
`1387`	`1400`	`}`
`1388`	`1401`	`}`
`1389`	`1402`