symfony
diff --git a/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+15-1Lines changed: 15 additions & 1 deletion b/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+15-1Lines changed: 15 additions & 1 deletion
diff --git a/‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+24-9Lines changed: 24 additions & 9 deletions b/‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+24-9Lines changed: 24 additions & 9 deletions
@@ -88,6 +88,11 @@ class OptionsResolver implements Options
      */
     private $deprecated = array();
 
+    /**
+     * The list of options provided by the user.
+     */
+    private $given = array();
+
     /**
      * Whether the instance is locked for reading.
      *
@@ -744,6 +749,7 @@ public function resolve(array $options = array())
 
         // Override options set by the user
         foreach ($options as $option => $value) {
+            $clone->given[$option] = true;
             $clone->defaults[$option] = $value;
             unset($clone->resolved[$option], $clone->lazy[$option]);
         }
@@ -760,6 +766,13 @@ public function resolve(array $options = array())
         // Lock the container
         $clone->locked = true;
 
+        if ($clone->defaults && $clone->deprecated) {
+            // Deprecated options must be evaluated last
+            uksort($clone->defaults, function ($option) use ($clone): int {
+                return (int) isset($clone->deprecated[$option]);
+            });
+        }
+
         // Now process the individual options. Use offsetGet(), which resolves
         // the option itself and any options that the option depends on
         foreach ($clone->defaults as $option => $_) {
@@ -920,7 +933,8 @@ public function offsetGet($option)
         }
 
         // Check whether the option is deprecated
-        if (isset($this->deprecated[$option])) {
+        // and it is provided by the user or is being called from a lazy evaluation
+        if (isset($this->deprecated[$option]) && (isset($this->given[$option]) || $this->calling)) {
             $deprecationMessage = $this->deprecated[$option];
 
             if ($deprecationMessage instanceof \Closure) {
 
@@ -491,31 +491,30 @@ public function testSetDeprecatedFailsIfInvalidDeprecationMessageType()
     public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
     {
         $this->resolver
-            ->setDefault('foo', true)
+            ->setDefined('foo')
             ->setDeprecated('foo', function (Options $options, $value) {
                 return false;
             })
         ;
-        $this->resolver->resolve();
+        $this->resolver->resolve(array('foo' => null));
     }
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
-     * @expectedExceptionMessage The options "foo", "bar" have a cyclic dependency.
+     * @expectedExceptionMessage The options "bar", "foo" have a cyclic dependency.
      */
     public function testFailsIfCyclicDependencyBetweenDeprecation()
     {
         $this->resolver
-            ->setDefault('foo', null)
-            ->setDefault('bar', null)
+            ->setDefined(array('foo', 'bar'))
             ->setDeprecated('foo', function (Options $options, $value) {
                 $options['bar'];
             })
             ->setDeprecated('bar', function (Options $options, $value) {
                 $options['foo'];
             })
         ;
-        $this->resolver->resolve();
+        $this->resolver->resolve(array('foo' => null, 'bar' => null));
     }
 
     public function testIsDeprecated()
@@ -590,14 +589,30 @@ function (OptionsResolver $resolver) {
             ),
         );
 
-        yield 'It deprecates a missing option with default value' => array(
+        yield 'It does not deprecates a missing option with default value' => array(
             function (OptionsResolver $resolver) {
                 $resolver
-                    ->setDefaults(array('foo' => null, 'bar' => null))
+                    ->setDefault('foo', null)
                     ->setDeprecated('foo')
                 ;
             },
-            array('bar' => 'baz'),
+            array(),
+            null,
+        );
+
+        yield 'It deprecates an option evaluated in another definition' => array(
+            function (OptionsResolver $resolver) {
+                // defined by superclass
+                $resolver
+                    ->setDefault('foo', null)
+                    ->setDeprecated('foo')
+                ;
+                // defined by subclass
+                $resolver->setDefault('bar', function (Options $options) {
+                    return $options['foo'];
+                });
+            },
+            array(),
             array(
                 'type' => E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',