X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=composer.json;h=9fd5985ab783b23e1c8c59ef1aae03254e5b0d35;hb=fb82ab40b1db1a1d37f41c3a81bc97655ee1627d;hp=38df192fc93caa932f65d3daf6ddaeaa044470c2;hpb=1a94543645b6bce280d24847de2e36f7a0752b1e;p=plcapi.git

diff --git a/composer.json b/composer.json
index 38df192..9fd5985 100644
--- a/composer.json
+++ b/composer.json
@@ -3,14 +3,14 @@
     "description": "A php library for building xmlrpc clients and servers",
     "license": "BSD-3-Clause",
     "homepage": "https://gggeek.github.io/phpxmlrpc/",
-    "keywords": [ "xmlrpc", "webservices" ],
+    "keywords": [ "xmlrpc", "xml-rpc","webservices" ],
     "require": {
         "php": "^5.3.0 || ^7.0 || ^8.0",
         "ext-xml": "*"
     },
     "_comment::tests": "The dev packages below require a minimum of php 5.6, even though we support php 5.3. Can we manage to do better?",
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^8.5.12",
+        "phpunit/phpunit": "^5.0 || ^8.5.14",
         "phpunit/phpunit-selenium": "*",
         "yoast/phpunit-polyfills": "*",
         "ext-curl": "*",
@@ -24,8 +24,14 @@
         "ext-curl": "Needed for HTTPS and HTTP 1.1 support, NTLM Auth etc...",
         "ext-zlib": "Needed for sending compressed requests and receiving compressed responses, if cURL is not available",
         "ext-mbstring": "Needed to allow reception of requests/responses in character sets other than ASCII,LATIN-1,UTF-8",
+        "phpxmlrpc/extras": "Adds more featured Server classes and other useful bits",
+        "phpxmlrpc/jsonrpc": "Adds support for the JSON-RPC protocol",
         "sami/sami": "Required for doc generation using pake. Version constraints: ^3.3 || ^4.1"
     },
+    "_comment::conflict": "Within the extras package, only the XMLRPC extension emulation is not compatible... the JSONRPC part should be ok. Both have been moved to different packages anyway",
+    "conflict": {
+        "phpxmlrpc/extras": "<= 0.6.3"
+    },
     "autoload": {
         "psr-4": {"PhpXmlRpc\\": "src/"}
     },