From a84486aff953564eac060671f9b352263fed4416 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:09:07 +0000 Subject: [PATCH 1/2] build(deps): Bump mlocati/ip-lib from 1.18.0 to 1.18.1 Bumps [mlocati/ip-lib](https://github.com/mlocati/ip-lib) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/mlocati/ip-lib/releases) - [Commits](https://github.com/mlocati/ip-lib/compare/1.18.0...1.18.1) --- updated-dependencies: - dependency-name: mlocati/ip-lib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5e7fa0191..d22137735 100644 --- a/composer.lock +++ b/composer.lock @@ -2028,16 +2028,16 @@ }, { "name": "mlocati/ip-lib", - "version": "1.18.0", + "version": "1.18.1", "source": { "type": "git", "url": "https://github.com/mlocati/ip-lib.git", - "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2" + "reference": "08bb43b4949069c543ebdf099a6b2c322d0172ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2", - "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2", + "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/08bb43b4949069c543ebdf099a6b2c322d0172ab", + "reference": "08bb43b4949069c543ebdf099a6b2c322d0172ab", "shasum": "" }, "require": { @@ -2083,7 +2083,7 @@ ], "support": { "issues": "https://github.com/mlocati/ip-lib/issues", - "source": "https://github.com/mlocati/ip-lib/tree/1.18.0" + "source": "https://github.com/mlocati/ip-lib/tree/1.18.1" }, "funding": [ { @@ -2095,7 +2095,7 @@ "type": "other" } ], - "time": "2022-01-13T18:05:33+00:00" + "time": "2024-10-29T15:44:19+00:00" }, { "name": "mtdowling/jmespath.php", From 8412fe9bad449f1a2691a19502b67765fd5a79c5 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Tue, 5 Nov 2024 06:30:05 +0000 Subject: [PATCH 2/2] chore(autoloader): Dump autoloader Signed-off-by: nextcloud-command --- composer/installed.json | 14 +++++++------- composer/installed.php | 6 +++--- mlocati/ip-lib/src/Factory.php | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer/installed.json b/composer/installed.json index ba494fc7d..7f82b190c 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2109,17 +2109,17 @@ }, { "name": "mlocati/ip-lib", - "version": "1.18.0", - "version_normalized": "1.18.0.0", + "version": "1.18.1", + "version_normalized": "1.18.1.0", "source": { "type": "git", "url": "https://github.com/mlocati/ip-lib.git", - "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2" + "reference": "08bb43b4949069c543ebdf099a6b2c322d0172ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2", - "reference": "c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2", + "url": "https://api.github.com/repos/mlocati/ip-lib/zipball/08bb43b4949069c543ebdf099a6b2c322d0172ab", + "reference": "08bb43b4949069c543ebdf099a6b2c322d0172ab", "shasum": "" }, "require": { @@ -2129,7 +2129,7 @@ "ext-pdo_sqlite": "*", "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.5 || ^9.5" }, - "time": "2022-01-13T18:05:33+00:00", + "time": "2024-10-29T15:44:19+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2167,7 +2167,7 @@ ], "support": { "issues": "https://github.com/mlocati/ip-lib/issues", - "source": "https://github.com/mlocati/ip-lib/tree/1.18.0" + "source": "https://github.com/mlocati/ip-lib/tree/1.18.1" }, "funding": [ { diff --git a/composer/installed.php b/composer/installed.php index a91f90aa9..2c3157c80 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -272,9 +272,9 @@ 'dev_requirement' => false, ), 'mlocati/ip-lib' => array( - 'pretty_version' => '1.18.0', - 'version' => '1.18.0.0', - 'reference' => 'c77bd0b1f3e3956c7e9661e75cb1f54ed67d95d2', + 'pretty_version' => '1.18.1', + 'version' => '1.18.1.0', + 'reference' => '08bb43b4949069c543ebdf099a6b2c322d0172ab', 'type' => 'library', 'install_path' => __DIR__ . '/../mlocati/ip-lib', 'aliases' => array(), diff --git a/mlocati/ip-lib/src/Factory.php b/mlocati/ip-lib/src/Factory.php index 31b21d41f..9338a2d60 100644 --- a/mlocati/ip-lib/src/Factory.php +++ b/mlocati/ip-lib/src/Factory.php @@ -84,17 +84,17 @@ public static function addressFromBytes(array $bytes) * For upgrading: * - if $supportNonDecimalIPv4 is true, use the ParseStringFlag::IPV4_MAYBE_NON_DECIMAL flag * - * @param string|mixed $address + * @param string|mixed $range * @param bool $supportNonDecimalIPv4 * - * @return \IPLib\Address\AddressInterface|null + * @return \IPLib\Range\RangeInterface|null * * @see \IPLib\Factory::parseRangeString() * @since 1.10.0 added the $supportNonDecimalIPv4 argument */ - public static function rangeFromString($address, $supportNonDecimalIPv4 = false) + public static function rangeFromString($range, $supportNonDecimalIPv4 = false) { - return static::parseRangeString($address, $supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0); + return static::parseRangeString($range, $supportNonDecimalIPv4 ? ParseStringFlag::IPV4_MAYBE_NON_DECIMAL : 0); } /** @@ -215,20 +215,20 @@ public static function getRangesFromBoundaries($from, $to, $flags = 0) } /** - * @param \IPLib\Address\AddressInterface $from - * @param \IPLib\Address\AddressInterface $to + * @param \IPLib\Address\AddressInterface|null $from + * @param \IPLib\Address\AddressInterface|null $to * * @return \IPLib\Range\RangeInterface|null * * @since 1.2.0 */ - protected static function rangeFromBoundaryAddresses(AddressInterface $from = null, AddressInterface $to = null) + protected static function rangeFromBoundaryAddresses($from = null, $to = null) { - if ($from === null && $to === null) { + if (!$from instanceof AddressInterface && !$to instanceof AddressInterface) { $result = null; - } elseif ($to === null) { + } elseif (!$to instanceof AddressInterface) { $result = Range\Single::fromAddress($from); - } elseif ($from === null) { + } elseif (!$from instanceof AddressInterface) { $result = Range\Single::fromAddress($to); } else { $result = null;