opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

updated composer dependencies 

updates may also be caused by the php platform version increase in the last
commit
This commit is contained in:
Andreas Gohr 2023-06-09 21:13:23 +02:00
parent c49393f5a4
commit 64d8abdb11
17 changed files with 95 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
composer.lock generated
View File

@ -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": "00aee16ef6d6262e150632ca5e0db38d",
"content-hash": "794f2c88f3e346320887dba9fd7a9cd1",
"packages": [
{
"name": "aziraphale/email-address-validator",
@ -100,25 +100,30 @@
},
{
"name": "kissifrot/php-ixr",
"version": "1.8.3",
"version": "1.8.4",
"source": {
"type": "git",
"url": "https://github.com/kissifrot/php-ixr.git",
"reference": "4477cd1a67416ce5b6a2080f9a79d9eb50a965c1"
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/4477cd1a67416ce5b6a2080f9a79d9eb50a965c1",
"reference": "4477cd1a67416ce5b6a2080f9a79d9eb50a965c1",
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
"shasum": ""
},
"require": {
"ext-xml": "*",
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0"
},
"type": "library",
"autoload": {
"psr-4": {
"IXR\\": "src/"
"IXR\\": "src/",
"IXR\\tests\\": "tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -141,9 +146,9 @@
],
"support": {
"issues": "https://github.com/kissifrot/php-ixr/issues",
"source": "https://github.com/kissifrot/php-ixr/tree/master"
"source": "https://github.com/kissifrot/php-ixr/tree/1.8.4"
},
"time": "2016-11-17T12:00:18+00:00"
"time": "2023-04-15T08:50:43+00:00"
},
{
"name": "marcusschwarz/lesserphp",
@ -201,23 +206,23 @@
},
{
"name": "openpsa/universalfeedcreator",
"version": "v1.8.4.1",
"version": "v1.8.5",
"source": {
"type": "git",
"url": "https://github.com/flack/UniversalFeedCreator.git",
"reference": "e4736a68eef454a83acd100230a2e15b424f899f"
"reference": "d07a9f54e4fe522d8fefaf99564efd675932a635"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/flack/UniversalFeedCreator/zipball/e4736a68eef454a83acd100230a2e15b424f899f",
"reference": "e4736a68eef454a83acd100230a2e15b424f899f",
"url": "https://api.github.com/repos/flack/UniversalFeedCreator/zipball/d07a9f54e4fe522d8fefaf99564efd675932a635",
"reference": "d07a9f54e4fe522d8fefaf99564efd675932a635",
"shasum": ""
},
"require": {
"php": ">=5.0"
"php": ">=5.2"
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.32 || ^9.5.10"
},
"type": "library",
"autoload": {
@ -250,9 +255,9 @@
],
"support": {
"issues": "https://github.com/flack/UniversalFeedCreator/issues",
"source": "https://github.com/flack/UniversalFeedCreator/tree/v1.8.4.1"
"source": "https://github.com/flack/UniversalFeedCreator/tree/v1.8.5"
},
"time": "2022-04-04T10:02:43+00:00"
"time": "2023-04-17T12:24:35+00:00"
},
{
"name": "phpseclib/phpseclib",
@ -666,12 +671,12 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=7.2",
"php": ">=7.4",
"ext-json": "*"
},
"platform-dev": [],
"platform-overrides": {
"php": "7.2"
"php": "7.4"
},
"plugin-api-version": "2.3.0"
}

1
vendor/composer/autoload_psr4.php vendored
View File

@ -14,5 +14,6 @@ return array(
'splitbrain\\JSStrip\\' => array($vendorDir . '/splitbrain/php-jsstrip/src'),
'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'SimplePie\\' => array($vendorDir . '/simplepie/simplepie/src'),
'IXR\\tests\\' => array($vendorDir . '/kissifrot/php-ixr/tests'),
'IXR\\' => array($vendorDir . '/kissifrot/php-ixr/src'),
);

5
vendor/composer/autoload_static.php vendored
View File

@ -31,6 +31,7 @@ class ComposerStaticInita19a915ee98347a0c787119619d2ff9b
),
'I' =>
array (
'IXR\\tests\\' => 10,
'IXR\\' => 4,
),
);
@ -68,6 +69,10 @@ class ComposerStaticInita19a915ee98347a0c787119619d2ff9b
array (
0 => __DIR__ . '/..' . '/simplepie/simplepie/src',
),
'IXR\\tests\\' =>
array (
0 => __DIR__ . '/..' . '/kissifrot/php-ixr/tests',
),
'IXR\\' =>
array (
0 => __DIR__ . '/..' . '/kissifrot/php-ixr/src',

39
vendor/composer/installed.json vendored
View File

@ -96,28 +96,33 @@
},
{
"name": "kissifrot/php-ixr",
"version": "1.8.3",
"version_normalized": "1.8.3.0",
"version": "1.8.4",
"version_normalized": "1.8.4.0",
"source": {
"type": "git",
"url": "https://github.com/kissifrot/php-ixr.git",
"reference": "4477cd1a67416ce5b6a2080f9a79d9eb50a965c1"
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/4477cd1a67416ce5b6a2080f9a79d9eb50a965c1",
"reference": "4477cd1a67416ce5b6a2080f9a79d9eb50a965c1",
"url": "https://api.github.com/repos/kissifrot/php-ixr/zipball/45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
"reference": "45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4",
"shasum": ""
},
"require": {
"ext-xml": "*",
"php": ">=5.4.0"
},
"time": "2016-11-17T12:00:18+00:00",
"require-dev": {
"phpunit/phpunit": "^8.0"
},
"time": "2023-04-15T08:50:43+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"IXR\\": "src/"
"IXR\\": "src/",
"IXR\\tests\\": "tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -140,7 +145,7 @@
],
"support": {
"issues": "https://github.com/kissifrot/php-ixr/issues",
"source": "https://github.com/kissifrot/php-ixr/tree/master"
"source": "https://github.com/kissifrot/php-ixr/tree/1.8.4"
},
"install-path": "../kissifrot/php-ixr"
},
@ -203,26 +208,26 @@
},
{
"name": "openpsa/universalfeedcreator",
"version": "v1.8.4.1",
"version_normalized": "1.8.4.1",
"version": "v1.8.5",
"version_normalized": "1.8.5.0",
"source": {
"type": "git",
"url": "https://github.com/flack/UniversalFeedCreator.git",
"reference": "e4736a68eef454a83acd100230a2e15b424f899f"
"reference": "d07a9f54e4fe522d8fefaf99564efd675932a635"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/flack/UniversalFeedCreator/zipball/e4736a68eef454a83acd100230a2e15b424f899f",
"reference": "e4736a68eef454a83acd100230a2e15b424f899f",
"url": "https://api.github.com/repos/flack/UniversalFeedCreator/zipball/d07a9f54e4fe522d8fefaf99564efd675932a635",
"reference": "d07a9f54e4fe522d8fefaf99564efd675932a635",
"shasum": ""
},
"require": {
"php": ">=5.0"
"php": ">=5.2"
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.32 || ^9.5.10"
},
"time": "2022-04-04T10:02:43+00:00",
"time": "2023-04-17T12:24:35+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -255,7 +260,7 @@
],
"support": {
"issues": "https://github.com/flack/UniversalFeedCreator/issues",
"source": "https://github.com/flack/UniversalFeedCreator/tree/v1.8.4.1"
"source": "https://github.com/flack/UniversalFeedCreator/tree/v1.8.5"
},
"install-path": "../openpsa/universalfeedcreator"
},

