Skip to content

Commit e3123f6

Browse files
authored
Merge pull request #2037 from nextcloud/dependabot/composer/stable31/icewind/streams-0.7.8
build(deps): Bump icewind/streams from 0.7.7 to 0.7.8
2 parents 1145cdd + 7d1ec7d commit e3123f6

31 files changed

+457
-161
lines changed

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';

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"giggsey/libphonenumber-for-php-lite": "^8.13.48",
3030
"guzzlehttp/guzzle": "^7.9.2",
3131
"icewind/searchdav": "^3.1.0",
32-
"icewind/streams": "^0.7.7",
32+
"icewind/streams": "^0.7.8",
3333
"kornrunner/blurhash": "^1.2",
3434
"laravel/serializable-closure": "^1.3.5",
3535
"mexitek/phpcolors": "^1.0",

composer.lock

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

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])) {

composer/installed.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,17 +1573,17 @@
15731573
},
15741574
{
15751575
"name": "icewind/streams",
1576-
"version": "v0.7.7",
1577-
"version_normalized": "0.7.7.0",
1576+
"version": "v0.7.8",
1577+
"version_normalized": "0.7.8.0",
15781578
"source": {
15791579
"type": "git",
15801580
"url": "https://github.com/icewind1991/Streams.git",
1581-
"reference": "64200fd7cfcc7f550c3c695c48d8fd8bba97fecb"
1581+
"reference": "cb2bd3ed41b516efb97e06e8da35a12ef58ba48b"
15821582
},
15831583
"dist": {
15841584
"type": "zip",
1585-
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/64200fd7cfcc7f550c3c695c48d8fd8bba97fecb",
1586-
"reference": "64200fd7cfcc7f550c3c695c48d8fd8bba97fecb",
1585+
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/cb2bd3ed41b516efb97e06e8da35a12ef58ba48b",
1586+
"reference": "cb2bd3ed41b516efb97e06e8da35a12ef58ba48b",
15871587
"shasum": ""
15881588
},
15891589
"require": {
@@ -1594,7 +1594,7 @@
15941594
"phpstan/phpstan": "^0.12",
15951595
"phpunit/phpunit": "^9"
15961596
},
1597-
"time": "2023-03-16T14:52:25+00:00",
1597+
"time": "2024-12-05T14:36:22+00:00",
15981598
"type": "library",
15991599
"installation-source": "dist",
16001600
"autoload": {
@@ -1615,7 +1615,7 @@
16151615
"description": "A set of generic stream wrappers",
16161616
"support": {
16171617
"issues": "https://github.com/icewind1991/Streams/issues",
1618-
"source": "https://github.com/icewind1991/Streams/tree/v0.7.7"
1618+
"source": "https://github.com/icewind1991/Streams/tree/v0.7.8"
16191619
},
16201620
"install-path": "../icewind/streams"
16211621
},

composer/installed.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@
191191
'dev_requirement' => false,
192192
),
193193
'icewind/streams' => array(
194-
'pretty_version' => 'v0.7.7',
195-
'version' => '0.7.7.0',
196-
'reference' => '64200fd7cfcc7f550c3c695c48d8fd8bba97fecb',
194+
'pretty_version' => 'v0.7.8',
195+
'version' => '0.7.8.0',
196+
'reference' => 'cb2bd3ed41b516efb97e06e8da35a12ef58ba48b',
197197
'type' => 'library',
198198
'install_path' => __DIR__ . '/../icewind/streams',
199199
'aliases' => array(),

composer/platform_check.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
2020
}
2121
}
22-
trigger_error(
23-
'Composer detected issues in your platform: ' . implode(' ', $issues),
24-
E_USER_ERROR
22+
throw new \RuntimeException(
23+
'Composer detected issues in your platform: ' . implode(' ', $issues)
2524
);
2625
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2015 Robin Appelman
1+
Copyright (c) 2015 Robin Appelman <[email protected]>
42

53
Permission is hereby granted, free of charge, to any person obtaining a copy
64
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)