Merge remote-tracking branch 'origin/AC-9499' into Hammer_PlatForm_Health_247Beta3_03Jan23

Author: glo71317

app/code/Magento/AwsS3/Test/Mftf/Helper/MockTestLogger.php

@@ -14,49 +14,107 @@
  *
  * Ignores most log messages but throws errors on error/critical/emergency logs so tests will fail
  */
-class MockTestLogger implements LoggerInterface {
-
-    public function emergency($message, array $context = array())
+class MockTestLogger implements LoggerInterface
+{
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function emergency($message, array $context = []): void
     {
         throw new \Exception($message);
     }
 
-    public function alert($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function alert($message, array $context = []): void
     {
         // noop
     }
 
-    public function critical($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function critical($message, array $context = []): void
     {
         throw new \Exception($message);
     }
 
-    public function error($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function error($message, array $context = []): void
     {
         throw new \Exception($message);
     }
 
-    public function warning($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function warning($message, array $context = []): void
     {
         // noop
     }
 
-    public function notice($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function notice($message, array $context = []): void
     {
         // noop
     }
 
-    public function info($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function info($message, array $context = []): void
     {
         // noop
     }
 
-    public function debug($message, array $context = array())
+    /**
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function debug($message, array $context = []): void
     {
         // noop
     }
 
-    public function log($level, $message, array $context = array())
+    /**
+     * @param $level
+     * @param $message
+     * @param array $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function log($level, $message, array $context = []): void
     {
         // noop
     }

app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php

@@ -201,8 +201,7 @@ public function testExecuteWithException()
 
         $this->loggerMock->expects($this->once())
             ->method('critical')
-            ->with($exception)
-            ->willReturn(null);
+            ->with($exception);
 
         $this->sidebarMock->expects($this->once())
             ->method('getResponseData')

app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php

@@ -217,8 +217,7 @@ public function testExecuteWithException(): void
 
         $this->loggerMock->expects($this->once())
             ->method('critical')
-            ->with($exception)
-            ->willReturn(null);
+            ->with($exception);
 
         $this->sidebarMock->expects($this->once())
             ->method('getResponseData')

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php

@@ -343,8 +343,7 @@ public function testExecuteReorderWithThrowsLocalizedException(): void
             ->willThrowException($exception);
         $this->loggerMock
             ->expects($this->any())
-            ->method('critical')
-            ->willReturn($exception);
+            ->method('critical');
         $this->messageManagerMock
             ->expects($this->once())
             ->method('addErrorMessage')

composer.json

@@ -87,7 +87,7 @@
         "symfony/string": "^6.4",
         "tedivm/jshrink": "^1.4",
         "tubalmartin/cssmin": "^4.1",
-        "web-token/jwt-framework": "^3.1",
+        "web-token/jwt-framework": "^3.1, <3.2.9",
         "webonyx/graphql-php": "^15.0",
         "wikimedia/less.php": "^3.2"
     },

composer.lock

@@ -167,8 +167,7 @@ public function testFetchViewWithNoFileName()
             ->willReturn(false);
         $this->loggerMock->expects($this->once())
             ->method('critical')
-            ->with($exception)
-            ->willReturn(null);
+            ->with($exception);
         $this->assertEquals($output, $this->block->fetchView($template));
     }