Skip to content

Commit 4524f08

Browse files
come-nccome-nc
committed
Bump mlocati/ip-lib to 1.18 in stable23
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 4b599a2 commit 4524f08

28 files changed

+4610
-7
lines changed

‎autoload.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,21 @@
33
// autoload.php @generated by Composer
44

55
if (PHP_VERSION_ID < 50600) {
6-
echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
7-
exit(1);
6+
if (!headers_sent()) {
7+
header('HTTP/1.1 500 Internal Server Error');
8+
}
9+
$err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
10+
if (!ini_get('display_errors')) {
11+
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
12+
fwrite(STDERR, $err);
13+
} elseif (!headers_sent()) {
14+
echo $err;
15+
}
16+
}
17+
trigger_error(
18+
$err,
19+
E_USER_ERROR
20+
);
821
}
922

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

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"icewind/searchdav": "^2.0.0",
3131
"icewind/streams": "v0.7.5",
3232
"microsoft/azure-storage-blob": "^1.5",
33+
"mlocati/ip-lib": "^1.18",
3334
"nextcloud/lognormalizer": "^1.0",
3435
"nikic/php-parser": "^4.2",
3536
"opis/closure": "^3.6",

‎composer.lock‎

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

‎composer/autoload_classmap.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,22 @@
14421442
'ID3Parser\\getID3\\getid3_exception' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_exception.php',
14431443
'ID3Parser\\getID3\\getid3_handler' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_handler.php',
14441444
'ID3Parser\\getID3\\getid3_lib' => $vendorDir . '/christophwurst/id3parser/src/getID3/getid3_lib.php',
1445+
'IPLib\\Address\\AddressInterface' => $vendorDir . '/mlocati/ip-lib/src/Address/AddressInterface.php',
1446+
'IPLib\\Address\\AssignedRange' => $vendorDir . '/mlocati/ip-lib/src/Address/AssignedRange.php',
1447+
'IPLib\\Address\\IPv4' => $vendorDir . '/mlocati/ip-lib/src/Address/IPv4.php',
1448+
'IPLib\\Address\\IPv6' => $vendorDir . '/mlocati/ip-lib/src/Address/IPv6.php',
1449+
'IPLib\\Address\\Type' => $vendorDir . '/mlocati/ip-lib/src/Address/Type.php',
1450+
'IPLib\\Factory' => $vendorDir . '/mlocati/ip-lib/src/Factory.php',
1451+
'IPLib\\ParseStringFlag' => $vendorDir . '/mlocati/ip-lib/src/ParseStringFlag.php',
1452+
'IPLib\\Range\\AbstractRange' => $vendorDir . '/mlocati/ip-lib/src/Range/AbstractRange.php',
1453+
'IPLib\\Range\\Pattern' => $vendorDir . '/mlocati/ip-lib/src/Range/Pattern.php',
1454+
'IPLib\\Range\\RangeInterface' => $vendorDir . '/mlocati/ip-lib/src/Range/RangeInterface.php',
1455+
'IPLib\\Range\\Single' => $vendorDir . '/mlocati/ip-lib/src/Range/Single.php',
1456+
'IPLib\\Range\\Subnet' => $vendorDir . '/mlocati/ip-lib/src/Range/Subnet.php',
1457+
'IPLib\\Range\\Type' => $vendorDir . '/mlocati/ip-lib/src/Range/Type.php',
1458+
'IPLib\\Service\\BinaryMath' => $vendorDir . '/mlocati/ip-lib/src/Service/BinaryMath.php',
1459+
'IPLib\\Service\\RangesFromBoundaryCalculator' => $vendorDir . '/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php',
1460+
'IPLib\\Service\\UnsignedIntegerMath' => $vendorDir . '/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php',
14451461
'Icewind\\Streams\\CallbackWrapper' => $vendorDir . '/icewind/streams/src/CallbackWrapper.php',
14461462
'Icewind\\Streams\\CountWrapper' => $vendorDir . '/icewind/streams/src/CountWrapper.php',
14471463
'Icewind\\Streams\\Directory' => $vendorDir . '/icewind/streams/src/Directory.php',

