Merge pull request #49 from yoomoney/release/v2.2.0

Release/2.2.0
yoomoney · Oct 13, 2021 · 713087f · 713087f
2 parents 5da93aa + f681b6a
commit 713087f
Show file tree

Hide file tree

Showing 44 changed files with 303 additions and 428 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.2.0 от 13.10.2021
+* Замена Сбербанк Онлайн на SberPay
+* Обновлен SDK до версии 2.1.7
+
 ### v2.1.2 от 19.08.2021
 * Исправление ссылки на архив и демо-магазин в readme
 

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@
 * QIWI Wallet;
 * Наличные;
 * Альфа-Клик;
-* Сбербанк Онлайн;
+* SberPay;
 * Баланс мобильного — Билайн, Мегафон, МТС, Tele2.
 
 ### Дополнительные возможности

diff --git a/src/components/com_jshopping/images/yoomoney/sb.png b/src/components/com_jshopping/images/yoomoney/sb.png
diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lang/en-GB.php b/src/components/com_jshopping/payments/pm_yoomoney/lang/en-GB.php
@@ -60,7 +60,7 @@
 define('_JSHOP_YOO_METHOD_MOBILE_BALANCE_DESCRIPTION', 'Direct carrier billing');
 define('_JSHOP_YOO_METHOD_WEBMONEY_DESCRIPTION', 'Webmoney');
 define('_JSHOP_YOO_METHOD_ALFABANK_DESCRIPTION', 'Alfa-Click');
-define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION', 'Sberbank Online');
+define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION', 'SberPay');
 define('_JSHOP_YOO_METHOD_MA_DESCRIPTION', 'MasterPass');
 define('_JSHOP_YOO_METHOD_PB_DESCRIPTION', 'Promsvyazbank');
 define('_JSHOP_YOO_METHOD_QIWI_DESCRIPTION', 'QIWI Wallet');
@@ -76,7 +76,7 @@
 define('_JSHOP_YOO_METHOD_MOBILE_BALANCE_DESCRIPTION_PUBLIC', 'Direct carrier billing');
 define('_JSHOP_YOO_METHOD_WEBMONEY_DESCRIPTION_PUBLIC', 'Webmoney');
 define('_JSHOP_YOO_METHOD_ALFABANK_DESCRIPTION_PUBLIC', 'Alfa-Click');
-define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION_PUBLIC', 'Sberbank Online');
+define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION_PUBLIC', 'SberPay');
 define('_JSHOP_YOO_METHOD_MA_DESCRIPTION_PUBLIC', 'MasterPass');
 define('_JSHOP_YOO_METHOD_PB_DESCRIPTION_PUBLIC', 'Promsvyazbank');
 define('_JSHOP_YOO_METHOD_QIWI_DESCRIPTION_PUBLIC', 'QIWI Wallet');

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lang/ru-RU.php b/src/components/com_jshopping/payments/pm_yoomoney/lang/ru-RU.php
@@ -69,7 +69,7 @@
 define('_JSHOP_YOO_METHOD_MOBILE_BALANCE_DESCRIPTION', 'Баланс мобильного');
 define('_JSHOP_YOO_METHOD_WEBMONEY_DESCRIPTION', 'Кошелек WebMoney');
 define('_JSHOP_YOO_METHOD_ALFABANK_DESCRIPTION', 'Альфа-Клик');
-define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION', 'Сбербанк Онлайн');
+define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION', 'SberPay');
 define('_JSHOP_YOO_METHOD_TINKOFF_BANK_DESCRIPTION', 'Интернет-банк Тинькофф');
 define('_JSHOP_YOO_METHOD_MA_DESCRIPTION', 'MasterPass');
 define('_JSHOP_YOO_METHOD_PB_DESCRIPTION', 'Интернет-банк Промсвязьбанка');
