RequestTask : query_parameters option is deprecated, use data instead. Add missing throw Exception to allow use error_strategy: *.

Author: njoubert-cleverage

CHANGELOG.md

@@ -8,7 +8,7 @@ v2.0
 * [#4](https://github.com/cleverage/rest-process-bundle/issues/4) Update services according to Symfony best practices. 
 Services should not use autowiring or autoconfiguration. Instead, all services should be defined explicitly.
 Services must be prefixed with the bundle alias instead of using fully qualified class names => `cleverage_rest_process`
-
+* RequestTask : `query_parameters` option is deprecated, use `data` instead
 
 ### Changes
 

src/Client/Client.php

@@ -93,12 +93,11 @@ protected function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefaults(
             [
                 'method' => 'GET',
-                'url_parameters' => [],
-                'query_parameters' => [],
-                'headers' => [],
                 'sends' => 'application/json',
                 'expects' => 'application/json',
-                'body' => null,
+                'url_parameters' => [],
+                'headers' => [],
+                'data' => null,
             ]
         );
 
@@ -107,8 +106,8 @@ protected function configureOptions(OptionsResolver $resolver): void
         $resolver->setAllowedTypes('sends', ['string']);
         $resolver->setAllowedTypes('expects', ['string']);
         $resolver->setAllowedTypes('url_parameters', ['array']);
-        $resolver->setAllowedTypes('query_parameters', ['array']);
         $resolver->setAllowedTypes('headers', ['array']);
+        $resolver->setAllowedTypes('data', ['array', 'string', 'null']);
     }
 
     protected function getOptions(array $options = []): array
@@ -135,11 +134,11 @@ protected function getRequestOptions(array $options = []): array
             $requestOptions['headers']['Accept'] = $options['expects'];
         }
         if ('POST' === $options['method'] && 'application/json' === $options['sends']) {
-            $requestOptions['json'] = $options['body'];
+            $requestOptions['json'] = $options['data'];
         } elseif ('GET' === $options['method']) {
-            $requestOptions['query'] = $options['query_parameters'];
+            $requestOptions['query'] = $options['data'];
         } else {
-            $requestOptions['body'] = $options['body'];
+            $requestOptions['body'] = $options['data'];
         }
 
         return $requestOptions;

src/Task/RequestTask.php

@@ -80,7 +80,7 @@ public function execute(ProcessState $state): void
                 ]
             );
 
-            return;
+            throw $e;
         }
     }
 
@@ -101,9 +101,9 @@ protected function configureOptions(OptionsResolver $resolver): void
             [
                 'headers' => [],
                 'url_parameters' => [],
-                'query_parameters' => [],
-                'sends' => 'json',
-                'expects' => 'json',
+                'data' => null,
+                'sends' => 'application/json',
+                'expects' => 'application/json',
                 'valid_response_code' => [200],
                 'log_response' => false,
             ]
@@ -121,13 +121,13 @@ protected function getRequestOptions(ProcessState $state): array
         $options = $this->getOptions($state);
 
         $requestOptions = [
-            'method' => $options['method'],
             'url' => $options['url'],
+            'method' => $options['method'],
             'headers' => $options['headers'],
             'url_parameters' => $options['url_parameters'],
-            'query_parameters' => $options['query_parameters'],
             'sends' => $options['sends'],
             'expects' => $options['expects'],
+            'data' => $options['data'],
         ];
 
         $input = $state->getInput() ?: [];