Changeset 49056 for trunk/src/wp-includes/sodium_compat/src/Compat.php

Timestamp:

09/27/2020 04:44:01 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.13.0.

This includes a few autoloader fixes and improvements.

A full list of changes in this update can be found on GitHub:
​https://github.com/paragonie/sodium_compat/compare/v1.12.1...v1.13.0

See #51399.

File:

• trunk/src/wp-includes/sodium_compat/src/Compat.php (modified) (3 diffs)

trunk/src/wp-includes/sodium_compat/src/Compat.php

@@ -45 +45 @@
     public static $fastMult = false;
 
+    const LIBRARY_MAJOR_VERSION = 9;
+    const LIBRARY_MINOR_VERSION = 1;
     const LIBRARY_VERSION_MAJOR = 9;
     const LIBRARY_VERSION_MINOR = 1;
@@ -3118 +3120 @@
      *
      * @return int
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress UndefinedFunction
      */
     public static function library_version_major()
     {
-        if (self::useNewSodiumAPI()) {
-            return sodium_library_version_major();
+        if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MAJOR_VERSION')) {
+            return SODIUM_LIBRARY_MAJOR_VERSION;
         }
         if (self::use_fallback('library_version_major')) {
+            /** @psalm-suppress UndefinedFunction */
             return (int) call_user_func('\\Sodium\\library_version_major');
         }
@@ -3137 +3138 @@
      *
      * @return int
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress UndefinedFunction
      */
     public static function library_version_minor()
     {
-        if (self::useNewSodiumAPI()) {
-            return sodium_library_version_minor();
+        if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MINOR_VERSION')) {
+            return SODIUM_LIBRARY_MINOR_VERSION;
         }
         if (self::use_fallback('library_version_minor')) {
+            /** @psalm-suppress UndefinedFunction */
             return (int) call_user_func('\\Sodium\\library_version_minor');
         }