Address 8.1 and 8.2 unit test failures

Author: sivaram7

src/Test/Unit/App/Logger/Formatter/ErrorFormatterFactoryTest.php

@@ -42,17 +42,18 @@ protected function setUp(): void
 
     public function testCreate()
     {
+        define("ERRORINFO", $this->createMock(ErrorInfo::class));
+        define("READERINTEFACE", $this->getMockForAbstractClass(ReaderInterface::class));
         $this->containerMock->expects($this->exactly(2))
             ->method('get')
-            ->willReturnCallback(function (...$args) {
+            // withConsecutive() alternative.
+            ->willReturnCallback(function ($args) {
                 static $series = [
-                    [[ErrorInfo::class], $this->createMock(ErrorInfo::class)],
-                    [[ReaderInterface::class], $this->getMockForAbstractClass(ReaderInterface::class)],
+                    [ErrorInfo::class, ERRORINFO],
+                    [ReaderInterface::class, READERINTEFACE]
                 ];
-
                 [$expectedArgs, $return] = array_shift($series);
                 $this->assertSame($expectedArgs, $args);
-
                 return $return;
             });
 

src/Test/Unit/Step/Deploy/SetCryptKeyTest.php

@@ -81,14 +81,13 @@ public function testConfigUpdate(): void
         $this->loggerMock->expects($this->exactly(2))
             ->method('info')
             // withConsecutive() alternative.
-            ->willReturnCallback(function ($args) {
-                static $series = [
-                    'Checking existence of encryption key',
-                    sprintf('Setting encryption key from %s', Environment::VARIABLE_CRYPT_KEY)
-                ];
-                $expectedArgs = array_shift($series);
-                $this->assertSame($expectedArgs, $args);
-            });
+            ->with(self::callback(function (string $message) {
+                static $i = 0;
+                return match (++$i) {
+                    1 => $message === 'Checking existence of encryption key',
+                    2 => $message === sprintf('Setting encryption key from %s', Environment::VARIABLE_CRYPT_KEY)
+                };
+            }));
         $this->configWriterMock->expects($this->once())
             ->method('update')
             ->with(['crypt' => ['key' => 'TWFnZW50byBSb3g=']]);
@@ -117,14 +116,13 @@ public function testConfigUpdateWithError(): void
         $this->loggerMock->expects($this->exactly(2))
             ->method('info')
             // withConsecutive() alternative.
-            ->willReturnCallback(function ($args) {
-                static $series = [
-                    'Checking existence of encryption key',
-                    sprintf('Setting encryption key from %s', Environment::VARIABLE_CRYPT_KEY)
-                ];
-                $expectedArgs = array_shift($series);
-                $this->assertSame($expectedArgs, $args);
-            });
+            ->with(self::callback(function (string $message) {
+                static $i = 0;
+                return match (++$i) {
+                    1 => $message === 'Checking existence of encryption key',
+                    2 => $message === sprintf('Setting encryption key from %s', Environment::VARIABLE_CRYPT_KEY),
+                };
+            }));
         $this->configWriterMock->expects($this->once())
             ->method('update')
             ->with(['crypt' => ['key' => 'TWFnZW50byBSb3g=']])