X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=composer.json;h=04c436199601ee0d288e89d50460d6643ca11c88;hb=06f68009ebdc123aa242f849d01f5d6cbc043726;hp=412ef4a1419134d4b0b4324c02094d412ce708b1;hpb=338f238785f12b750d976a91a6ede6c4ca6a8e33;p=plcapi.git

diff --git a/composer.json b/composer.json
index 412ef4a..04c4361 100644
--- a/composer.json
+++ b/composer.json
@@ -3,9 +3,9 @@
     "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",
+        "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?",
@@ -18,13 +18,19 @@
         "ext-mbstring": "*",
         "ext-xsl": "*",
         "indeyets/pake": "^1.99",
-        "sami/sami": "^3.3 || ^4.1",
         "docbook/docbook-xsl": "^1.79"
     },
     "suggest": {
         "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"
+        "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/"}