‎composer/autoload_psr4.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
6464
'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'),
6565
'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
66+
'IPLib\\' => array($vendorDir . '/mlocati/ip-lib/src'),
6667
'ID3Parser\\' => array($vendorDir . '/christophwurst/id3parser/src'),
6768
'Http\\Promise\\' => array($vendorDir . '/php-http/promise/src'),
6869
'Http\\Client\\' => array($vendorDir . '/php-http/httplug/src'),

‎composer/autoload_static.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
231231
'I' =>
232232
array (
233233
'Icewind\\Streams\\' => 16,
234+
'IPLib\\' => 6,
234235
'ID3Parser\\' => 10,
235236
),
236237
'H' =>
@@ -514,6 +515,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
514515
array (
515516
0 => __DIR__ . '/..' . '/icewind/streams/src',
516517
),
518+
'IPLib\\' =>
519+
array (
520+
0 => __DIR__ . '/..' . '/mlocati/ip-lib/src',
521+
),
517522
'ID3Parser\\' =>
518523
array (
519524
0 => __DIR__ . '/..' . '/christophwurst/id3parser/src',
@@ -2073,6 +2078,22 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
20732078
'ID3Parser\\getID3\\getid3_exception' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_exception.php',
20742079
'ID3Parser\\getID3\\getid3_handler' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_handler.php',
20752080
'ID3Parser\\getID3\\getid3_lib' => __DIR__ . '/..' . '/christophwurst/id3parser/src/getID3/getid3_lib.php',
2081+
'IPLib\\Address\\AddressInterface' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/AddressInterface.php',
2082+
'IPLib\\Address\\AssignedRange' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/AssignedRange.php',
2083+
'IPLib\\Address\\IPv4' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/IPv4.php',
2084+
'IPLib\\Address\\IPv6' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/IPv6.php',
2085+
'IPLib\\Address\\Type' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Address/Type.php',
2086+
'IPLib\\Factory' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Factory.php',
2087+
'IPLib\\ParseStringFlag' => __DIR__ . '/..' . '/mlocati/ip-lib/src/ParseStringFlag.php',
2088+
'IPLib\\Range\\AbstractRange' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/AbstractRange.php',
2089+
'IPLib\\Range\\Pattern' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Pattern.php',
2090+
'IPLib\\Range\\RangeInterface' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/RangeInterface.php',
2091+
'IPLib\\Range\\Single' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Single.php',
2092+
'IPLib\\Range\\Subnet' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Subnet.php',
2093+
'IPLib\\Range\\Type' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Range/Type.php',
2094+
'IPLib\\Service\\BinaryMath' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/BinaryMath.php',
2095+
'IPLib\\Service\\RangesFromBoundaryCalculator' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/RangesFromBoundaryCalculator.php',
2096+
'IPLib\\Service\\UnsignedIntegerMath' => __DIR__ . '/..' . '/mlocati/ip-lib/src/Service/UnsignedIntegerMath.php',
20762097
'Icewind\\Streams\\CallbackWrapper' => __DIR__ . '/..' . '/icewind/streams/src/CallbackWrapper.php',
20772098
'Icewind\\Streams\\CountWrapper' => __DIR__ . '/..' . '/icewind/streams/src/CountWrapper.php',
20782099
'Icewind\\Streams\\Directory' => __DIR__ . '/..' . '/icewind/streams/src/Directory.php',

‎composer/installed.json‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2094,6 +2094,80 @@
20942094
},
20952095
"install-path": "../microsoft/azure-storage-common"
20962096
},
2097+
{
2098+
"name": "mlocati/ip-lib",
2099+
"version": "1.18.0",
2100+
"version_normalized": "1.18.0.0",
2101+
"source": {
2102+
"type": "git",
2103+
"url": "https://github.com/mlocati/ip-lib.git",
2104+
"reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2"
2105+
},
2106+
"dist": {
2107+
"type": "zip",
2108+
"url": "https://api.github.com/repos/mlocati/ip-lib/zipball/c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2",
2109+
"reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2",
2110+
"shasum": ""
2111+
},
2112+
"require": {
2113+
"php": ">=5.3.3"
2114+
},
2115+
"require-dev": {
2116+
"ext-pdo_sqlite": "*",
2117+
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.5 || ^9.5"
2118+
},
2119+
"time": "2022-01-13T18:05:33+00:00",
2120+
"type": "library",
2121+
"installation-source": "dist",
2122+
"autoload": {
2123+
"psr-4": {
2124+
"IPLib\\": "src/"
2125+
}
2126+
},
2127+
"notification-url": "https://packagist.org/downloads/",
2128+
"license": [
2129+
"MIT"
2130+
],
2131+
"authors": [
2132+
{
2133+
"name": "Michele Locati",
2134+
"email": "mlocati@gmail.com",
2135+
"homepage": "https://github.com/mlocati",
2136+
"role": "Author"
2137+
}
2138+
],
2139+
"description": "Handle IPv4, IPv6 addresses and ranges",
2140+
"homepage": "https://github.com/mlocati/ip-lib",
2141+
"keywords": [
2142+
"IP",
2143+
"address",
2144+
"addresses",
2145+
"ipv4",
2146+
"ipv6",
2147+
"manage",
2148+
"managing",
2149+
"matching",
2150+
"network",
2151+
"networking",
2152+
"range",
2153+
"subnet"
2154+
],
2155+
"support": {
2156+
"issues": "https://github.com/mlocati/ip-lib/issues",
2157+
"source": "https://github.com/mlocati/ip-lib/tree/1.18.0"
2158+
},
2159+
"funding": [
2160+
{
2161+
"url": "https://github.com/sponsors/mlocati",
2162+
"type": "github"
2163+
},
2164+
{
2165+
"url": "https://paypal.me/mlocati",
2166+
"type": "other"
2167+
}
2168+
],
2169+
"install-path": "../mlocati/ip-lib"
2170+
},
20972171
{
20982172
"name": "mtdowling/jmespath.php",
20992173
"version": "2.6.1",
@@ -6361,6 +6435,6 @@
63616435
"install-path": "../web-auth/webauthn-lib"
63626436
}
63636437
],
6364-
"dev": true,
6438+
"dev": false,
63656439
"dev-package-names": []
63666440
}

