symfony
diff --git a/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+7-7Lines changed: 7 additions & 7 deletions b/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+17-3Lines changed: 17 additions & 3 deletions b/‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+17-3Lines changed: 17 additions & 3 deletions
@@ -766,13 +766,6 @@ 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 => $_) {
@@ -805,6 +798,10 @@ public function offsetGet($option)
 
         // Shortcut for resolved options
         if (array_key_exists($option, $this->resolved)) {
+            if (isset($this->deprecated[$option])) {
+                @trigger_error(strtr($this->deprecated[$option], array('%name%' => $option)), E_USER_DEPRECATED);
+            }
+
             return $this->resolved[$option];
         }
 
@@ -956,6 +953,9 @@ public function offsetGet($option)
             if ('' !== $deprecationMessage) {
                 @trigger_error(strtr($deprecationMessage, array('%name%' => $option)), E_USER_DEPRECATED);
             }
+
+            // Store result for next calls
+            $this->deprecated[$option] = $deprecationMessage ?: null;
         }
 
         // Normalize the validated option
 
@@ -501,7 +501,7 @@ public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
-     * @expectedExceptionMessage The options "bar", "foo" have a cyclic dependency.
+     * @expectedExceptionMessage The options "foo", "bar" have a cyclic dependency.
      */
     public function testFailsIfCyclicDependencyBetweenDeprecation()
     {
@@ -538,10 +538,15 @@ public function testIsNotDeprecatedIfEmptyString()
     /**
      * @dataProvider provideDeprecationData
      */
-    public function testDeprecationMessages(\Closure $configureOptions, array $options, ?array $expectedError)
+    public function testDeprecationMessages(\Closure $configureOptions, array $options, ?array $expectedError, int $expectedCount)
     {
+        $count = 0;
         error_clear_last();
-        set_error_handler(function () { return false; });
+        set_error_handler(function () use (&$count) {
+            ++$count;
+
+            return false;
+        });
         $e = error_reporting(0);
 
         $configureOptions($this->resolver);
@@ -554,6 +559,7 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio
         unset($lastError['file'], $lastError['line']);
 
         $this->assertSame($expectedError, $lastError);
+        $this->assertSame($expectedCount, $count);
     }
 
     public function provideDeprecationData()
@@ -570,6 +576,7 @@ function (OptionsResolver $resolver) {
                 'type' => E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',
             ),
+            1,
         );
 
         yield 'It deprecates an option with custom message' => array(
@@ -587,6 +594,7 @@ function (OptionsResolver $resolver) {
                 'type' => E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated, use "bar" option instead.',
             ),
+            2,
         );
 
         yield 'It does not deprecates a missing option with default value' => array(
@@ -598,6 +606,7 @@ function (OptionsResolver $resolver) {
             },
             array(),
             null,
+            0,
         );
 
         yield 'It deprecates an option evaluated in another definition' => array(
@@ -617,6 +626,7 @@ function (OptionsResolver $resolver) {
                 'type' => E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',
             ),
+            1,
         );
 
         yield 'It deprecates allowed type and value' => array(
@@ -638,6 +648,7 @@ function (OptionsResolver $resolver) {
                 'type' => E_USER_DEPRECATED,
                 'message' => 'Passing an instance of "stdClass" to option "foo" is deprecated, pass its FQCN instead.',
             ),
+            1,
         );
 
         yield 'It ignores deprecation for missing option without default value' => array(
@@ -649,6 +660,7 @@ function (OptionsResolver $resolver) {
             },
             array('bar' => 'baz'),
             null,
+            0,
         );
 
         yield 'It ignores deprecation if closure returns an empty string' => array(
@@ -662,6 +674,7 @@ function (OptionsResolver $resolver) {
             },
             array('foo' => Bar::class),
             null,
+            0,
         );
 
         yield 'It deprecates value depending on other option value' => array(
@@ -683,6 +696,7 @@ function (OptionsResolver $resolver) {
                 'type' => E_USER_DEPRECATED,
                 'message' => 'Using the "date_format" option when the "widget" option is set to "single_text" is deprecated.',
             ),
+            1,
         );
     }