X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=composer.json;h=3a241a5da42a454a4f7f8116bee1ae74484cd600;hb=e9ccb65ba9fa0b6ec69d98749f289cf806ff330e;hp=3a6a202ebbf7f35acbea023576476c8ea2a0b111;hpb=d2b69ba8fc9b050b9a34594bbc6441279db959dc;p=plcapi.git

diff --git a/composer.json b/composer.json
index 3a6a202..3a241a5 100644
--- a/composer.json
+++ b/composer.json
@@ -3,46 +3,32 @@
     "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?",
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^8.5.12",
+        "phpunit/phpunit": "^5.0 || ^8.5.14",
         "phpunit/phpunit-selenium": "*",
         "yoast/phpunit-polyfills": "*",
         "ext-curl": "*",
         "ext-dom": "*",
-        "ext-mbstring": "*",
-        "ext-xsl": "*",
-        "indeyets/pake": "^1.99",
-        "docbook/docbook-xsl": "^1.79"
+        "ext-mbstring": "*"
     },
     "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",
-        "sami/sami": "Required for doc generation using pake. Version constraints: ^3.3 || ^4.1"
+        "phpxmlrpc/extras": "Adds more featured Server classes and other useful bits",
+        "phpxmlrpc/jsonrpc": "Adds support for the JSON-RPC protocol"
+    },
+    "_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/"}
-    },
-    "config": {
-        "secure-http": false
-    },
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "docbook/docbook-xsl",
-                "version": "1.79.1",
-                "dist": {
-                    "url": "https://sourceforge.net/projects/docbook/files/docbook-xsl/1.79.1/docbook-xsl-1.79.1.zip/download",
-                    "type": "zip"
-                }
-            }
-        }
-    ]
+    }
 }