Merge 4.0

Author: soyuka

EventListener/ErrorListener.php

@@ -94,7 +94,7 @@ protected function duplicateRequest(\Throwable $exception, Request $request): Re
             $operation = $operation->withProvider('api_platform.state.error_provider');
         }
 
-        $normalizationContext = ($operation->getNormalizationContext() ?? []) + ($apiOperation?->getNormalizationContext() ?? []);
+        $normalizationContext = $operation->getNormalizationContext() ?? [];
         if (!($normalizationContext['api_error_resource'] ?? false)) {
             $normalizationContext += ['api_error_resource' => true];
         }

Maker/MakeStateProcessor.php

@@ -69,7 +69,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $generator->generateClass(
             $stateProcessorClassNameDetails->getFullName(),
-            __DIR__.'/Resources/skeleton/StateProcessor.tpl.php'
+            __DIR__.'/Resources/skeleton/StateProcessor.php.tpl'
         );
         $generator->writeChanges();
 

Maker/MakeStateProvider.php

@@ -69,7 +69,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $generator->generateClass(
             $stateProviderClassNameDetails->getFullName(),
-            __DIR__.'/Resources/skeleton/StateProvider.tpl.php'
+            __DIR__.'/Resources/skeleton/StateProvider.php.tpl'
         );
         $generator->writeChanges();