Merge pull request #108 from yoomoney/release/v2.1.2

Release/2.1.2
yoomoney · Jul 20, 2021 · 5c558bc · 5c558bc
2 parents 715b826 + 97b7985
commit 5c558bc
Show file tree

Hide file tree

Showing 36 changed files with 365 additions and 245 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v2.1.2 от 20.07.2021
+* Заменён файл верификации для ApplePay
+* Обновлен SDK до версии 2.1.2
+
 ### v2.1.1 от 23.06.2021
 * Обработка всех типов уведомлений кассы
 

diff --git a/src/install.xml b/src/install.xml
@@ -2,7 +2,7 @@
 <modification>
     <name>YooMoney for Opencart 3.x</name>
     <code>YooMoney</code>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <author>YooMoney</author>
     <link>https://github.com/yoomoney/cms-opencart3</link>
     <!-- Вставка кнопки в историю заказов-->

diff --git a/src/upload/.well-known/apple-developer-merchantid-domain-association b/src/upload/.well-known/apple-developer-merchantid-domain-association
diff --git a/src/upload/admin/controller/extension/payment/yoomoney.php b/src/upload/admin/controller/extension/payment/yoomoney.php
@@ -12,7 +12,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.1.1';
+    const MODULE_VERSION = '2.1.2';
 
     const WIDGET_INSTALL_STATUS_SUCCESS = true;
     const WIDGET_INSTALL_STATUS_FAIL    = false;

diff --git a/src/upload/admin/model/extension/payment/yoomoney.php b/src/upload/admin/model/extension/payment/yoomoney.php
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '2.1.1';
+    const MODULE_VERSION = '2.1.2';
     const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
 
     private $kassaModel;

diff --git a/src/upload/catalog/controller/extension/payment/yoomoney.php b/src/upload/catalog/controller/extension/payment/yoomoney.php
@@ -22,7 +22,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.1.1';
+    const MODULE_VERSION = '2.1.2';
 
     /**
      * @var ModelExtensionPaymentYoomoney

diff --git a/src/upload/catalog/model/extension/payment/yoomoney.php b/src/upload/catalog/model/extension/payment/yoomoney.php
@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYoomoney extends Model
 {
-    const MODULE_VERSION = '2.1.1';
+    const MODULE_VERSION = '2.1.2';
 
     private $kassaModel;
     private $walletModel;

diff --git a/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/ClassLoader.php b/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();

diff --git a/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json b/src/upload/catalog/model/extension/payment/yoomoney/vendor/composer/installed.json
@@ -1,23 +1,23 @@
 [
     {
         "name": "psr/log",
-        "version": "1.1.3",
-        "version_normalized": "1.1.3.0",
+        "version": "1.1.4",
+        "version_normalized": "1.1.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/log.git",
-            "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-            "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+            "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2020-03-23T09:12:05+00:00",
+        "time": "2021-05-03T11:20:27+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -37,7 +37,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "homepage": "https://www.php-fig.org/"
             }
         ],
         "description": "Common interface for logging libraries",
@@ -50,17 +50,17 @@
     },
     {
         "name": "yoomoney/yookassa-sdk-php",
-        "version": "2.1.0",
-        "version_normalized": "2.1.0.0",
+        "version": "2.1.2",
+        "version_normalized": "2.1.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/yoomoney/yookassa-sdk-php.git",
-            "reference": "9044afb9783b28d7c568c216a24f26656fb2b9c0"
+            "reference": "8d62f9d56b2ed926ac299775faa02effa100fbb2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/9044afb9783b28d7c568c216a24f26656fb2b9c0",
-            "reference": "9044afb9783b28d7c568c216a24f26656fb2b9c0",
+            "url": "https://api.github.com/repos/yoomoney/yookassa-sdk-php/zipball/8d62f9d56b2ed926ac299775faa02effa100fbb2",
+            "reference": "8d62f9d56b2ed926ac299775faa02effa100fbb2",
             "shasum": ""
         },
         "require": {
@@ -75,7 +75,7 @@
             "mockery/mockery": "^0.9.9",
             "phpunit/phpunit": "^4.8.35 || ^5.7"
         },
-        "time": "2021-04-21T08:25:37+00:00",
+        "time": "2021-06-02T13:58:05+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

diff --git a/...upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/AbstractLogger.php b/...upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -30,8 +30,8 @@ public function emergency($message, array $context = array())
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -45,8 +45,8 @@ public function alert($message, array $context = array())
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -59,8 +59,8 @@ public function critical($message, array $context = array())
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -75,8 +75,8 @@ public function error($message, array $context = array())
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -88,8 +88,8 @@ public function warning($message, array $context = array())
     /**
      * Normal but significant events.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ public function notice($message, array $context = array())
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -116,8 +116,8 @@ public function info($message, array $context = array())
     /**
      * Detailed debug information.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */

diff --git a/...load/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/...load/catalog/model/extension/payment/yoomoney/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
      * The logger instance.
      *
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 

diff --git a/src/upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/composer.json b/src/upload/catalog/model/extension/payment/yoomoney/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {

diff --git a/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md b/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/CHANGELOG.md
@@ -1,3 +1,10 @@
+### v2.1.2 от 02.06.2021
+* Модификация Amount
+
+### v2.1.1 от 24.05.2021
+* Описание ошибки при превышении максимальной длины поля description
+* Поправки в документации
+
 ### v2.1.0 от 21.04.2021
 * Добавлены новые методы
 * Изменены некоторые методы

diff --git a/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md b/.../model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.en.md
@@ -24,12 +24,12 @@ composer require yoomoney/yookassa-sdk-php
 ```
 
 ### Do the following for the composer.json file of your project:
-1. Add a string `"yoomoney/yookassa-sdk-php": "^2.0"` to the list of dependencies of your project in the composer.json file
+1. Add a string `"yoomoney/yookassa-sdk-php": "^2.1"` to the list of dependencies of your project in the composer.json file
 ```
 ...
    "require": {
         "php": ">=5.3.2",
-        "yoomoney/yookassa-sdk-php": "^2.0"
+        "yoomoney/yookassa-sdk-php": "^2.1"
 ...
 ```
 2. Refresh the project's dependencies. In the console, navigate to the catalog with composer.json and run the following command:

diff --git a/...log/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.md b/...log/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/README.md
@@ -26,12 +26,12 @@ composer require yoomoney/yookassa-sdk-php
 ```
 
 ### В файле composer.json своего проекта
-1. Добавьте строку `"yoomoney/yookassa-sdk-php": "^2.0"` в список зависимостей вашего проекта в файле composer.json
+1. Добавьте строку `"yoomoney/yookassa-sdk-php": "^2.1"` в список зависимостей вашего проекта в файле composer.json
 ```
 ...
     "require": {
         "php": ">=5.3.2",
-        "yoomoney/yookassa-sdk-php": "^2.0"
+        "yoomoney/yookassa-sdk-php": "^2.1"
 ...
 ```
 2. Обновите зависимости проекта. В консоли перейдите в каталог, где лежит composer.json, и выполните команду:

diff --git a/...d/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/composer.json b/...d/catalog/model/extension/payment/yoomoney/vendor/yoomoney/yookassa-sdk-php/composer.json
@@ -11,7 +11,7 @@
       "email": "cms@yoomoney.ru"
     }
   ],
-  "version": "2.1.0",
+  "version": "2.1.2",
   "require": {
     "php": ">=5.3.0",
     "ext-curl": "*",