Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): Bump mlocati/ip-lib from 1.18.0 to 1.18.1 #1968

Merged
merged 2 commits into from
Nov 6, 2024
Merged

build(deps): Bump mlocati/ip-lib from 1.18.0 to 1.18.1 #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84486a
build(deps): Bump mlocati/ip-lib from 1.18.0 to 1.18.1
dependabot[bot] Nov 2, 2024
8412fe9
chore(autoloader): Dump autoloader
nextcloud-command Nov 5, 2024
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
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": [
{
Expand Down
6 changes: 3 additions & 3 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
20 changes: 10 additions & 10 deletions mlocati/ip-lib/src/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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;
Expand Down