🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #13709: Changes static content deploy log levels verbosity (by @hostep)
 - magento-engcom/magento2ce#1187: #7515: Error when submit customer/account/editPost form and session expired (by @RomaKis)


Fixed GitHub Issues:
 - #12404: Output of setup:static-content:deploy contains red color, should be a friendlier color (reported by @hostep) has been fixed in #13709 by @hostep in 2.2-develop branch
   Related commits:
     1. d549014
     2. 3733dea

 - #7515: Error when submit customer/account/editPost form and session expired (reported by @edelepine) has been fixed in magento-engcom/magento2ce#1187 by @RomaKis in 2.2-develop branch
   Related commits:
     1. 9bb3dd3

Author: magento-engcom-team

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

@@ -111,19 +111,21 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 )
             )) {
                 $customerId = $this->customerSession->getCustomerId();
-                $this->authentication->processAuthenticationFailure($customerId);
-                if ($this->authentication->isLocked($customerId)) {
-                    $this->customerSession->logout();
-                    $this->customerSession->start();
-                    $message = __(
-                        'The account is locked. Please wait and try again or contact %1.',
-                        $this->scopeConfig->getValue('contact/email/recipient_email')
-                    );
-                    $this->messageManager->addError($message);
+                if ($customerId) {
+                    $this->authentication->processAuthenticationFailure($customerId);
+                    if ($this->authentication->isLocked($customerId)) {
+                        $this->customerSession->logout();
+                        $this->customerSession->start();
+                        $message = __(
+                            'The account is locked. Please wait and try again or contact %1.',
+                            $this->scopeConfig->getValue('contact/email/recipient_email')
+                        );
+                        $this->messageManager->addError($message);
+                    }
+                    $this->messageManager->addError(__('Incorrect CAPTCHA'));
+                    $this->actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+                    $this->redirect->redirect($controller->getResponse(), '*/*/edit');
                 }
-                $this->messageManager->addError(__('Incorrect CAPTCHA'));
-                $this->actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                $this->redirect->redirect($controller->getResponse(), '*/*/edit');
             }
         }
 

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

@@ -160,4 +160,53 @@ public function testExecute()
 
         $this->observer->execute(new \Magento\Framework\Event\Observer(['controller_action' => $controller]));
     }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithCustomerIdNull()
+    {
+        $customerId = null;
+        $captchaValue = 'some-value';
+
+        $captcha = $this->createMock(\Magento\Captcha\Model\DefaultModel::class);
+        $captcha->expects($this->once())
+            ->method('isRequired')
+            ->willReturn(true);
+        $captcha->expects($this->once())
+            ->method('isCorrect')
+            ->with($captchaValue)
+            ->willReturn(false);
+
+        $this->helperMock->expects($this->once())
+            ->method('getCaptcha')
+            ->with(\Magento\Captcha\Observer\CheckUserEditObserver::FORM_ID)
+            ->willReturn($captcha);
+
+        $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $request->expects($this->any())
+            ->method('getPost')
+            ->with(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE, null)
+            ->willReturn([\Magento\Captcha\Observer\CheckUserEditObserver::FORM_ID => $captchaValue]);
+
+        $controller = $this->createMock(\Magento\Framework\App\Action\Action::class);
+        $controller->expects($this->any())->method('getRequest')->will($this->returnValue($request));
+
+        $this->captchaStringResolverMock->expects($this->once())
+            ->method('resolve')
+            ->with($request, \Magento\Captcha\Observer\CheckUserEditObserver::FORM_ID)
+            ->willReturn($captchaValue);
+
+        $customerDataMock = $this->createMock(\Magento\Customer\Model\Data\Customer::class);
+
+        $this->customerSessionMock->expects($this->once())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+
+        $this->customerSessionMock->expects($this->atLeastOnce())
+            ->method('getCustomer')
+            ->willReturn($customerDataMock);
+
+        $this->observer->execute(new \Magento\Framework\Event\Observer(['controller_action' => $controller]));
+    }
 }

app/code/Magento/Deploy/Console/ConsoleLogger.php

@@ -82,8 +82,8 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
-        LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
+        LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
+        LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
         LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
     ];
 

app/code/Magento/Deploy/Process/Queue.php

@@ -161,7 +161,7 @@ public function process()
             foreach ($packages as $name => $packageJob) {
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(3);
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -233,7 +233,7 @@ private function awaitForAllProcesses()
                     unset($this->inProgress[$name]);
                 }
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {

app/code/Magento/Deploy/Service/DeployPackage.php

@@ -271,7 +271,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
         $this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));
 
         if (!$skipLogging) {
-            $this->logger->notice($logMessage);
+            $this->logger->info($logMessage);
         }
     }
 }

setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php

@@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $logger = $this->consoleLoggerFactory->getLogger($output, $verbose);
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
+            $logger->notice(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
         }
 
         $this->mockCache();
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $deployService->deploy($options);
 
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Execution time: " . (microtime(true) - $time));
+            $logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;

setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php

@@ -102,7 +102,7 @@ public function testExecute($input)
 
         $this->consoleLoggerFactory->expects($this->once())
             ->method('getLogger')->willReturn($this->logger);
-        $this->logger->expects($this->exactly(2))->method('alert');
+        $this->logger->expects($this->exactly(2))->method('notice');
 
         $this->objectManager->expects($this->once())->method('create')->willReturn($this->deployService);
         $this->deployService->expects($this->once())->method('deploy');