Merge remote-tracking branch 'origin/AC-5972-v1' into Hammer_Community_Backlog_21092022

Author: glo71317

composer.json

@@ -37,7 +37,7 @@
         "colinmollenhour/cache-backend-file": "~1.4.1",
         "colinmollenhour/cache-backend-redis": "1.14.2",
         "colinmollenhour/credis": "1.13.0",
-        "colinmollenhour/php-redis-session-abstract": "~1.4.5",
+        "colinmollenhour/php-redis-session-abstract": "v1.5.0",
         "composer/composer": "^1.9 || ^2.0, !=2.2.16",
         "elasticsearch/elasticsearch": "~7.17.0",
         "ezyang/htmlpurifier": "^4.14",

composer.lock

@@ -11,7 +11,7 @@
 use Composer\Package\CompletePackageInterface;
 use Composer\Package\Locker;
 use Composer\Package\RootPackageInterface;
-use Composer\Repository\RepositoryInterface;
+use Composer\Repository\LockArrayRepository;
 use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
@@ -36,7 +36,7 @@ class ComposerInformationTest extends TestCase
     private $lockerMock;
 
     /**
-     * @var RepositoryInterface|InvocationMocker
+     * @var LockArrayRepository|InvocationMocker
      */
     private $lockerRepositoryMock;
 
@@ -53,7 +53,10 @@ protected function setUp(): void
         $this->lockerMock = $this->getMockBuilder(Locker::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->lockerRepositoryMock = $this->getMockForAbstractClass(RepositoryInterface::class);
+        $this->lockerRepositoryMock = $this->getMockBuilder(LockArrayRepository::class)
+            ->setMethods(['getLockedRepository','getPackages'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->packageMock = $this->getMockForAbstractClass(CompletePackageInterface::class);
         $this->lockerMock->method('getLockedRepository')->willReturn($this->lockerRepositoryMock);
         $this->packageMock->method('getType')->willReturn('metapackage');

lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php

@@ -20,11 +20,14 @@ class DependencyCheckerTest extends TestCase
      */
     public function testCheckDependencies(): void
     {
-        $composerApp =
-            $this->createPartialMock(Application::class, ['setAutoExit', 'resetComposer', 'run']);
+        $composerApp = $this->getMockBuilder(Application::class)
+            ->setMethods(['setAutoExit', 'resetComposer', 'run','__destruct'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $directoryList = $this->createMock(DirectoryList::class);
         $directoryList->expects($this->exactly(2))->method('getRoot');
         $composerApp->expects($this->once())->method('setAutoExit')->with(false);
+        $composerApp->expects($this->any())->method('__destruct');
 
         $composerApp
             ->method('run')
@@ -35,6 +38,7 @@ function ($input, $buffer) {
                             'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL .
                             'magento/package-c requires magento/package-a (1.0)' . PHP_EOL;
                         $buffer->writeln($output);
+                        return 1;
                     }
                 ),
                 $this->returnCallback(
@@ -43,6 +47,7 @@ function ($input, $buffer) {
                             'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL .
                             'magento/package-d requires magento/package-b (1.0)' . PHP_EOL;
                         $buffer->writeln($output);
+                        return 1;
                     }
                 )
             );
@@ -64,11 +69,14 @@ function ($input, $buffer) {
      */
     public function testCheckDependenciesExcludeSelf(): void
     {
-        $composerApp =
-            $this->createPartialMock(Application::class, ['setAutoExit', 'resetComposer', 'run']);
+        $composerApp = $this->getMockBuilder(Application::class)
+            ->setMethods(['setAutoExit', 'resetComposer', 'run','__destruct'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $directoryList = $this->createMock(DirectoryList::class);
         $directoryList->expects($this->exactly(3))->method('getRoot');
         $composerApp->expects($this->once())->method('setAutoExit')->with(false);
+        $composerApp->expects($this->any())->method('__destruct');
 
         $composerApp
             ->method('run')
@@ -79,6 +87,7 @@ function ($input, $buffer) {
                             'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL .
                             'magento/package-c requires magento/package-a (1.0)' . PHP_EOL;
                         $buffer->writeln($output);
+                        return 1;
                     }
                 ),
                 $this->returnCallback(
@@ -87,13 +96,15 @@ function ($input, $buffer) {
                             'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL .
                             'magento/package-d requires magento/package-b (1.0)' . PHP_EOL;
                         $buffer->writeln($output);
+                        return 1;
                     }
                 ),
                 $this->returnCallback(
                     function ($input, $buffer) {
                         $output = 'magento/package-d requires magento/package-c (1.0)' . PHP_EOL .
                             'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL;
                         $buffer->writeln($output);
+                        return 1;
                     }
                 )
             );

lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php

@@ -23,7 +23,7 @@
         "ext-sodium": "*",
         "ext-xsl": "*",
         "lib-libxml": "*",
-        "colinmollenhour/php-redis-session-abstract": "~1.4.5",
+        "colinmollenhour/php-redis-session-abstract": "v1.5.0",
         "composer/composer": "^1.9 || ^2.0, !=2.2.16",
         "ezyang/htmlpurifier": "^4.14",
         "guzzlehttp/guzzle": "^7.4.2",