‎composer/installed.php‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
'name' => 'nextcloud/3rdparty',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '8f9c6c1160f8e484c5b46b233f84a372655d6285',
6+
'reference' => '4b599a26731b0399c231c33a200cc12cb2e2031e',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../',
99
'aliases' => array(),
10-
'dev' => true,
10+
'dev' => false,
1111
),
1212
'versions' => array(
1313
'aws/aws-sdk-php' => array(
@@ -271,6 +271,15 @@
271271
'aliases' => array(),
272272
'dev_requirement' => false,
273273
),
274+
'mlocati/ip-lib' => array(
275+
'pretty_version' => '1.18.0',
276+
'version' => '1.18.0.0',
277+
'reference' => 'c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2',
278+
'type' => 'library',
279+
'install_path' => __DIR__ . '/../mlocati/ip-lib',
280+
'aliases' => array(),
281+
'dev_requirement' => false,
282+
),
274283
'mtdowling/jmespath.php' => array(
275284
'pretty_version' => '2.6.1',
276285
'version' => '2.6.1.0',
@@ -283,7 +292,7 @@
283292
'nextcloud/3rdparty' => array(
284293
'pretty_version' => 'dev-master',
285294
'version' => 'dev-master',
286-
'reference' => '8f9c6c1160f8e484c5b46b233f84a372655d6285',
295+
'reference' => '4b599a26731b0399c231c33a200cc12cb2e2031e',
287296
'type' => 'library',
288297
'install_path' => __DIR__ . '/../',
289298
'aliases' => array(),

‎mlocati/ip-lib/LICENSE.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
The MIT License (MIT)
2+
Copyright (c) 2016 Michele Locati
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished
9+
to do so, subject to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
THE SOFTWARE.

0 commit comments

Comments
 (0)