Merge branch '2.0'

Author: dunglas

appveyor.yml

@@ -1,16 +1,17 @@
 build: false
 platform: x86
-clone_folder: c:\projects\dunglas\api-bundle
+clone_folder: c:\projects\api-platform\core
 
 cache:
   - '%LOCALAPPDATA%\Composer\files'
 
 init:
-  - SET PATH=c:\tools\php;%PATH%
+  - SET PATH=c:\tools\php71;%PATH%
 
 install:
-  - cinst -y php -i
-  - cd c:\tools\php
+  - ps: Set-Service wuauserv -StartupType Manual
+  - cinst -y php
+  - cd c:\tools\php71
   - copy php.ini-production php.ini /Y
   - echo date.timezone="UTC" >> php.ini
   - echo extension_dir=ext >> php.ini

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -38,11 +38,21 @@ public function prepend(ContainerBuilder $container)
             return;
         }
 
-        if (!isset($frameworkConfiguration['serializer'], $frameworkConfiguration['serializer']['enabled'])) {
+        foreach ($frameworkConfiguration as $frameworkParameters) {
+            if (isset($frameworkParameters['serializer'])) {
+                $serializerConfig = $serializerConfig ?? $frameworkParameters['serializer'];
+            }
+
+            if (isset($frameworkParameters['property_info'])) {
+                $propertyInfoConfig = $propertyInfoConfig ?? $frameworkParameters['property_info'];
+            }
+        }
+
+        if (!isset($serializerConfig['enabled'])) {
             $container->prependExtensionConfig('framework', ['serializer' => ['enabled' => true]]);
         }
 
-        if (!isset($frameworkConfiguration['property_info'], $frameworkConfiguration['property_info']['enabled'])) {
+        if (!isset($propertyInfoConfig['enabled'])) {
             $container->prependExtensionConfig('framework', ['property_info' => ['enabled' => true]]);
         }
     }

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -76,7 +76,7 @@ public function testNotPrependWhenNull()
     public function testNotPrependSerializerWhenConfigExist()
     {
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn(['serializer' => ['enabled' => false]])->shouldBeCalled();
+        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn([0 => ['serializer' => ['enabled' => false]]])->shouldBeCalled();
         $containerBuilderProphecy->prependExtensionConfig('framework', Argument::any())->willReturn(null)->shouldBeCalled();
         $containerBuilderProphecy->prependExtensionConfig('framework', Argument::that(function (array $config) {
             return array_key_exists('serializer', $config);
@@ -89,7 +89,7 @@ public function testNotPrependSerializerWhenConfigExist()
     public function testNotPrependPropertyInfoWhenConfigExist()
     {
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn(['property_info' => ['enabled' => false]])->shouldBeCalled();
+        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn([0 => ['property_info' => ['enabled' => false]]])->shouldBeCalled();
         $containerBuilderProphecy->prependExtensionConfig('framework', Argument::any())->willReturn(null)->shouldBeCalled();
         $containerBuilderProphecy->prependExtensionConfig('framework', Argument::that(function (array $config) {
             return array_key_exists('property_info', $config);
@@ -112,7 +112,7 @@ public function testPrependWhenNotConfigured()
     public function testPrependWhenNotEnabled()
     {
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn(['serializer' => []])->shouldBeCalled();
+        $containerBuilderProphecy->getExtensionConfig('framework')->willReturn([0 => ['serializer' => []]])->shouldBeCalled();
         $containerBuilderProphecy->prependExtensionConfig('framework', Argument::type('array'))->shouldBeCalled();
         $containerBuilder = $containerBuilderProphecy->reveal();