Merge pull request #141 from AlejandroPerez92/MINT-3699

Allow empty queries in GET requests

Author: AnjaliYadav08

Components/WebService/Rest/RestConfigurableProducer.php

@@ -174,7 +174,7 @@ protected function request(ClientInterface $client, array $stepActionParams, arr
         }
         $restOptions['body'] = $requestBody;
 
-        if ('GET' == $httpMethod) {
+        if ('GET' == $httpMethod && key_exists(self::REQUEST_QUERY_PARAMETERS, $params)) {
             $queryParameters = $this->confHelper->resolve($params[self::REQUEST_QUERY_PARAMETERS], $context);
             if (!$queryParameters) {
                 throw new InvalidConfigurationException("'parameters' entry in 'request' configuration is mandatory for GET HTTP method");

Makefile

@@ -0,0 +1,50 @@
+CURRENT_USER    = $(shell id -u):$(shell id -g)
+USER_NAME       = $(shell whoami)
+
+DOCKER_COMPOSE  = CURRENT_USER=$(CURRENT_USER) docker compose
+
+EXEC_PHP        = $(DOCKER_COMPOSE) exec php
+EXEC_SUDO_PHP   = $(DOCKER_COMPOSE) exec -u root php
+
+##
+## Project
+## -------
+##
+
+build:
+	$(DOCKER_COMPOSE) build --pull
+
+kill:
+	$(DOCKER_COMPOSE) kill
+	$(DOCKER_COMPOSE) down --volumes --remove-orphans
+
+install: ## Install and start the project
+install: build start useradd vendor
+
+reset: ## Stop and start a fresh install of the project
+reset: kill install
+
+docker-sync-start: #start docker sync
+	docker-sync start
+
+start: ## Start the project
+	$(DOCKER_COMPOSE) up -d --remove-orphans --no-recreate
+
+useradd: ## Add your host user to the container
+	$(EXEC_SUDO_PHP) groupadd -f -g $(shell id -g) $(USER_NAME)
+	$(EXEC_SUDO_PHP) useradd -u $(shell id -u) -g $(shell id -g) -m $(USER_NAME)
+
+stop: ## Stop the project
+	$(DOCKER_COMPOSE) stop
+
+enter: ## Login into php docker
+	$(EXEC_PHP) bash
+
+clear-cache:
+	$(EXEC_SUDO_PHP) bash -c 'rm -rf var/cache/*'
+
+vendor:
+	$(EXEC_PHP) composer install --prefer-dist
+
+test:
+	$(EXEC_PHP) php ./bin/phpunit

Tests/Functional/Producers/RestConfigurableProducerTest.php

@@ -131,4 +131,49 @@ public function testCanOverrideBaseUrI($baseUri, $requestUri, $overrideBaseUri,
         $this->assertEquals($expectedHost, $request->getUri()->getHost());
         $this->assertEquals($expectedPath, $request->getUri()->getPath());
     }
+
+    public function testShouldAllowGetWithoutQuery()
+    {
+        $requestUri = 'v0/put/cats';
+        $baseUri = 'http://someservice.com/api/';
+
+        $mockHandler = new MockHandler([
+            new Response(200, ['X-Foo' => 'Bar']),
+        ]);
+
+        $container = [];
+        $history = Middleware::history($container);
+        $stack = HandlerStack::create($mockHandler);
+        $stack->push($history);
+
+        $client = new Client(['handler' => $stack]);
+
+        $producer = $this->producer;
+        $producer->setHttpClient($client);
+
+        $actionParams = [
+            RestConfigurableProducer::REQUEST_NAME => 'someRequest',
+            RestConfigurableProducer::REQUEST_HTTP_VERB => 'GET',
+            RestConfigurableProducer::REQUEST_BODY => [],
+            RestConfigurableProducer::REQUEST_URI => $requestUri,
+            RestConfigurableProducer::DISPLAY_RESPONSE_ERROR => false,
+        ];
+
+        $options = [
+            RestConfigurableProtocol::OPTION_BASE_URI => $baseUri,
+            RestConfigurableProtocol::OPTION_ENCODING => RestConfigurableProtocol::ENCODING_JSON,
+            ConfigurableWebserviceProtocol::OPTION_CONNECT_TIMEOUT => 10,
+            ConfigurableWebserviceProtocol::OPTION_TIMEOUT => 10,
+            RestConfigurableProtocol::OPTION_HEADERS => [],
+            RestConfigurableProtocol::OPTION_AUTH => false,
+        ];
+        $context = [
+            'vars' => [],
+            'msg'  => new Message(new SerializableThing(), [], new Context()),
+            'exchange' => new Exchange(),
+        ];
+
+        $response = $producer->executeStep(RestConfigurableProducer::STEP_REQUEST, $actionParams, $options, $context);
+        $this->assertTrue($response, 'The producer should return true to say it has completed the Request Step');
+    }
 }

composer.json

@@ -29,7 +29,9 @@
         "stomp-php/stomp-php": "4.*",
         "symfony/monolog-bundle": "^2.4",
         "symfony/phpunit-bridge": "*",
-        "symfony/stopwatch": "^2.8 || ^3.4"
+        "symfony/stopwatch": "^2.8 || ^3.4",
+        "phpunit/phpunit": "^7.5",
+        "symfony/translation": "^4.3.8"
     },
     "config": {
         "bin-dir": "bin"

docker-compose.yml

@@ -1,18 +1,19 @@
-version: '3'
-
 services:
   php:
     build: ./docker/php
     working_dir: /app
+    user: "${CURRENT_USER}"
     volumes:
       - .:/app
     depends_on:
       - rabbit
+    environment:
+      CURRENT_USER: '11:11'
 
   rabbit:
     build: ./docker/rabbit
     environment:
       - RABBITMQ_DEFAULT_USER=guest
       - RABBITMQ_DEFAULT_PASS=guest
     ports:
-      - "8081:15672"
+      - "8082:15672"

docker/php/Dockerfile

@@ -1,6 +1,6 @@
-FROM composer:1 AS composer
+FROM composer:lts AS composer
 
-FROM php:7.0-fpm
+FROM php:7.4-fpm
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
@@ -15,9 +15,9 @@ RUN docker-php-ext-install \
     pcntl \
     sockets
 
-RUN pecl install apcu-5.1.8 \
+RUN pecl install apcu-5.1.23 \
     mongodb \
-    xdebug-2.7.2 #Latest version that supports PHP 7.0
+    xdebug-3.1.6 #Latest version that supports PHP 7.4
 
 RUN docker-php-ext-enable \
     apcu \