Merge pull request #457 from magento-performance/CABPI-407

CABPI-407: Fix failed Performance Acceptance Tests

Author: andimov

app/code/Magento/AdminAdobeIms/Plugin/ResetAttemptForBackendObserverPlugin.php

@@ -33,12 +33,13 @@ public function __construct(ImsConfig $adminImsConfig)
      * @param ResetAttemptForBackendObserver $subject
      * @param callable $proceed
      * @param Observer $observer
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer)
+    public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer): void
     {
         if (!$this->adminImsConfig->enabled()) {
-            return $proceed($observer);
+            $proceed($observer);
         }
     }
 }

app/code/Magento/AdminAdobeIms/etc/webapi_rest/di.xml

@@ -11,7 +11,7 @@
             <argument name="userContexts" xsi:type="array">
                 <item name="adobeImsTokenUserContext" xsi:type="array">
                     <item name="type" xsi:type="object">Magento\AdminAdobeIms\Model\Authorization\AdobeImsTokenUserContext</item>
-                    <item name="sortOrder" xsi:type="string">5</item>
+                    <item name="sortOrder" xsi:type="string">90</item>
                 </item>
             </argument>
         </arguments>

app/code/Magento/AdminAdobeIms/etc/webapi_soap/di.xml

@@ -11,7 +11,7 @@
             <argument name="userContexts" xsi:type="array">
                 <item name="adobeImsTokenUserContext" xsi:type="array">
                     <item name="type" xsi:type="object">Magento\AdminAdobeIms\Model\Authorization\AdobeImsTokenUserContext</item>
-                    <item name="sortOrder" xsi:type="string">3</item>
+                    <item name="sortOrder" xsi:type="string">90</item>
                 </item>
             </argument>
         </arguments>

app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Captcha\Observer;
 
-use Magento\Captcha\Model\ResourceModel\Log;
 use Magento\Captcha\Model\ResourceModel\LogFactory;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -34,11 +33,11 @@ public function __construct(
      * Reset Attempts For Backend
      *
      * @param Observer $observer
-     * @return Log
+     * @return void
      * @throws LocalizedException
      */
     public function execute(Observer $observer)
     {
-        return $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());
+        $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());
     }
 }

app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php

@@ -51,6 +51,6 @@ public function testExecuteExpectsDeleteUserAttemptsCalled()
             ResetAttemptForBackendObserver::class,
             ['resLogFactory' => $resLogFactoryMock]
         );
-        $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+        $observer->execute($eventObserverMock);
     }
 }