Merge remote-tracking branch 'upstream/4.4' into pr-8684

# Conflicts:
#	src/Symfony/Bundle/Resources/config/api.php

Author: soyuka

src/Hydra/Tests/Serializer/DocumentationNormalizerTest.php

@@ -1189,8 +1189,8 @@ public function testNormalizeWithStringGroups(): void
                 ->withDenormalizationContext(['groups' => 'write']),
         ]));
 
-        $resourceClassResolver = $this->createMock(ResourceClassResolverInterface::class);
-        $resourceClassResolver->method('isResourceClass')->with($this->isString())->willReturn(false);
+        $resourceClassResolver = $this->createStub(ResourceClassResolverInterface::class);
+        $resourceClassResolver->method('isResourceClass')->willReturn(false);
 
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator->method('generate')->willReturnMap([

src/Symfony/Tests/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -269,6 +269,7 @@ public function testCommonConfiguration(): void
 
         $this->assertServiceHasTags('api_platform.cache.route_name_resolver', ['cache.pool']);
         $this->assertServiceHasTags('api_platform.serializer.normalizer.item', ['serializer.normalizer']);
+        $this->assertServiceHasTags('api_platform.symfony.iri_converter.skolem', ['kernel.reset']);
         $this->assertServiceHasTags('api_platform.serializer_locator', ['container.service_locator']);
         $this->assertServiceHasTags('api_platform.filter_locator', ['container.service_locator']);