Merge remote-tracking branch 'trigger/MC-34360-paypal' into MC-34518

Author: krissyhiserote

.php_cs.dist

@@ -10,9 +10,6 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
-    ->exclude('dev/tests/functional/generated')
-    ->exclude('dev/tests/functional/var')
-    ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
     ->exclude('lib/internal/Cm')

app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php

@@ -5,8 +5,9 @@
  */
 namespace Magento\AdvancedSearch\Model\Client;
 
-use \Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @api
@@ -46,7 +47,7 @@ class ClientResolver
     private $clientOptionsPool;
 
     /**
-     * @var EngineResolver
+     * @var EngineResolverInterface
      */
     private $engineResolver;
 

app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php

@@ -12,8 +12,6 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\ResourceModel\Attribute;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Search\Model\EngineResolver;
 
 class CustomerGroup extends AbstractPlugin
 {
@@ -22,24 +20,16 @@ class CustomerGroup extends AbstractPlugin
      */
     protected $clientOptions;
 
-    /**
-     * @var EngineResolverInterface
-     */
-    protected $engineResolver;
-
     /**
      * @param IndexerRegistry $indexerRegistry
      * @param ClientOptionsInterface $clientOptions
-     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
         IndexerRegistry $indexerRegistry,
-        ClientOptionsInterface $clientOptions,
-        EngineResolverInterface $engineResolver
+        ClientOptionsInterface $clientOptions
     ) {
         parent::__construct($indexerRegistry);
         $this->clientOptions = $clientOptions;
-        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -56,9 +46,7 @@ public function aroundSave(
         \Closure $proceed,
         AbstractModel $group
     ) {
-        $needInvalidation =
-            ($this->engineResolver->getCurrentSearchEngine() != EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE)
-            && ($group->isObjectNew() || $group->dataHasChangedFor('tax_class_id'));
+        $needInvalidation = $group->isObjectNew() || $group->dataHasChangedFor('tax_class_id');
         $result = $proceed($group);
         if ($needInvalidation) {
             $this->indexerRegistry->get(Fulltext::INDEXER_ID)->invalidate();

app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php

@@ -14,8 +14,8 @@
 use Magento\Customer\Model\ResourceModel\Group as CustomerGroupResourceModel;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Search\EngineResolverInterface;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @covers \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup
@@ -35,7 +35,7 @@ class CustomerGroupTest extends TestCase
     private $indexerMock;
 
     /**
-     * @var Group|MockObject
+     * @var CustomerGroupResourceModel|MockObject
      */
     private $subjectMock;
 
@@ -49,11 +49,6 @@ class CustomerGroupTest extends TestCase
      */
     private $indexerRegistryMock;
 
-    /**
-     * @var EngineResolverInterface|MockObject
-     */
-    private $engineResolverMock;
-
     protected function setUp(): void
     {
         $this->subjectMock = $this->createMock(CustomerGroupResourceModel::class);
@@ -73,35 +68,24 @@ protected function setUp(): void
             IndexerRegistry::class,
             ['get']
         );
-        $this->engineResolverMock = $this->createPartialMock(
-            EngineResolverInterface::class,
-            ['getCurrentSearchEngine']
-        );
         $this->model = new CustomerGroupPlugin(
             $this->indexerRegistryMock,
-            $this->customerOptionsMock,
-            $this->engineResolverMock
+            $this->customerOptionsMock
         );
     }
 
     /**
-     * @param string $searchEngine
      * @param bool $isObjectNew
      * @param bool $isTaxClassIdChanged
      * @param int $invalidateCounter
      * @return void
      * @dataProvider aroundSaveDataProvider
      */
     public function testAroundSave(
-        string $searchEngine,
         bool $isObjectNew,
         bool $isTaxClassIdChanged,
         int $invalidateCounter
     ): void {
-        $this->engineResolverMock->expects($this->once())
-            ->method('getCurrentSearchEngine')
-            ->willReturn($searchEngine);
-
         $groupMock = $this->createPartialMock(
             CustomerGroupModel::class,
             ['dataHasChangedFor', 'isObjectNew', '__wakeup']
@@ -137,14 +121,10 @@ public function testAroundSave(
     public function aroundSaveDataProvider(): array
     {
         return [
-            ['mysql', false, false, 0],
-            ['mysql', false, true, 0],
-            ['mysql', true, false, 0],
-            ['mysql', true, true, 0],
-            ['custom', false, false, 0],
-            ['custom', false, true, 1],
-            ['custom', true, false, 1],
-            ['custom', true, true, 1],
+            [false, false, 0],
+            [false, true, 1],
+            [true, false, 1],
+            [true, true, 1],
         ];
     }
 }

app/code/Magento/Backend/App/AbstractAction.php

@@ -16,6 +16,7 @@
 use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\Encryption\Helper\Security;
 
 /**
  * Generic backend controller
@@ -386,7 +387,7 @@ protected function _validateSecretKey()
         }
 
         $secretKey = $this->getRequest()->getParam(UrlInterface::SECRET_KEY_PARAM_NAME, null);
-        if (!$secretKey || $secretKey != $this->_backendUrl->getSecretKey()) {
+        if (!$secretKey || !Security::compareStrings($secretKey, $this->_backendUrl->getSecretKey())) {
             return false;
         }
         return true;

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml

@@ -10,7 +10,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFilterLegacyGridActionGroup">
         <arguments>
-            <argument name="fieldSelector" type="string"/>
             <argument name="value" type="string"/>
             <argument name="button" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.apply}}"/>
         </arguments>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginSuccessfulTest.xml

@@ -20,6 +20,7 @@
             <group value="login"/>
         </annotations>
 
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="assertLoggedIn"/>
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml

@@ -15,6 +15,7 @@
             <title value="Admin should be able to manage persistent shopping cart settings"/>
             <description value="Admin should be able to enable persistent shopping cart in Magento Admin backend and see additional options"/>
             <group value="backend"/>
+            <severity value="MAJOR"/>
         </annotations>
 
         <before>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml

@@ -10,7 +10,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOrderConfigureBundleProduct">
         <arguments>
-            <argument name="productName" type="string" defaultValue="{{SimpleProduct.sku}}"/>
             <argument name="productNumber" type="string" defaultValue="1"/>
             <argument name="productQty" type="string" defaultValue="1"/>
         </arguments>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml

@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="product" defaultValue="BundleProduct"/>
-            <argument name="thumbnail" defaultValue="ProductPlaceholderImage"/>
         </arguments>
 
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>