Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
echo $err;
}
}
trigger_error(
$err,
E_USER_ERROR
);
throw new RuntimeException($err);
}

require_once __DIR__ . '/composer/autoload_real.php';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"giggsey/libphonenumber-for-php-lite": "^8.13.48",
"guzzlehttp/guzzle": "^7.9.2",
"icewind/searchdav": "^3.1.0",
"icewind/streams": "^0.7.7",
"icewind/streams": "^0.7.8",
"kornrunner/blurhash": "^1.2",
"laravel/serializable-closure": "^1.3.5",
"mexitek/phpcolors": "^1.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
*/
class InstalledVersions
{
/**
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
* @internal
*/
private static $selfDir = null;

/**
* @var mixed[]|null
* @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
Expand Down Expand Up @@ -322,6 +328,18 @@ public static function reload($data)
self::$installedIsLocalDir = false;
}

/**
* @return string
*/
private static function getSelfDir()
{
if (self::$selfDir === null) {
self::$selfDir = strtr(__DIR__, '\\', '/');
}

return self::$selfDir;
}

/**
* @return array[]
* @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[]}>}>
Expand All @@ -336,7 +354,7 @@ private static function getInstalled()
$copiedLocalDir = false;

if (self::$canGetVendors) {
$selfDir = strtr(__DIR__, '\\', '/');
$selfDir = self::getSelfDir();
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
$vendorDir = strtr($vendorDir, '\\', '/');
if (isset(self::$installedByVendor[$vendorDir])) {
Expand Down
14 changes: 7 additions & 7 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1573,17 +1573,17 @@
},
{
"name": "icewind/streams",
"version": "v0.7.7",
"version_normalized": "0.7.7.0",
"version": "v0.7.8",
"version_normalized": "0.7.8.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/Streams.git",
"reference": "64200fd7cfcc7f550c3c695c48d8fd8bba97fecb"
"reference": "cb2bd3ed41b516efb97e06e8da35a12ef58ba48b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/64200fd7cfcc7f550c3c695c48d8fd8bba97fecb",
"reference": "64200fd7cfcc7f550c3c695c48d8fd8bba97fecb",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/cb2bd3ed41b516efb97e06e8da35a12ef58ba48b",
"reference": "cb2bd3ed41b516efb97e06e8da35a12ef58ba48b",
"shasum": ""
},
"require": {
Expand All @@ -1594,7 +1594,7 @@
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^9"
},
"time": "2023-03-16T14:52:25+00:00",
"time": "2024-12-05T14:36:22+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -1615,7 +1615,7 @@
"description": "A set of generic stream wrappers",
"support": {
"issues": "https://github.com/icewind1991/Streams/issues",
"source": "https://github.com/icewind1991/Streams/tree/v0.7.7"
"source": "https://github.com/icewind1991/Streams/tree/v0.7.8"
},
"install-path": "../icewind/streams"
},
Expand Down
6 changes: 3 additions & 3 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@
'dev_requirement' => false,
),
'icewind/streams' => array(
'pretty_version' => 'v0.7.7',
'version' => '0.7.7.0',
'reference' => '64200fd7cfcc7f550c3c695c48d8fd8bba97fecb',
'pretty_version' => 'v0.7.8',
'version' => '0.7.8.0',
'reference' => 'cb2bd3ed41b516efb97e06e8da35a12ef58ba48b',
'type' => 'library',
'install_path' => __DIR__ . '/../icewind/streams',
'aliases' => array(),
Expand Down
5 changes: 2 additions & 3 deletions composer/platform_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
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;
}
}
trigger_error(
'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR
throw new \RuntimeException(
'Composer detected issues in your platform: ' . implode(' ', $issues)
);
}
4 changes: 1 addition & 3 deletions icewind/streams/LICENCE → icewind/streams/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
The MIT License (MIT)

Copyright (c) 2015 Robin Appelman
Copyright (c) 2015 Robin Appelman <robin@icewind.nl>

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