nested normalizer get passed parent options

HeahDude · HeahDude · commit b51cce4bbbd2 · 2016-03-14T08:00:03.000+01:00
diff --git a/src/Symfony/Component/OptionsResolver/NestedOptions.php b/src/Symfony/Component/OptionsResolver/NestedOptions.php
@@ -86,13 +86,11 @@ public function resolve(array $options = array())
     }
 
     /**
-     * @param string   $option
-     * @param \Closure $normalizer
-     *
-     * @return NestedOptions
+     * {@inheritdoc}
      */
-    public function setNormalizer($option, \Closure $normalizer)
+    protected function normalize(\Closure $normalizer, $value)
     {
-        return parent::setNormalizer($option, $normalizer); // TODO: Change the autogenerated stub
+        // Pass the resolved parent options as third argument.
+        return $normalizer($this, $value, $this->root);
     }
 }
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1319,7 +1319,7 @@ public function offsetGet($option)
             // BEGIN
             $this->calling[$option] = true;
             try {
-                $value = $normalizer($this, $value);
+                $value = $this->normalize($normalizer, $value);
             } finally {
                 unset($this->calling[$option]);
             }
@@ -1400,6 +1400,21 @@ public function __clone()
         }
     }
 
+    /**
+     * Executes the normalizer on the validated option value.
+     *
+     * Extract this bit of logic in order to override it in NestedOptions.
+     *
+     * @param \Closure $normalizer The option normalizer
+     * @param mixed    $value      The validated option value to normalize
+     *
+     * @return mixed The normalized option value
+     */
+    protected function normalize(\Closure $normalizer, $value)
+    {
+        return $normalizer($this, $value);
+    }
+
     /**
      * Returns a string representation of the type of the value.
      *

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,11 @@ public function resolve(array $options = array())`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
`89`		`- * @param string $option`
`90`		`- * @param \Closure $normalizer`
`91`		`- *`
`92`		`- * @return NestedOptions`
	`89`	`+ * {@inheritdoc}`
`93`	`90`	`*/`
`94`		`- public function setNormalizer($option, \Closure $normalizer)`
	`91`	`+ protected function normalize(\Closure $normalizer, $value)`
`95`	`92`	`{`
`96`		`- return parent::setNormalizer($option, $normalizer); // TODO: Change the autogenerated stub`
	`93`	`+ // Pass the resolved parent options as third argument.`
	`94`	`+ return $normalizer($this, $value, $this->root);`
`97`	`95`	`}`
`98`	`96`	`}`