Skip to content

Commit 0a9c2cb

Browse files
authored
Composer update joomla/utilities (#34421)
1 parent f66176f commit 0a9c2cb

File tree

4 files changed

+50
-23
lines changed

4 files changed

+50
-23
lines changed

composer.lock

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

libraries/vendor/composer/installed.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -967,28 +967,28 @@
967967
},
968968
{
969969
"name": "joomla/utilities",
970-
"version": "1.6.1",
971-
"version_normalized": "1.6.1.0",
970+
"version": "1.6.2",
971+
"version_normalized": "1.6.2.0",
972972
"source": {
973973
"type": "git",
974974
"url": "https://github.com/joomla-framework/utilities.git",
975-
"reference": "b54beb07ddf2d8074f6f8f43c365f84ddf714c8f"
975+
"reference": "9f7d9fda537ca005f7467de68f92506d48f348f5"
976976
},
977977
"dist": {
978978
"type": "zip",
979-
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/b54beb07ddf2d8074f6f8f43c365f84ddf714c8f",
980-
"reference": "b54beb07ddf2d8074f6f8f43c365f84ddf714c8f",
979+
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/9f7d9fda537ca005f7467de68f92506d48f348f5",
980+
"reference": "9f7d9fda537ca005f7467de68f92506d48f348f5",
981981
"shasum": ""
982982
},
983983
"require": {
984984
"joomla/string": "~1.3|~2.0",
985-
"php": "^5.3.10|~7.0"
985+
"php": "^5.3.10|~7.0|^8.0"
986986
},
987987
"require-dev": {
988988
"joomla/coding-standards": "~2.0@alpha",
989-
"phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
989+
"phpunit/phpunit": "^4.8.35|^5.4.3|~6.0|^7.0|^8.0"
990990
},
991-
"time": "2019-07-17T01:48:57+00:00",
991+
"time": "2021-06-02T21:39:39+00:00",
992992
"type": "joomla-package",
993993
"extra": {
994994
"branch-alias": {
@@ -1011,6 +1011,20 @@
10111011
"framework",
10121012
"joomla",
10131013
"utilities"
1014+
],
1015+
"support": {
1016+
"issues": "https://github.com/joomla-framework/utilities/issues",
1017+
"source": "https://github.com/joomla-framework/utilities/tree/1.6.2"
1018+
},
1019+
"funding": [
1020+
{
1021+
"url": "https://community.joomla.org/sponsorship-campaigns.html",
1022+
"type": "custom"
1023+
},
1024+
{
1025+
"url": "https://github.com/joomla",
1026+
"type": "github"
1027+
}
10141028
]
10151029
},
10161030
{

libraries/vendor/joomla/utilities/src/ArrayHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Part of the Joomla Framework Utilities Package
44
*
5-
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
5+
* @copyright Copyright (C) 2005 - 2021 Open Source Matters, Inc. All rights reserved.
66
* @license GNU General Public License version 2 or later; see LICENSE
77
*/
88

libraries/vendor/joomla/utilities/src/IpHelper.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
/**
33
* Part of the Joomla Framework Utilities Package
44
*
5-
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
6-
* @license GNU General Public License version 2 or later; see LICENSE
5+
* @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
6+
* @license GNU General Public License version 2 or later; see LICENSE.txt
7+
* @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
78
*/
89

910
namespace Joomla\Utilities;
1011

1112
/**
1213
* IpHelper is a utility class for processing IP addresses
1314
*
14-
* This class is adapted from the `FOFUtilsIp` class distributed with the Joomla! CMS as part of the FOF library by Akeeba Ltd.
15-
* The original class is copyright of Nicholas K. Dionysopoulos / Akeeba Ltd.
16-
*
1715
* @since 1.6.0
1816
*/
1917
final class IpHelper
@@ -31,6 +29,7 @@ final class IpHelper
3129
*
3230
* @var boolean
3331
* @since 1.6.0
32+
* @note The default value is false in version 2.0+
3433
*/
3534
private static $allowIpOverrides = true;
3635

@@ -97,7 +96,7 @@ public static function setIp($ip)
9796
*/
9897
public static function isIPv6($ip)
9998
{
100-
return strstr($ip, ':');
99+
return strpos($ip, ':') !== false;
101100
}
102101

103102
/**
@@ -448,7 +447,7 @@ protected static function detectAndCleanIP()
448447

449448
while (empty($ip) && !empty($ips))
450449
{
451-
$ip = array_pop($ips);
450+
$ip = array_shift($ips);
452451
$ip = trim($ip);
453452
}
454453
}

0 commit comments

Comments
 (0)