Merge branch 'master' into 3.0

.travis.yml

@@ -77,4 +77,4 @@ jobs:
         - vendor/bin/phpunit --fail-on-warning
     -
       name: CS Fixer
-      script: vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --using-cache=no --show-progress=dots --diff $(git diff -- '*.php' --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")
+      script: vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --using-cache=no --show-progress=dots --diff $(git diff -- '*.php' --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")

README.md

@@ -236,7 +236,7 @@ Configure the unit tests config before running the unit tests. The tests fire re
 
 1. Copy `/tests/local.config.php.dist` to `/tests/local.config.php`.
 2. Open the API tester in the browser like http://localhost/api-library/apitester/index.php
-3. Fill in the URL of your Mautic instance.
+3. Fill in the URL of your Mautic instance. NOTE: if you're using Docker/DDEV and your Mautic instance is running in another container, use the container name instead of the FQDN of your Mautic instance, e.g. http://mautic-instance/...
 4. Click Submit to store the URL to the session.
 5. Fill in one of the OAuth credentials and authorize.
 6. Open the $_SESSION array and copy the 'access_token' to the local.config.php file.

composer.json

@@ -16,6 +16,7 @@
   "require": {
     "php": ">=7.2.0",
     "ext-curl": "*",
+    "ext-json": "*",
     "psr/log": "~1.0"
   },
   "require-dev": {

lib/Auth/AbstractAuth.php

@@ -145,7 +145,8 @@ public function makeRequest($url, array $parameters = [], $method = 'GET', array
                 $parameters['file']          = $this->createCurlFile($parameters['file']);
                 $headers[]                   = 'Content-Type: multipart/form-data';
             } else {
-                $parameters = http_build_query($parameters, '', '&');
+                $parameters = json_encode($parameters);
+                $headers[]  = "Content-Type: application/json";
             }
 
             $options[CURLOPT_POST]       = true;