MC-33699: Stabilize MFTF tests

Author: DianaRusin

app/code/Magento/Catalog/etc/events.xml

@@ -42,6 +42,7 @@
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_save_after">
         <observer name="legacy_categorytree_save_after" instance="Magento\Framework\EntityManager\Observer\AfterEntitySave" />
+        <observer name="invalidate_cache_on_categorytree_design_change" instance="Magento\Catalog\Observer\InvalidateCacheOnCategoryDesignChange" />
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_delete_before">
         <observer name="legacy_categorytree_delete_before" instance="Magento\Framework\EntityManager\Observer\BeforeEntityDelete" />

app/code/Magento/Checkout/Model/Sidebar.php

@@ -130,7 +130,7 @@ protected function normalize($itemQty)
             $filter = new \Zend_Filter_LocalizedToNormalized(
                 ['locale' => $this->resolver->getLocale()]
             );
-            return $filter->filter($itemQty);
+            return $filter->filter((string)$itemQty);
         }
         return $itemQty;
     }

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml

@@ -18,13 +18,13 @@
 
         <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
         <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabMiniCartTotal"/>
-        <assertContains stepKey="assertMiniCartTotal">
+        <assertStringContainsString stepKey="assertMiniCartTotal">
             <actualResult type="variable">$grabMiniCartTotal</actualResult>
             <expectedResult type="string">{{dataQuote.subtotal}}</expectedResult>
-        </assertContains>
-        <assertContains stepKey="assertMiniCartCurrency">
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="assertMiniCartCurrency">
             <actualResult type="variable">$grabMiniCartTotal</actualResult>
             <expectedResult type="string">{{dataQuote.currency}}</expectedResult>
-        </assertContains>
+        </assertStringContainsString>
     </actionGroup>
 </actionGroups>

app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php

@@ -94,11 +94,14 @@ protected function reformatSwatchLabels($swatchStoreValue = null)
         }
         $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
+            if (!is_string($value)) {
+                continue;
+            }
             if ($value[0] == '#') {
-                $newSwatch[$key] = 'background: '.$value;
+                $newSwatch[$key] = 'background: ' . $value;
             } elseif ($value[0] == '/') {
                 $mediaUrl = $this->swatchHelper->getSwatchMediaUrl();
-                $newSwatch[$key] = 'background: url('.$mediaUrl.$value.'); background-size: cover;';
+                $newSwatch[$key] = 'background: url(' . $mediaUrl . $value . '); background-size: cover;';
             }
         }
         return $newSwatch;

app/code/Magento/User/Observer/Backend/AuthObserver.php

@@ -166,14 +166,14 @@ private function _updateLockingInformation($user)
         $failuresNum = (int)$user->getFailuresNum() + 1;
         /** @noinspection PhpAssignmentInConditionInspection */
         if ($firstFailureDate = $user->getFirstFailure()) {
-            $firstFailureDate = new \DateTime($firstFailureDate);
+            $firstFailureDate = strtotime($user->getFirstFailure());
         }
 
         $newFirstFailureDate = false;
         $updateLockExpires = false;
         $lockThreshInterval = new \DateInterval('PT' . $lockThreshold.'S');
         // set first failure date when this is first failure or last first failure expired
-        if (1 === $failuresNum || !$firstFailureDate || $now->diff($firstFailureDate) > $lockThreshInterval) {
+        if (1 === $failuresNum || !$firstFailureDate || (\time() - $firstFailureDate) > $lockThreshold) {
             $newFirstFailureDate = $now;
             // otherwise lock user
         } elseif ($failuresNum >= $maxFailures) {