24
vendor/composer/installed.php vendored
View File

@ -1,9 +1,9 @@
<?php return array(
'root' => array(
'name' => 'dokuwiki/dokuwiki',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => NULL,
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'c49393f5a41e965f91b93a952237fb4e22ef796d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@ -20,9 +20,9 @@
'dev_requirement' => false,
),
'dokuwiki/dokuwiki' => array(
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => NULL,
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'c49393f5a41e965f91b93a952237fb4e22ef796d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@ -41,9 +41,9 @@
'dev_requirement' => false,
),
'kissifrot/php-ixr' => array(
'pretty_version' => '1.8.3',
'version' => '1.8.3.0',
'reference' => '4477cd1a67416ce5b6a2080f9a79d9eb50a965c1',
'pretty_version' => '1.8.4',
'version' => '1.8.4.0',
'reference' => '45f6e4d46c1f9bb49e41a1787b6bdbcc9ab788e4',
'type' => 'library',
'install_path' => __DIR__ . '/../kissifrot/php-ixr',
'aliases' => array(),
@ -59,9 +59,9 @@
'dev_requirement' => false,
),
'openpsa/universalfeedcreator' => array(
'pretty_version' => 'v1.8.4.1',
'version' => '1.8.4.1',
'reference' => 'e4736a68eef454a83acd100230a2e15b424f899f',
'pretty_version' => 'v1.8.5',
'version' => '1.8.5.0',
'reference' => 'd07a9f54e4fe522d8fefaf99564efd675932a635',
'type' => 'library',
'install_path' => __DIR__ . '/../openpsa/universalfeedcreator',
'aliases' => array(),

4
vendor/composer/platform_check.php vendored
View File

@ -4,8 +4,8 @@
$issues = array();
if (!(PHP_VERSION_ID >= 70200)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
if (!(PHP_VERSION_ID >= 70400)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.';
}
if ($issues) {

8
vendor/kissifrot/php-ixr/.editorconfig vendored
View File

@ -1,8 +0,0 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true

6
vendor/kissifrot/php-ixr/.gitignore vendored
View File

@ -1,6 +0,0 @@
.project
.idea
.vscode
.phpunit.result.cache
composer.lock
vendor

3
vendor/kissifrot/php-ixr/src/Message/Error.php vendored
View File

@ -20,7 +20,7 @@ class Error
public function getXml()
{
$xml = <<<EOD
return <<<EOD
<methodResponse>
<fault>
<value>
@ -38,6 +38,5 @@ class Error
</fault>
</methodResponse>
EOD;
return $xml;
}
}

2
vendor/kissifrot/php-ixr/src/Message/Message.php vendored
View File

@ -102,7 +102,7 @@ class Message
public function tagOpen($parser, $tag, $attr)
{
$this->_currentTagContents = '';
$this->currentTag = $tag;
$this->_currentTag = $tag;
switch ($tag) {
case 'methodCall':
case 'methodResponse':

4
vendor/openpsa/universalfeedcreator/composer.json vendored
View File

@ -12,13 +12,13 @@
}
],
"require": {
"php": ">=5.0"
"php": ">=5.2"
},
"autoload": {
"classmap": ["lib"],
"files": ["lib/constants.php"]
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.32 || ^9.5.10"
}
}

14
vendor/openpsa/universalfeedcreator/lib/Creator/AtomCreator10.php vendored
View File

@ -41,10 +41,10 @@ class AtomCreator10 extends FeedCreator
$feed .= " xml:lang=\"".$this->language."\"";
}
$feed .= ">\n";
$feed .= " <title>".htmlspecialchars($this->title)."</title>\n";
$feed .= " <title>".htmlspecialchars((string) $this->title)."</title>\n";
$feed .= " <subtitle>".htmlspecialchars($this->description)."</subtitle>\n";
$feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
$feed .= " <id>".htmlspecialchars($this->link)."</id>\n";
$feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars((string) $this->link)."\"/>\n";
$feed .= " <id>".htmlspecialchars((string) $this->link)."</id>\n";
$now = new FeedDate();
$feed .= " <updated>".htmlspecialchars($now->iso8601())."</updated>\n";
if ($this->editor != "") {
@ -65,14 +65,14 @@ class AtomCreator10 extends FeedCreator
$feed .= " <generator>".$this->version()."</generator>\n";
$feed .= " <link rel=\"self\" type=\"application/atom+xml\" href=\"".htmlspecialchars(
$this->syndicationURL
(string) $this->syndicationURL
)."\" />\n";
$feed .= $this->_createAdditionalElements($this->additionalElements, " ");
for ($i = 0; $i < count($this->items); $i++) {
$feed .= " <entry>\n";
$feed .= " <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
$feed .= " <title>".htmlspecialchars(strip_tags((string) $this->items[$i]->title))."</title>\n";
$feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars(
$this->items[$i]->link
(string) $this->items[$i]->link
)."\"/>\n";
if ($this->items[$i]->date == "") {
$this->items[$i]->date = time();
@ -86,7 +86,7 @@ class AtomCreator10 extends FeedCreator
$tempguid = $this->items[$i]->guid;
}
$feed .= " <id>".htmlspecialchars($tempguid)."</id>\n";
$feed .= " <id>".htmlspecialchars((string) $tempguid)."</id>\n";
$feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, " ");
if ($this->items[$i]->author != "") {
$feed .= " <author>\n";

1
vendor/openpsa/universalfeedcreator/lib/Creator/FeedCreator.php vendored
View File

@ -27,6 +27,7 @@ abstract class FeedCreator extends HtmlDescribable
*/
public $xslStyleSheet = "";
public $cssStyleSheet = "";
/** @var FeedItem[] */
public $items = Array();

6
vendor/openpsa/universalfeedcreator/lib/Creator/RSSCreator091.php vendored
View File

@ -56,7 +56,7 @@ class RSSCreator091 extends FeedCreator
} else {
$feed .= " <channel>\n";
}
$feed .= " <title>".FeedCreator::iTrunc(htmlspecialchars($this->title), 100)."</title>\n";
$feed .= " <title>".FeedCreator::iTrunc(htmlspecialchars((string) $this->title), 100)."</title>\n";
$this->descriptionTruncSize = 500;
$feed .= " <description>".$this->getDescription()."</description>\n";
$feed .= " <link>".$this->link."</link>\n";
@ -130,10 +130,10 @@ class RSSCreator091 extends FeedCreator
for ($i = 0; $i < count($this->items); $i++) {
$feed .= " <item>\n";
$feed .= " <title>".FeedCreator::iTrunc(
htmlspecialchars(strip_tags($this->items[$i]->title)),
htmlspecialchars(strip_tags((string) $this->items[$i]->title)),
100
)."</title>\n";
$feed .= " <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
$feed .= " <link>".htmlspecialchars((string) $this->items[$i]->link)."</link>\n";
$feed .= " <description>".$this->items[$i]->getDescription()."</description>\n";
$creator = $this->getAuthor($this->items[$i]->author, $this->items[$i]->authorEmail);

14
vendor/openpsa/universalfeedcreator/lib/Creator/RSSCreator10.php vendored
View File

@ -31,8 +31,8 @@ class RSSCreator10 extends FeedCreator
}
$feed .= " xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
$feed .= " <channel rdf:about=\"".$this->syndicationURL."\">\n";
$feed .= " <title>".htmlspecialchars($this->title)."</title>\n";
$feed .= " <description>".htmlspecialchars($this->description)."</description>\n";
$feed .= " <title>".htmlspecialchars((string) $this->title)."</title>\n";
$feed .= " <description>".htmlspecialchars((string) $this->description)."</description>\n";
$feed .= " <link>".$this->link."</link>\n";
if ($this->image != null) {
$feed .= " <image rdf:resource=\"".$this->image->url."\" />\n";
@ -42,7 +42,7 @@ class RSSCreator10 extends FeedCreator
$feed .= " <items>\n";
$feed .= " <rdf:Seq>\n";
for ($i = 0; $i < count($this->items); $i++) {
$feed .= " <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
$feed .= " <rdf:li rdf:resource=\"".htmlspecialchars((string) $this->items[$i]->link)."\"/>\n";
}
$feed .= " </rdf:Seq>\n";
$feed .= " </items>\n";
@ -57,7 +57,7 @@ class RSSCreator10 extends FeedCreator
$feed .= $this->_createAdditionalElements($this->additionalElements, " ");
for ($i = 0; $i < count($this->items); $i++) {
$feed .= " <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
$feed .= " <item rdf:about=\"".htmlspecialchars((string) $this->items[$i]->link)."\">\n";
$feed .= " <dc:format>text/html</dc:format>\n";
if ($this->items[$i]->date != null) {
$itemDate = new FeedDate($this->items[$i]->date);
@ -77,10 +77,10 @@ class RSSCreator10 extends FeedCreator
$feed .= " <photo:thumbnail>".htmlspecialchars($this->items[$i]->thumb)."</photo:thumbnail>\n";
}
$feed .= " <title>".htmlspecialchars(
strip_tags(strtr($this->items[$i]->title, "\n\r", " "))
strip_tags(strtr((string) $this->items[$i]->title, "\n\r", " "))
)."</title>\n";
$feed .= " <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
$feed .= " <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
$feed .= " <link>".htmlspecialchars((string) $this->items[$i]->link)."</link>\n";
$feed .= " <description>".htmlspecialchars((string) $this->items[$i]->description)."</description>\n";
$feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, " ");
$feed .= " </item>\n";
}

68
vendor/openpsa/universalfeedcreator/lib/Element/FeedDate.php vendored
View File

@ -10,7 +10,8 @@ class FeedDate
/**
* Creates a new instance of FeedDate representing a given date.
* Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
* Accepts RFC 822, ISO 8601 date formats (or anything that PHP's DateTime
* can parse, really) as well as unix time stamps.
*
* @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and
* time is used.
@ -23,68 +24,13 @@ class FeedDate
if (is_integer($dateString)) {
$this->unix = $dateString;
return;
}
$tzOffset = 0;
if (preg_match(
"~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",
$dateString,
$matches
)) {
$months = Array(
"Jan" => 1,
"Feb" => 2,
"Mar" => 3,
"Apr" => 4,
"May" => 5,
"Jun" => 6,
"Jul" => 7,
"Aug" => 8,
"Sep" => 9,
"Oct" => 10,
"Nov" => 11,
"Dec" => 12,
);
$this->unix = mktime($matches[4], $matches[5], $matches[6], $months[$matches[2]], $matches[1], $matches[3]);
if (substr($matches[7], 0, 1) == '+' OR substr($matches[7], 0, 1) == '-') {
$tzOffset = (((int)substr($matches[7], 0, 3) * 60) + (int)substr($matches[7], -2)) * 60;
} else {
if (strlen($matches[7]) == 1) {
$oneHour = 3600;
$ord = ord($matches[7]);
if ($ord < ord("M")) {
$tzOffset = (ord("A") - $ord - 1) * $oneHour;
} elseif ($ord >= ord("M") AND $matches[7] != "Z") {
$tzOffset = ($ord - ord("M")) * $oneHour;
} elseif ($matches[7] == "Z") {
$tzOffset = 0;
}
}
switch ($matches[7]) {
case "UT":
case "GMT":
$tzOffset = 0;
}
} else {
try {
$this->unix = (int) (new Datetime($dateString))->format('U');
} catch (Exception $e) {
$this->unix = 0;
}
$this->unix += $tzOffset;
return;
}
if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~", $dateString, $matches)) {
$this->unix = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
if (substr($matches[7], 0, 1) == '+' OR substr($matches[7], 0, 1) == '-') {
$tzOffset = (((int)substr($matches[7], 0, 3) * 60) + (int)substr($matches[7], -2)) * 60;
} else {
if ($matches[7] == "Z") {
$tzOffset = 0;
}
}
$this->unix += $tzOffset;
return;
}
$this->unix = 0;
}
/**

2
vendor/openpsa/universalfeedcreator/lib/UniversalFeedCreator.php vendored
View File

@ -18,7 +18,7 @@ class UniversalFeedCreator extends FeedCreator
*/
protected function _setFormat($format)
{
switch (strtoupper($format)) {
switch (strtoupper((string) $format)) {
case "BASE":
$this->format = $format;