Merge branch '1.0-develop' into security-package/issues/86-migration

# Conflicts:
#	ReCaptcha/composer.json
#	ReCaptchaMigration/Setup/Patch/Data/CopyConfigFromOldModule.php

Author: engcom-Foxtrot

.gitignore

@@ -1,3 +1 @@
 /.idea
-Test*
-Amazon*

Notifier/Model/Channel/Validator/ValidateAdapter.php

@@ -10,10 +10,10 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\NotifierApi\Api\AdaptersPoolInterface;
 use Magento\NotifierApi\Api\Data\ChannelInterface;
 use Magento\NotifierApi\Model\Channel\Validator\ValidateChannelInterface;
-use Magento\NotifierApi\Model\SerializerInterface;
 
 class ValidateAdapter implements ValidateChannelInterface
 {

Notifier/Model/SendMessage.php

@@ -12,7 +12,7 @@
 use Magento\NotifierApi\Api\ChannelRepositoryInterface;
 use Magento\NotifierApi\Api\IsEnabledInterface;
 use Magento\NotifierApi\Model\SendMessageInterface;
-use Magento\NotifierApi\Model\SerializerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class SendMessage implements SendMessageInterface
 {

Notifier/Model/Serializer.php

@@ -3,8 +3,8 @@
     "description": "Multiple channel notifier engine for Magento 2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
-        "magento/framework": "102.0.*",
-        "magento/module-notifier-api": "^1.0"
+        "magento/framework": "*",
+        "magento/module-notifier-api": "*"
     },
     "support": {
         "issues": "https://github.com/magento/security-package/issues"

Notifier/composer.json

@@ -25,7 +25,6 @@
 
     <preference for="Magento\NotifierApi\Model\SendMessageInterface" type="Magento\Notifier\Model\SendMessage"/>
     <preference for="Magento\NotifierApi\Api\IsEnabledInterface" type="Magento\Notifier\Model\IsEnabled"/>
-    <preference for="Magento\NotifierApi\Model\SerializerInterface" type="Magento\Notifier\Model\Serializer"/>
 
     <type name="Magento\NotifierApi\Model\Channel\Validator\ValidateChannel">
         <arguments>
@@ -37,12 +36,6 @@
         </arguments>
     </type>
 
-    <type name="Magento\Notifier\Model\Serializer">
-        <arguments>
-            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Json</argument>
-        </arguments>
-    </type>
-
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">

Notifier/etc/di.xml

@@ -12,8 +12,8 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Notifier\Model\ChannelFactory;
-use Magento\NotifierApi\Model\SerializerInterface;
 use Magento\NotifierApi\Api\ChannelRepositoryInterface;
 use Magento\NotifierApi\Api\Data\ChannelInterface;
 

NotifierAdminUi/Controller/Adminhtml/Channel/Save.php

@@ -9,7 +9,7 @@
 namespace Magento\NotifierAdminUi\Ui\DataProvider\Form\Channel\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\NotifierApi\Model\SerializerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Configuration extends AbstractModifier
 {

NotifierAdminUi/Ui/DataProvider/Form/Channel/Modifier/Configuration.php

@@ -3,13 +3,13 @@
     "description": "Multiple channel notifier engine for Magento 2",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
-        "magento/framework": "102.0.*",
-        "magento/module-backend": "101.0.*",
-        "magento/module-ui": "101.1.*",
-        "magento/module-notifier": "^1.0",
-        "magento/module-notifier-api": "*",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-catalog": "*",
-        "magento/module-cms": "*"
+        "magento/module-cms": "*",
+        "magento/module-ui": "*",
+        "magento/module-notifier": "*",
+        "magento/module-notifier-api": "*"
     },
     "support": {
         "issues": "https://github.com/magento/security-package/issues"