Merge branch '5.4' into 6.3

* 5.4:
  Fix support to denormalize plain object types
  [Routing] Restore aliases removal in RouteCollection::remove()
  remove duplicated service definition

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services14.xml

@@ -3,10 +3,6 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="monolog.logger" parent="monolog.logger_prototype">
-            <argument index="0">app</argument>
-        </service>
-
         <service id="logger" alias="monolog.logger" />
 
         <service id="monolog.logger" parent="monolog.logger_prototype">

src/Symfony/Component/Routing/RouteCollection.php

@@ -147,13 +147,21 @@ public function get(string $name): ?Route
      */
     public function remove(string|array $name)
     {
-        $names = (array) $name;
-        foreach ($names as $n) {
-            unset($this->routes[$n], $this->priorities[$n]);
+        $routes = [];
+        foreach ((array) $name as $n) {
+            if (isset($this->routes[$n])) {
+                $routes[] = $n;
+            }
+
+            unset($this->routes[$n], $this->priorities[$n], $this->aliases[$n]);
+        }
+
+        if (!$routes) {
+            return;
         }
 
         foreach ($this->aliases as $k => $alias) {
-            if (\in_array($alias->getId(), $names, true)) {
+            if (\in_array($alias->getId(), $routes, true)) {
                 unset($this->aliases[$k]);
             }
         }

src/Symfony/Component/Routing/Tests/RouteCollectionTest.php

@@ -219,19 +219,22 @@ public function testGet()
     public function testRemove()
     {
         $collection = new RouteCollection();
-        $collection->add('foo', $foo = new Route('/foo'));
+        $collection->add('foo', new Route('/foo'));
 
         $collection1 = new RouteCollection();
         $collection1->add('bar', $bar = new Route('/bar'));
         $collection->addCollection($collection1);
         $collection->add('last', $last = new Route('/last'));
-        $collection->addAlias('ccc_my_custom_alias', 'foo');
+        $collection->addAlias('alias_removed_when_removing_route_foo', 'foo');
+        $collection->addAlias('alias_directly_removed', 'bar');
 
         $collection->remove('foo');
         $this->assertSame(['bar' => $bar, 'last' => $last], $collection->all(), '->remove() can remove a single route');
+        $collection->remove('alias_directly_removed');
+        $this->assertNull($collection->getAlias('alias_directly_removed'));
         $collection->remove(['bar', 'last']);
         $this->assertSame([], $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
-        $this->assertNull($collection->getAlias('ccc_my_custom_alias'));
+        $this->assertNull($collection->getAlias('alias_removed_when_removing_route_foo'));
     }
 
     public function testSetHost()

src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

@@ -547,7 +547,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
 
                 $expectedTypes[Type::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
 
-                if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {
+                if (Type::BUILTIN_TYPE_OBJECT === $builtinType && null !== $class) {
                     if (!$this->serializer instanceof DenormalizerInterface) {
                         throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
                     }

src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

@@ -122,6 +122,17 @@ public function testDenormalizeWithExtraAttributesAndNoGroupsWithMetadataFactory
         );
     }
 
+    public function testDenormalizePlainObject()
+    {
+        $extractor = new PhpDocExtractor();
+        $normalizer = new ObjectNormalizer(null, null, null, $extractor);
+        $dummy = $normalizer->denormalize(['plainObject' => (object) ['foo' => 'bar']], DummyWithPlainObject::class);
+
+        $this->assertInstanceOf(DummyWithPlainObject::class, $dummy);
+        $this->assertInstanceOf(\stdClass::class, $dummy->plainObject);
+        $this->assertSame('bar', $dummy->plainObject->foo);
+    }
+
     public function testDenormalizeWithDuplicateNestedAttributes()
     {
         $this->expectException(LogicException::class);
@@ -1145,6 +1156,12 @@ protected function setAttributeValue(object $object, string $attribute, $value,
     }
 }
 
+class DummyWithPlainObject
+{
+    /** @var object */
+    public $plainObject;
+}
+
 class ObjectWithBasicProperties
 {
     /** @var bool */