Throw exception if string $parameters is passed to method without request body

Author: Naktibalda

src/Codeception/Module/REST.php

@@ -638,19 +638,26 @@ protected function execute($method, $url, $parameters = [], $files = [])
 
         $this->params = $parameters;
 
-        $parameters = $this->encodeApplicationJson($method, $parameters);
         $isQueryParamsAwareMethod = in_array($method, self::QUERY_PARAMS_AWARE_METHODS, true);
 
-        if (is_array($parameters) || $isQueryParamsAwareMethod) {
-            if (!empty($parameters) && $isQueryParamsAwareMethod) {
-                if (strpos($url, '?') !== false) {
-                    $url .= '&';
-                } else {
-                    $url .= '?';
-                }
-                $url .= http_build_query($parameters);
+        if ($isQueryParamsAwareMethod) {
+            if (!is_array($parameters)) {
+                throw new ModuleException(__CLASS__, $method . ' parameters must be passed in array format');
             }
+        } else {
+            $parameters = $this->encodeApplicationJson($method, $parameters);
+        }
+
+        if (is_array($parameters) || $isQueryParamsAwareMethod) {
             if ($isQueryParamsAwareMethod) {
+                if (!empty($parameters)) {
+                    if (strpos($url, '?') !== false) {
+                        $url .= '&';
+                    } else {
+                        $url .= '?';
+                    }
+                    $url .= http_build_query($parameters);
+                }
                 $this->debugSection("Request", "$method $url");
                 $files = [];
             } else {
@@ -707,7 +714,6 @@ protected function encodeApplicationJson($method, $parameters)
     {
         if (
             array_key_exists('Content-Type', $this->connectionModule->headers)
-            && !in_array($method, self::QUERY_PARAMS_AWARE_METHODS, true)
             && ($this->connectionModule->headers['Content-Type'] === 'application/json'
                 || preg_match('!^application/.+\+json$!', $this->connectionModule->headers['Content-Type'])
             )

tests/unit/Codeception/Module/RestTest.php

@@ -220,9 +220,8 @@ public function testApplicationJsonIncludesObjectSerialized()
      */
     public function testGetApplicationJsonNotIncludesJsonAsContent($method)
     {
-        $method = 'send' . $method;
         $this->module->haveHttpHeader('Content-Type', 'application/json');
-        $this->module->$method('/', ['name' => 'john']);
+        $this->module->send($method, '/', ['name' => 'john']);
         /** @var $request \Symfony\Component\BrowserKit\Request  **/
         $request = $this->module->client->getRequest();
         $this->assertNull($request->getContent());
@@ -232,11 +231,22 @@ public function testGetApplicationJsonNotIncludesJsonAsContent($method)
     public function queryParamsAwareMethods()
     {
         return [
-            ['Get'],
-            ['Head'],
+            'GET'     => ['GET'],
+            'HEAD'    => ['HEAD'],
+            'DELETE'  => ['DELETE'],
+            'OPTIONS' => ['OPTIONS'],
         ];
     }
 
+    /**
+     * @dataProvider queryParamsAwareMethods
+     */
+    public function testRequestThrowsExceptionIfParametersIsString($method)
+    {
+        $this->expectExceptionMessage($method, ' parameters must be passed in array format');
+        $this->module->send($method, '/', 'string');
+    }
+
     public function testUrlIsFull()
     {
         $this->module->sendGET('/api/v1/users');