Skip to content

Commit 934f970

Browse files
splitbrainsplitbrain
committed
updated kissifrot/php-ixr closes dokuwiki#4429 
1 parent 59a6ba9 commit 934f970

File tree

12 files changed

+57
-38
lines changed

12 files changed

+57
-38
lines changed

‎composer.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/autoload.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';

‎vendor/composer/InstalledVersions.php‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
@@ -322,6 +328,18 @@ public static function reload($data)
322328
self::$installedIsLocalDir = false;
323329
}
324330

331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
341+
}
342+
325343
/**
326344
* @return array[]
327345
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
@@ -336,7 +354,7 @@ private static function getInstalled()
336354
$copiedLocalDir = false;
337355

338356
if (self::$canGetVendors) {
339-
$selfDir = strtr(__DIR__, '\\', '/');
357+
$selfDir = self::getSelfDir();
340358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341359
$vendorDir = strtr($vendorDir, '\\', '/');
342360
if (isset(self::$installedByVendor[$vendorDir])) {

‎vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@
9696
},
9797
{
9898
"name": "kissifrot/php-ixr",
99-
"version": "1.8.4",
100-
"version_normalized": "1.8.4.0",
99+
"version": "1.8.5",
100+
"version_normalized": "1.8.5.0",
101101
"source": {
102102
"type": "git",
103103
"url": "https://github.com/kissifrot/php-ixr.git",
104-
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4"
104+
"reference": "17c5bc99f42fa086620a0ad2a593366ff6798753"
105105
},
106106
"dist": {
107107
"type": "zip",
108-
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
109-
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
108+
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/17c5bc99f42fa086620a0ad2a593366ff6798753",
109+
"reference": "17c5bc99f42fa086620a0ad2a593366ff6798753",
110110
"shasum": ""
111111
},
112112
"require": {
@@ -116,7 +116,7 @@
116116
"require-dev": {
117117
"phpunit/phpunit": "^8.0"
118118
},
119-
"time": "2023-04-15T08:50:43+00:00",
119+
"time": "2025-04-22T07:42:43+00:00",
120120
"type": "library",
121121
"installation-source": "dist",
122122
"autoload": {
@@ -145,7 +145,7 @@
145145
],
146146
"support": {
147147
"issues": "https://github.com/kissifrot/php-ixr/issues",
148-
"source": "https://github.com/kissifrot/php-ixr/tree/1.8.4"
148+
"source": "https://github.com/kissifrot/php-ixr/tree/1.8.5"
149149
},
150150
"install-path": "../kissifrot/php-ixr"
151151
},

‎vendor/composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'dokuwiki/dokuwiki',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '2ee6c32db8425e90b058cc4532511ffd71f65087',
6+
'reference' => '59a6ba95c8c7b11b3a1e341c41942ec083784be0',
77
'type' => 'project',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -22,7 +22,7 @@
2222
'dokuwiki/dokuwiki' => array(
2323
'pretty_version' => 'dev-master',
2424
'version' => 'dev-master',
25-
'reference' => '2ee6c32db8425e90b058cc4532511ffd71f65087',
25+
'reference' => '59a6ba95c8c7b11b3a1e341c41942ec083784be0',
2626
'type' => 'project',
2727
'install_path' => __DIR__ . '/../../',
2828
'aliases' => array(),
@@ -41,9 +41,9 @@
4141
'dev_requirement' => false,
4242
),
4343
'kissifrot/php-ixr' => array(
44-
'pretty_version' => '1.8.4',
45-
'version' => '1.8.4.0',
46-
'reference' => '45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4',
44+
'pretty_version' => '1.8.5',
45+
'version' => '1.8.5.0',
46+
'reference' => '17c5bc99f42fa086620a0ad2a593366ff6798753',
4747
'type' => 'library',
4848
'install_path' => __DIR__ . '/../kissifrot/php-ixr',
4949
'aliases' => array(),

‎vendor/kissifrot/php-ixr/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
#Incutio XML-RPC library (IXR)
1+
# Incutio XML-RPC library (IXR)
22

33
**Note**: _This is a fork of the original Incutio XML-RPC library (IXR) SVN repo hosted on <https://code.google.com/p/php-ixr/>_
44

55
All credits go to Incutio.
66

77
**Docs and Homepage:** <http://scripts.incutio.com/xmlrpc/>
88

9-
#Introduction
9+
## Introduction
1010

1111
The Incutio XML-RPC library (IXR) is designed primarily for ease of use. It incorporates both client and server classes, and is designed to hide as much of the workings of XML-RPC from the user as possible. A key feature of the library is automatic type conversion from PHP types to XML-RPC types and vice versa. This should enable developers to write web services with very little knowledge of the underlying XML-RPC standard.
1212

13-
Don't however be fooled by it's simple surface. The library includes a wide variety of additional XML-RPC specifications and has all of the features required for serious web service implementations.
13+
Don't however be fooled by its simple surface. The library includes a wide variety of additional XML-RPC specifications and has all the features required for serious web service implementations.
1414

15-
#Background / History
15+
## Background / History
1616

1717
The original XML-RPC library was developed back in 2002 and updated through 2010 by Incutio for a number of projects the company was working on at the time. It has become fairly dated but is still used extensively by a wide range of commercial and open-source projects.
1818
This fork makes it usable on more recent systems (PHP 5.4+ ones)
1919

20-
#Composer
20+
## Composer
2121

2222
A [Composer](http://getcomposer.org/) file has been added to this repository.
2323

@@ -34,4 +34,4 @@ This package is published to [Packagist](https://packagist.org/), but if you don
3434
"kissifrot/php-ixr": "1.8.*"
3535
}
3636

37-
To your composer.json file
37+
To your `composer.json` file

‎vendor/kissifrot/php-ixr/src/Client/Client.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ public function getTimeoutIo()
200200
/**
201201
* Sets the timeout for data transfer
202202
* @param int $timeout_io
203-
* @return $this
204203
*/
205204
public function setTimeoutIo($timeout_io)
206205
{

‎vendor/kissifrot/php-ixr/src/Client/ClientSSL.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function query()
194194
curl_close($curl);
195195

196196
// Check for 200 Code in $contents
197-
if (!strstr($contents, '200 OK')) {
197+
if (!strstr($contents, '200 OK') && !strstr($contents, 'HTTP/2 200')) {
198198
//There was no "200 OK" returned - we failed
199199
return $this->handleError(-32300, 'transport error - HTTP status code was not 200');
200200
}

‎vendor/kissifrot/php-ixr/src/DataType/Value.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function getXml()
102102
}
103103

104104
/**
105-
* Checks whether or not the supplied array is a struct or not
105+
* Checks whether the supplied array is a struct or not
106106
*
107107
* @param array $array
108108
* @return boolean

‎vendor/kissifrot/php-ixr/src/Message/Message.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ public function parse()
6565
// Set XML parser to take the case of tags in to account
6666
xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
6767
// Set XML parser callback functions
68-
xml_set_object($this->_parser, $this);
69-
xml_set_element_handler($this->_parser, 'tagOpen', 'tagClose');
70-
xml_set_character_data_handler($this->_parser, 'cdata');
68+
xml_set_element_handler($this->_parser, [$this, 'tagOpen'], [$this, 'tagClose']);
69+
xml_set_character_data_handler($this->_parser, [$this, 'cdata']);
7170
$chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages
7271
$final = false;
7372
do {
@@ -110,7 +109,7 @@ public function tagOpen($parser, $tag, $attr)
110109
$this->messageType = $tag;
111110
break;
112111
/* Deal with stacks of arrays and structs */
113-
case 'data': // data is to all intents and puposes more interesting than array
112+
case 'data': // data is to all intents and purposes more interesting than array
114113
$this->_arraystructstypes[] = 'array';
115114
$this->_arraystructs[] = [];
116115
break;
@@ -201,7 +200,7 @@ public function tagClose($parser, $tag)
201200
$this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
202201
}
203202
} else {
204-
// Just add as a paramater
203+
// Just add as a parameter
205204
$this->params[] = $value;
206205
}
207206
}

0 commit comments

Comments
 (0)