WordPress.org
Get WordPress

Plugin Directory

Changeset 3386677


Ignore:
Timestamp:
10/29/2025 08:58:17 PM (4 weeks ago)
Author:
benjaminpick
Message:

Release 5.6.1

Location:
geoip-detect/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • geoip-detect/trunk/geoip-detect.php

    r3386669 r3386677  
    66Author:          Yellow Tree (Benjamin Pick)
    77Author URI:      http://www.yellowtree.de
    8 Version:         5.6.0
     8Version:         5.6.1
    99License:         GPLv3 or later
    1010License URI:     http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    1616*/
    1717
    18 define('GEOIP_DETECT_VERSION', '5.6.0');
     18define('GEOIP_DETECT_VERSION', '5.6.1');
    1919
    2020/*

  • geoip-detect/trunk/readme.txt

    r3386669 r3386677  
    125125== Upgrade Notice ==
    126126
    127 = 5.6.0 =
     127= 5.6.1 =
    128128
    129129This update removes the deprecated shortcode [geoip_detect ...] (read the changelog for more details)
    … …  
    139139== Changelog ==
    140140
    141 = 5.6.0 =
     141= 5.6.1 =
    142142* FIX [!]: Remove deprecated shortcode [geoip_detect] (Security - CVE-2025-57993). If you are still using it, use [geoip_detect2 ...] instead, you might have to change the property name.
    143143* FIX: Compatibility with Wordpress 6.7 (Textdomain loading)
    144144* Library updates
     145
     146(5.6.0 was not released)
    145147
    146148= 5.5.0 =

  • geoip-detect/trunk/vendor/composer/InstalledVersions.php

    r3386669 r3386677  
    2828{
    2929    /**
    30      * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
    31      * @internal
    32      */
    33     private static $selfDir = null;
    34 
    35     /**
    3630     * @var mixed[]|null
    3731     * @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
    3832     */
    3933    private static $installed;
    40 
    41     /**
    42      * @var bool
    43      */
    44     private static $installedIsLocalDir;
    4534
    4635    /**
    … …  
    321310        self::$installed = $data;
    322311        self::$installedByVendor = array();
    323 
    324         // when using reload, we disable the duplicate protection to ensure that self::$installed data is
    325         // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
    326         // so we have to assume it does not, and that may result in duplicate data being returned when listing
    327         // all installed packages for example
    328         self::$installedIsLocalDir = false;
    329     }
    330 
    331     /**
    332      * @return string
    333      */
    334     private static function getSelfDir()
    335     {
    336         if (self::$selfDir === null) {
    337             self::$selfDir = strtr(__DIR__, '\\', '/');
    338         }
    339 
    340         return self::$selfDir;
    341312    }
    342313
    … …  
    352323
    353324        $installed = array();
    354         $copiedLocalDir = false;
    355325
    356326        if (self::$canGetVendors) {
    357             $selfDir = self::getSelfDir();
    358327            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
    359                 $vendorDir = strtr($vendorDir, '\\', '/');
    360328                if (isset(self::$installedByVendor[$vendorDir])) {
    361329                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    363331                    /** @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[]}>} $required */
    364332                    $required = require $vendorDir.'/composer/installed.php';
    365                     self::$installedByVendor[$vendorDir] = $required;
    366                     $installed[] = $required;
    367                     if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
    368                         self::$installed = $required;
    369                         self::$installedIsLocalDir = true;
     333                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
     334                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
     335                        self::$installed = $installed[count($installed) - 1];
    370336                    }
    371                 }
    372                 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
    373                     $copiedLocalDir = true;
    374337                }
    375338            }
    … …  
    388351        }
    389352
    390         if (self::$installed !== array() && !$copiedLocalDir) {
     353        if (self::$installed !== array()) {
    391354            $installed[] = self::$installed;
    392355        }

  • geoip-detect/trunk/vendor/composer/installed.php

    r3386669 r3386677  
    44        'pretty_version' => 'dev-develop',
    55        'version' => 'dev-develop',
    6         'reference' => '8f44e8dd505d5852c84953bd8fdb785452ee7114',
     6        'reference' => 'f6e98dc98217ce1d05e0cb4a073535700ceea690',
    77        'type' => 'wordpress-plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    440440            'pretty_version' => 'dev-develop',
    441441            'version' => 'dev-develop',
    442             'reference' => '8f44e8dd505d5852c84953bd8fdb785452ee7114',
     442            'reference' => 'f6e98dc98217ce1d05e0cb4a073535700ceea690',
    443443            'type' => 'wordpress-plugin',
    444444            'install_path' => __DIR__ . '/../../',

  • geoip-detect/trunk/vendor/geoip2/geoip2/src/Model/AbstractModel.php

    r3386669 r3386677  
    6161    }
    6262
     63    // PHP 8.1 : jsonSerialize(): mixed
     64    #[\ReturnTypeWillChange]
    6365    public function jsonSerialize()
    6466    {

  • geoip-detect/trunk/vendor/geoip2/geoip2/src/Record/AbstractRecord.php

    r3386669 r3386677  
    5555    }
    5656
     57    #[\ReturnTypeWillChange]
    5758    public function jsonSerialize()
    5859    {

  • geoip-detect/trunk/vendor/symfony/polyfill-intl-grapheme/bootstrap80.php

    r3386669 r3386677  
    2222}
    2323
     24/* Note YellowTree: In order to commit this to the plugin SVN of Wordpress, I needed to remove the return value typing */
     25
    2426if (!function_exists('grapheme_extract')) {
    25     function grapheme_extract(?string $haystack, ?int $size, ?int $type = GRAPHEME_EXTR_COUNT, ?int $offset = 0, &$next = null): string|false { return p\Grapheme::grapheme_extract((string) $haystack, (int) $size, (int) $type, (int) $offset, $next); }
     27    function grapheme_extract(?string $haystack, ?int $size, ?int $type = GRAPHEME_EXTR_COUNT, ?int $offset = 0, &$next = null) { return p\Grapheme::grapheme_extract((string) $haystack, (int) $size, (int) $type, (int) $offset, $next); }
    2628}
    2729if (!function_exists('grapheme_stripos')) {
    28     function grapheme_stripos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_stripos((string) $haystack, (string) $needle, (int) $offset); }
     30    function grapheme_stripos(?string $haystack, ?string $needle, ?int $offset = 0) { return p\Grapheme::grapheme_stripos((string) $haystack, (string) $needle, (int) $offset); }
    2931}
    3032if (!function_exists('grapheme_stristr')) {
    31     function grapheme_stristr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string|false { return p\Grapheme::grapheme_stristr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
     33    function grapheme_stristr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false) { return p\Grapheme::grapheme_stristr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
    3234}
    3335if (!function_exists('grapheme_strlen')) {
    34     function grapheme_strlen(?string $string): int|false|null { return p\Grapheme::grapheme_strlen((string) $string); }
     36    function grapheme_strlen(?string $string) { return p\Grapheme::grapheme_strlen((string) $string); }
    3537}
    3638if (!function_exists('grapheme_strpos')) {
    37     function grapheme_strpos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strpos((string) $haystack, (string) $needle, (int) $offset); }
     39    function grapheme_strpos(?string $haystack, ?string $needle, ?int $offset = 0) { return p\Grapheme::grapheme_strpos((string) $haystack, (string) $needle, (int) $offset); }
    3840}
    3941if (!function_exists('grapheme_strripos')) {
    40     function grapheme_strripos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strripos((string) $haystack, (string) $needle, (int) $offset); }
     42    function grapheme_strripos(?string $haystack, ?string $needle, ?int $offset = 0) { return p\Grapheme::grapheme_strripos((string) $haystack, (string) $needle, (int) $offset); }
    4143}
    4244if (!function_exists('grapheme_strrpos')) {
    43     function grapheme_strrpos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strrpos((string) $haystack, (string) $needle, (int) $offset); }
     45    function grapheme_strrpos(?string $haystack, ?string $needle, ?int $offset = 0) { return p\Grapheme::grapheme_strrpos((string) $haystack, (string) $needle, (int) $offset); }
    4446}
    4547if (!function_exists('grapheme_strstr')) {
    46     function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string|false { return p\Grapheme::grapheme_strstr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
     48    function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false) { return p\Grapheme::grapheme_strstr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
    4749}
    4850if (!function_exists('grapheme_substr')) {
    49     function grapheme_substr(?string $string, ?int $offset, ?int $length = null): string|false { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, $length); }
     51    function grapheme_substr(?string $string, ?int $offset, ?int $length = null) { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, (int) $length); }
    5052}

  • geoip-detect/trunk/vendor/symfony/polyfill-mbstring/bootstrap80.php

    r3386669 r3386677  
    1212use Symfony\Polyfill\Mbstring as p;
    1313
     14
     15/* Note YellowTree: In order to commit this to the plugin SVN of Wordpress, I needed to remove the args typing */
     16
    1417if (!function_exists('mb_convert_encoding')) {
    15     function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); }
     18    function mb_convert_encoding($string, ?string $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); }
    1619}
    1720if (!function_exists('mb_decode_mimeheader')) {
    … …  
    3134}
    3235if (!function_exists('mb_internal_encoding')) {
    33     function mb_internal_encoding(?string $encoding = null): string|bool { return p\Mbstring::mb_internal_encoding($encoding); }
     36    function mb_internal_encoding(?string $encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
    3437}
    3538if (!function_exists('mb_language')) {
    36     function mb_language(?string $language = null): string|bool { return p\Mbstring::mb_language($language); }
     39    function mb_language(?string $language = null) { return p\Mbstring::mb_language($language); }
    3740}
    3841if (!function_exists('mb_list_encodings')) {
    … …  
    4346}
    4447if (!function_exists('mb_check_encoding')) {
    45     function mb_check_encoding(array|string|null $value = null, ?string $encoding = null): bool { return p\Mbstring::mb_check_encoding($value, $encoding); }
     48    function mb_check_encoding($value = null, ?string $encoding = null): bool { return p\Mbstring::mb_check_encoding($value, $encoding); }
    4649}
    4750if (!function_exists('mb_detect_encoding')) {
    48     function mb_detect_encoding(?string $string, array|string|null $encodings = null, ?bool $strict = false): string|false { return p\Mbstring::mb_detect_encoding((string) $string, $encodings, (bool) $strict); }
     51    function mb_detect_encoding(?string $string, $encodings = null, ?bool $strict = false) { return p\Mbstring::mb_detect_encoding((string) $string, $encodings, (bool) $strict); }
    4952}
    5053if (!function_exists('mb_detect_order')) {
    51     function mb_detect_order(array|string|null $encoding = null): array|bool { return p\Mbstring::mb_detect_order($encoding); }
     54    function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order((string) $encoding); }
    5255}
    5356if (!function_exists('mb_parse_str')) {
    54     function mb_parse_str(?string $string, &$result = []): bool { parse_str((string) $string, $result); return (bool) $result; }
     57    function mb_parse_str(?string $string, &$result = []): bool { parse_str((string) $string, $result); }
    5558}
    5659if (!function_exists('mb_strlen')) {
    … …  
    5861}
    5962if (!function_exists('mb_strpos')) {
    60     function mb_strpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
     63    function mb_strpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null) { return p\Mbstring::mb_strpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
    6164}
    6265if (!function_exists('mb_strtolower')) {
    … …  
    6770}
    6871if (!function_exists('mb_substitute_character')) {
    69     function mb_substitute_character(string|int|null $substitute_character = null): string|int|bool { return p\Mbstring::mb_substitute_character($substitute_character); }
     72    function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
    7073}
    7174if (!function_exists('mb_substr')) {
    … …  
    7376}
    7477if (!function_exists('mb_stripos')) {
    75     function mb_stripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_stripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
     78    function mb_stripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null) { return p\Mbstring::mb_stripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
    7679}
    7780if (!function_exists('mb_stristr')) {
    78     function mb_stristr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_stristr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
     81    function mb_stristr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null) { return p\Mbstring::mb_stristr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
    7982}
    8083if (!function_exists('mb_strrchr')) {
    81     function mb_strrchr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrchr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
     84    function mb_strrchr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null) { return p\Mbstring::mb_strrchr((string) $haystack, (string) $needle, $before_needle, (bool) $encoding); }
    8285}
    8386if (!function_exists('mb_strrichr')) {
    84     function mb_strrichr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrichr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
     87    function mb_strrichr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null) { return p\Mbstring::mb_strrichr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
    8588}
    8689if (!function_exists('mb_strripos')) {
    87     function mb_strripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
     90    function mb_strripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null) { return p\Mbstring::mb_strripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
    8891}
    8992if (!function_exists('mb_strrpos')) {
    90     function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strrpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
     93    function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null) { return p\Mbstring::mb_strrpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
    9194}
    9295if (!function_exists('mb_strstr')) {
    93     function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
     96    function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null) { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
    9497}
    9598if (!function_exists('mb_get_info')) {
    96     function mb_get_info(?string $type = 'all'): array|string|int|false { return p\Mbstring::mb_get_info((string) $type); }
     99    function mb_get_info(?string $type = 'all') { return p\Mbstring::mb_get_info((string) $type); }
    97100}
    98101if (!function_exists('mb_http_output')) {
    99     function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); }
     102    function mb_http_output(?string $encoding = null) { return p\Mbstring::mb_http_output($encoding); }
    100103}
    101104if (!function_exists('mb_strwidth')) {
    … …  
    109112}
    110113if (!function_exists('mb_http_input')) {
    111     function mb_http_input(?string $type = null): array|string|false { return p\Mbstring::mb_http_input($type); }
     114    function mb_http_input(?string $type = null) { return p\Mbstring::mb_http_input($type); }
    112115}
    113116
    114117if (!function_exists('mb_convert_variables')) {
    115     function mb_convert_variables(?string $to_encoding, array|string|null $from_encoding, mixed &$var, mixed &...$vars): string|false { return p\Mbstring::mb_convert_variables((string) $to_encoding, $from_encoding ?? '', $var, ...$vars); }
     118    function mb_convert_variables(?string $to_encoding, $from_encoding, mixed &$var, mixed &...$vars) { return p\Mbstring::mb_convert_variables((string) $to_encoding, $from_encoding ?? '', $var, ...$vars); }
    116119}
    117120
    118121if (!function_exists('mb_ord')) {
    119     function mb_ord(?string $string, ?string $encoding = null): int|false { return p\Mbstring::mb_ord((string) $string, $encoding); }
     122    function mb_ord(?string $string, ?string $encoding = null) { return p\Mbstring::mb_ord((string) $string, $encoding); }
    120123}
    121124if (!function_exists('mb_chr')) {
    122     function mb_chr(?int $codepoint, ?string $encoding = null): string|false { return p\Mbstring::mb_chr((int) $codepoint, $encoding); }
     125    function mb_chr(?int $codepoint, ?string $encoding = null) { return p\Mbstring::mb_chr((int) $codepoint, $encoding); }
    123126}
    124127if (!function_exists('mb_scrub')) {
    125     function mb_scrub(?string $string, ?string $encoding = null): string { $encoding ??= mb_internal_encoding(); return mb_convert_encoding((string) $string, $encoding, $encoding); }
     128    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
    126129}
    127130if (!function_exists('mb_str_split')) {

  • geoip-detect/trunk/vendor/symfony/polyfill-php80/bootstrap.php

    r3386669 r3386677  
    2727}
    2828if (!function_exists('str_contains')) {
    29     function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
     29    // Note YellowTree - Changed method signature to make it compatible
     30    function str_contains($haystack, $needle): bool {
     31        if (!is_string($haystack) || !is_string($needle)) { return false; }
     32        return p\Php80::str_contains($haystack, $needle);
     33    }
    3034}
    3135if (!function_exists('str_starts_with')) {
    32     function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
     36    function str_starts_with(string $haystack, string $needle): bool { return p\Php80::str_starts_with($haystack, $needle); }
    3337}
    3438if (!function_exists('str_ends_with')) {
    35     function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
     39    function str_ends_with(string $haystack, string $needle): bool { return p\Php80::str_ends_with($haystack, $needle); }
    3640}
    3741if (!function_exists('get_debug_type')) {
Note: See TracChangeset for help on using the changeset viewer.