Merge pull request #54 from yoomoney/release/v2.3.2

Release/2.3.2
yoomoney · Feb 15, 2022 · bad932f · bad932f
2 parents 3fbf859 + 40a0442
commit bad932f
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.3.2 от 14.02.2022
+* Отключен способ оплаты Webmoney
+* Обноление SDK до версии 2.2.6
+
 ### v2.3.1 от 01.02.2022
 * Добавлена обработка уведомлений от юкассы: PAYMENT_CANCELED, REFUND_SUCCEEDED, DEAL_CLOSED, PAYOUT_CANCELED,
 PAYOUT_SUCCEEDED.

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.3.1');
+    define('_JSHOP_YOO_VERSION', '2.3.2');
 }
 
 
@@ -483,4 +483,4 @@ public function getSecondReceiptStatus()
     {
         return (int)$this->pmconfigs['kassa_second_receipt_status'];
     }
-}
+}
diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/installed.json b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/installed.json
@@ -55,32 +55,32 @@
         },
         {
             "name": "yoomoney/yookassa-sdk-php",
-            "version": "2.2.5",
-            "version_normalized": "2.2.5.0",
+            "version": "2.2.6",
+            "version_normalized": "2.2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yoomoney/yookassa-sdk-php.git",
-                "reference": "8415cc1db919dd157a6f28a7300e96a1b74bd7f0"
+                "reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/8415cc1db919dd157a6f28a7300e96a1b74bd7f0",
-                "reference": "8415cc1db919dd157a6f28a7300e96a1b74bd7f0",
+                "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/0bbd87d76310b3239b6e6de6534c9fab9e7db847",
+                "reference": "0bbd87d76310b3239b6e6de6534c9fab9e7db847",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "php": ">=5.3.0",
-                "psr/log": "^1.0 || ^2.0 || ^3.0"
+                "psr/log": "^1.0"
             },
             "require-dev": {
                 "ext-xml": "*",
                 "mockery/mockery": "^0.9.9",
                 "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
-            "time": "2021-12-28T12:16:53+00:00",
+            "time": "2022-01-21T13:31:53+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/yoomoney/yookassa-sdk-php/issues",
-                "source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.5"
+                "source": "https://github.com/yoomoney/yookassa-sdk-php/tree/2.2.6"
             },
             "install-path": "../yoomoney/yookassa-sdk-php"
         }

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/installed.php b/src/components/com_jshopping/payments/pm_yoomoney/lib/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '34530a05da1cb743979b233d065812769e6a2b4d',
+        'reference' => 'e8c7f58e63a955a79f52e2986e5894ad57a3eb56',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '34530a05da1cb743979b233d065812769e6a2b4d',
+            'reference' => 'e8c7f58e63a955a79f52e2986e5894ad57a3eb56',
             'dev_requirement' => false,
         ),
         'psr/log' => array(
@@ -29,12 +29,12 @@
             'dev_requirement' => false,
         ),
         'yoomoney/yookassa-sdk-php' => array(
-            'pretty_version' => '2.2.5',
-            'version' => '2.2.5.0',
+            'pretty_version' => '2.2.6',
+            'version' => '2.2.6.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../yoomoney/yookassa-sdk-php',
             'aliases' => array(),
-            'reference' => '8415cc1db919dd157a6f28a7300e96a1b74bd7f0',
+            'reference' => '0bbd87d76310b3239b6e6de6534c9fab9e7db847',
             'dev_requirement' => false,
         ),
     ),

diff --git a/...nents/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/.travis.yml b/...nents/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/.travis.yml
@@ -13,8 +13,8 @@ matrix:
   include:
     - php: 5.5
       dist: trusty
-#    - php: 5.4
-#      dist: precise
+    - php: 5.4
+      dist: trusty
 #    - php: 5.3
 #      dist: precise
 

diff --git a/...shopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md b/...shopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v2.2.6 от 21.01.2022
+* Откат поддержки psr/log версий 2 и 3
+
 ### v2.2.5 от 28.12.2021
 * Добавлен метод проверки IP адреса уведомления от Юkassa среди известных адресов Юkassa
 * Добавлены тесты

diff --git a/...nts/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/composer.json b/...nts/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/composer.json
@@ -11,13 +11,13 @@
       "email": "[email protected]"
     }
   ],
-  "version": "2.2.5",
+  "version": "2.2.6",
   "require": {
     "php": ">=5.3.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
-    "psr/log": "^1.0 || ^2.0 || ^3.0"
+    "psr/log": "^1.0"
   },
   "require-dev": {
     "ext-xml": "*",

diff --git a/...ts/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/lib/Client.php b/...ts/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/lib/Client.php
@@ -112,7 +112,7 @@ class Client extends BaseClient
     /**
      * Текущая версия библиотеки
      */
-    const SDK_VERSION = '2.2.5';
+    const SDK_VERSION = '2.2.6';
 
     /**
      * Получить список платежей магазина
@@ -1208,4 +1208,4 @@ public function me($filter = null)
 
         return $result;
     }
-}
+}
diff --git a/...onents/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/phpdoc.xml b/...onents/com_jshopping/payments/pm_yoomoney/lib/vendor/yoomoney/yookassa-sdk-php/phpdoc.xml
@@ -9,7 +9,7 @@
     <paths>
         <output>.phpdoc</output>
     </paths>
-    <version number="2.2.5">
+    <version number="2.2.6">
         <folder>latest</folder>
         <api>
             <source dsn=".">

diff --git a/src/components/com_jshopping/payments/pm_yoomoney/pm_yoomoney.php b/src/components/com_jshopping/payments/pm_yoomoney/pm_yoomoney.php
@@ -29,7 +29,7 @@
 
 require_once dirname(__FILE__).'/lib/autoload.php';
 
-define('_JSHOP_YOO_VERSION', '2.3.1');
+define('_JSHOP_YOO_VERSION', '2.3.2');
 
 class pm_yoomoney extends PaymentRoot
 {
@@ -70,6 +70,7 @@ class pm_yoomoney extends PaymentRoot
     private static $disabledPaymentMethods = array(
         PaymentMethodType::B2B_SBERBANK,
         PaymentMethodType::WECHAT,
+        PaymentMethodType::WEBMONEY,
     );
 
     private static $customPaymentMethods = array(
@@ -1412,4 +1413,4 @@ private static function getPaymentMethods()
 
         return $enabledPaymentMethods;
     }
-}
+}
diff --git a/yoomoney-cms-joomshopping.zip b/yoomoney-cms-joomshopping.zip