From b2bc3984f8ae2e06f1846f311b19dcc1d4379bed Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms <tleilax+studip@gmail.com> Date: Sat, 7 Sep 2024 05:00:33 +0000 Subject: [PATCH] remove phpxmlrpc, re #4110 Merge request studip/studip!3371 --- composer.json | 5 +- composer.lock | 115 +--------------------------------------------- phpstan.neon.dist | 2 - 3 files changed, 2 insertions(+), 120 deletions(-) diff --git a/composer.json b/composer.json index efafcdbd86b..45d8d11ddb8 100644 --- a/composer.json +++ b/composer.json @@ -66,8 +66,7 @@ "lib/messaging.inc.php", "lib/plugins/core/StudIPPlugin.php", "app/controllers/module/mvv_controller.php", - "vendor/phpass/PasswordHash.php", - "composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc" + "vendor/phpass/PasswordHash.php" ] }, "require-dev": { @@ -89,8 +88,6 @@ "symfony/yaml": "6.4.7", "ezyang/htmlpurifier": "^4.13", "jasig/phpcas": "1.5", - "phpxmlrpc/phpxmlrpc": "^4.9.0", - "phpxmlrpc/extras": "^1.0.0-beta2", "algo26-matthias/idna-convert": "4.0.2", "caxy/php-htmldiff": "0.1.15", "phpseclib/phpseclib": "3.0.37", diff --git a/composer.lock b/composer.lock index 14101efc5d9..bf0bf9b6e66 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5ec4df54d92509cb7d4ff4f9dc95803b", + "content-hash": "f64a6bfba9a1758196b21c6394535191", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -3217,118 +3217,6 @@ ], "time": "2024-03-03T02:14:58+00:00" }, - { - "name": "phpxmlrpc/extras", - "version": "1.0.0-beta4", - "source": { - "type": "git", - "url": "https://github.com/gggeek/phpxmlrpc-extras.git", - "reference": "7aedeb5100b0bca4085692a2c626fafb726c73b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/gggeek/phpxmlrpc-extras/zipball/7aedeb5100b0bca4085692a2c626fafb726c73b6", - "reference": "7aedeb5100b0bca4085692a2c626fafb726c73b6", - "shasum": "" - }, - "require": { - "php": "^5.4.0 || ^7.0 || ^8.0", - "phpxmlrpc/phpxmlrpc": "^4.10.1" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "^4.8 || ^5.0 || ^8.5.12", - "phpunit/phpunit-selenium": "*", - "phpxmlrpc/jsonrpc": "^1.0.0-beta1", - "yoast/phpunit-polyfills": "*" - }, - "suggest": { - "phpxmlrpc/jsonrpc": "Needed for the SonOfAjax demo", - "phpxmlrpc/jsxmlrpc": "Used the Ajax Server component. NB: better installed via NPM or used directly from CDN!" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpXmlRpc\\Extras\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "A collection of server-side addons that might be of use for development of xml-rpc (and json-rpc) based applications", - "homepage": "https://github.com/gggeek/phpxmlrpc-extras", - "keywords": [ - "jsonrpc", - "webservices", - "xmlrpc" - ], - "support": { - "issues": "https://github.com/gggeek/phpxmlrpc-extras/issues", - "source": "https://github.com/gggeek/phpxmlrpc-extras/tree/1.0.0-beta4" - }, - "time": "2024-04-16T15:48:39+00:00" - }, - { - "name": "phpxmlrpc/phpxmlrpc", - "version": "4.10.3", - "source": { - "type": "git", - "url": "https://github.com/gggeek/phpxmlrpc.git", - "reference": "6725f215cd7d7c7d36c1d773aa89902aef2da67c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/gggeek/phpxmlrpc/zipball/6725f215cd7d7c7d36c1d773aa89902aef2da67c", - "reference": "6725f215cd7d7c7d36c1d773aa89902aef2da67c", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "php": "^5.4.0 || ^7.0 || ^8.0" - }, - "conflict": { - "phpxmlrpc/extras": "<= 1.0.0-beta2", - "phpxmlrpc/jsonrpc": "<= 1.0.0-beta1" - }, - "require-dev": { - "ext-curl": "*", - "ext-dom": "*", - "ext-mbstring": "*", - "phpunit/phpunit": "^4.8 || ^5.0 || ^8.5.14", - "phpunit/phpunit-selenium": "*", - "yoast/phpunit-polyfills": "*" - }, - "suggest": { - "ext-curl": "Needed for HTTPS, HTTP2 and HTTP 1.1 support, NTLM Auth etc...", - "ext-mbstring": "Needed to allow reception of requests/responses in character sets other than ASCII,LATIN-1,UTF-8", - "ext-zlib": "Needed for sending compressed requests and receiving compressed responses, if cURL is not available", - "phpxmlrpc/extras": "Adds more featured Server classes, including self-documenting and ajax-enabled servers", - "phpxmlrpc/jsonrpc": "Adds support for the JSON-RPC protocol" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpXmlRpc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "A php library for building xmlrpc clients and servers", - "homepage": "https://gggeek.github.io/phpxmlrpc/", - "keywords": [ - "webservices", - "xml-rpc", - "xmlrpc" - ], - "support": { - "issues": "https://github.com/gggeek/phpxmlrpc/issues", - "source": "https://github.com/gggeek/phpxmlrpc/tree/4.10.3" - }, - "time": "2024-04-23T10:50:06+00:00" - }, { "name": "psr/cache", "version": "3.0.0", @@ -8788,7 +8676,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "phpxmlrpc/extras": 10, "edu-sharing/auth-plugin": 20 }, "prefer-stable": false, diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 037a8c77ec0..5b8547f1c3b 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,8 +7,6 @@ parameters: - tests/functional - tests/jsonapi - tests/unit - scanFiles: - - composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc scanDirectories: - app/controllers - lib -- GitLab