@@ -89,7 +89,7 @@
 define('_JSHOP_YOO_METHOD_MOBILE_BALANCE_DESCRIPTION_PUBLIC', 'Баланс мобильного');
 define('_JSHOP_YOO_METHOD_WEBMONEY_DESCRIPTION_PUBLIC', 'Кошелек WebMoney');
 define('_JSHOP_YOO_METHOD_ALFABANK_DESCRIPTION_PUBLIC', 'Альфа-Клик');
-define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION_PUBLIC', 'Сбербанк Онлайн');
+define('_JSHOP_YOO_METHOD_SBERBANK_DESCRIPTION_PUBLIC', 'SberPay');
 define('_JSHOP_YOO_METHOD_TINKOFF_BANK_DESCRIPTION_PUBLIC', 'Интернет-банк Тинькофф');
 define('_JSHOP_YOO_METHOD_MA_DESCRIPTION_PUBLIC', 'MasterPass');
 define('_JSHOP_YOO_METHOD_PB_DESCRIPTION_PUBLIC', 'Интернет-банк Промсвязьбанка');

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/Model/KassaPaymentMethod.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/Model/KassaPaymentMethod.php
@@ -21,7 +21,7 @@
 require_once JPATH_ROOT.'/components/com_jshopping/payments/pm_yoomoney_sbbol/SbbolException.php';
 
 if (!defined(_JSHOP_YOO_VERSION)) {
-    define('_JSHOP_YOO_VERSION', '2.1.2');
+    define('_JSHOP_YOO_VERSION', '2.2.0');
 }
 
 

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/ClassLoader.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/ClassLoader.php
@@ -37,11 +37,13 @@
  *
  * @author Fabien Potencier <[email protected]>
  * @author Jordi Boggiano <[email protected]>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    private $vendorDir;
+
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -57,6 +59,13 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
+    private static $registeredLoaders = array();
+
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -300,6 +309,17 @@ public function getApcuPrefix()
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
@@ -308,6 +328,10 @@ public function register($prepend = false)
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
@@ -367,6 +391,16 @@ public function findFile($class)
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/InstalledVersions.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/InstalledVersions.php
@@ -32,7 +32,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => 'cac62d3071b2bd4c79741324f4ae573e69e0efc6',
+    'reference' => 'c76b110bead61151e6c69de1fe93d7d3695ae685',
     'name' => '__root__',
   ),
   'versions' => 
@@ -44,7 +44,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => 'cac62d3071b2bd4c79741324f4ae573e69e0efc6',
+      'reference' => 'c76b110bead61151e6c69de1fe93d7d3695ae685',
     ),
     'psr/log' => 
     array (
@@ -57,12 +57,12 @@ class InstalledVersions
     ),
     'yoomoney/yookassa-sdk-php' => 
     array (
-      'pretty_version' => '2.1.2',
-      'version' => '2.1.2.0',
+      'pretty_version' => '2.1.7',
+      'version' => '2.1.7.0',
       'aliases' => 
       array (
       ),
-      'reference' => '8d62f9d56b2ed926ac299775faa02effa100fbb2',
+      'reference' => '4ea726f9bdd6bb57f1b1e371c33baa852fdaf0aa',
     ),
   ),
 );

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_classmap.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_classmap.php
@@ -6,4 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 );
diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_real.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_real.php
@@ -22,13 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInit7b690e82411dcbcd6afd0ce21e7deadc', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInit7b690e82411dcbcd6afd0ce21e7deadc', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit7b690e82411dcbcd6afd0ce21e7deadc::getInitializer($loader));
         } else {

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_static.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/autoload_static.php
@@ -28,11 +28,16 @@ class ComposerStaticInit7b690e82411dcbcd6afd0ce21e7deadc
         ),
     );
 
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+    );
+
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit7b690e82411dcbcd6afd0ce21e7deadc::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit7b690e82411dcbcd6afd0ce21e7deadc::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit7b690e82411dcbcd6afd0ce21e7deadc::$classMap;
 
         }, null, ClassLoader::class);
     }