Merge branch '6.4' into 7.3

* 6.4:
  Fix Warning: curl_multi_select(): timeout must be positive
  [PropertyInfo] Fix ReflectionExtractor handling of underscore-only property names
  ObjectNormalizer: allow null and scalar
  [Security] Fix `HttpUtils::createRequest()` when the context’s base URL isn’t empty
  [Serializer] fix Inherited properties normalization
  [OptionsResolver] Fix missing prototype key in nested error paths
  Bump Symfony version to 6.4.30
  Update VERSION for 6.4.29
  Update CHANGELOG for 6.4.29
  [Yaml] Fix parsing of unquoted multiline scalars with comments or blank lines
  [Clock] Align MockClock::sleep() behavior with NativeClock for negative values
  [OptionsResolver] Ensure remove() also unsets deprecation status
  Remove review state for Belarusian translations (entries 141 and 142)
  [ExpressionLanguage] Compile numbers with var_export in Compiler::repr for thread-safety
  compatibility with ext-redis 6.3
  [Serializer] Fix BackedEnumNormalizer behavior with partial denormalization

Author: xabbuh

OptionsResolver.php

@@ -834,7 +834,7 @@ public function remove(string|array $optionNames): static
 
         foreach ((array) $optionNames as $option) {
             unset($this->defined[$option], $this->defaults[$option], $this->required[$option], $this->resolved[$option]);
-            unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option]);
+            unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option], $this->deprecated[$option]);
         }
 
         return $this;
@@ -1011,6 +1011,11 @@ public function offsetGet(mixed $option, bool $triggerDeprecation = true): mixed
                 $resolver = new self();
                 $resolver->prototype = false;
                 $resolver->parentsOptions = $this->parentsOptions;
+
+                if ($this->prototype && null !== $this->prototypeIndex && null !== ($parentOptionKey = array_key_last($resolver->parentsOptions))) {
+                    $resolver->parentsOptions[$parentOptionKey] .= \sprintf('[%s]', $this->prototypeIndex);
+                }
+
                 $resolver->parentsOptions[] = $option;
                 foreach ($this->nested[$option] as $closure) {
                     $closure($resolver, $this);

Tests/OptionsResolverTest.php

@@ -3322,4 +3322,78 @@ public function testAccessToParentOptionFromNestedNormalizerAndLazyOption()
 
         $this->assertSame($expectedOptions, $actualOptions);
     }
+
+    public function testRemoveAlsoRemovesDeprecation()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setDeprecated('foo', 'vendor/package', '1.0');
+        $this->assertTrue($this->resolver->isDeprecated('foo'));
+
+        $this->resolver->remove('foo');
+        $this->assertFalse($this->resolver->isDeprecated('foo'));
+
+        $this->resolver->setDefault('foo', 'bar');
+        $this->assertFalse($this->resolver->isDeprecated('foo'));
+
+        $count = 0;
+        set_error_handler(static function (int $type) use (&$count) {
+            if (\E_USER_DEPRECATED === $type) {
+                ++$count;
+            }
+
+            return false;
+        });
+
+        try {
+            $this->resolver->resolve(['foo' => 'value']);
+            $this->assertSame(0, $count);
+        } finally {
+            restore_error_handler();
+        }
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testNestedPrototypeErrorPathHasFullContext()
+    {
+        $resolver = new OptionsResolver();
+
+        $resolver->setDefault('connections', static function (OptionsResolver $connResolver) {
+            $connResolver->setPrototype(true);
+            $connResolver->setRequired(['host', 'database']);
+            $connResolver->setDefault('user', 'root');
+
+            $connResolver->setDefault('replicas', static function (OptionsResolver $replicaResolver) {
+                $replicaResolver->setPrototype(true);
+                $replicaResolver->setRequired(['host']);
+                $replicaResolver->setDefault('user', 'read_only');
+            });
+        });
+
+        $this->expectException(MissingOptionsException::class);
+        $this->expectExceptionMessage('The required option "connections[main_db][replicas][1][host]" is missing.');
+
+        $options = [
+            'connections' => [
+                'main_db' => [
+                    'host' => 'localhost',
+                    'database' => 'app_db',
+                    'replicas' => [
+                        ['host' => 'replica-01.local', 'user' => 'read_only'],
+                        ['user' => 'other_user'], // Index 1 -> "host" is missing here
+                    ],
+                ],
+                'audit_db' => [
+                    'host' => 'audit.local',
+                    'database' => 'audit_db',
+                    'replicas' => [
+                        ['host' => 'audit-replica.local'],
+                    ],
+                ],
+            ],
+        ];
+
+        $resolver->resolve($options);
+    }
 }