Merge remote-tracking branch 'origin/MC-29405' into 2.4-develop-pr97

Author: zakdma

app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php

@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class BillingTest extends TestCase
 {
@@ -23,10 +22,7 @@ class BillingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Billing($logger);
+        $this->testable = new Billing();
     }
 
     public function testBeforeSave()

app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php

@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class ShippingTest extends TestCase
 {
@@ -23,10 +22,7 @@ class ShippingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Shipping($logger);
+        $this->testable = new Shipping();
     }
 
     public function testBeforeSave()

app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php

@@ -7,10 +7,7 @@
 
 namespace Magento\Theme\Test\Unit\Block\Adminhtml\Design\Config\Edit;
 
-use Magento\Backend\Block\Widget\Context;
-use Magento\Framework\UrlInterface;
 use Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveButton;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SaveButtonTest extends TestCase
@@ -20,16 +17,9 @@ class SaveButtonTest extends TestCase
      */
     protected $block;
 
-    /**
-     * @var Context|MockObject
-     */
-    protected $context;
-
     protected function setUp(): void
     {
-        $this->initContext();
-
-        $this->block = new SaveButton($this->context);
+        $this->block = new SaveButton();
     }
 
     public function testGetButtonData()
@@ -41,18 +31,4 @@ public function testGetButtonData()
         $this->assertArrayHasKey('data_attribute', $result);
         $this->assertIsArray($result['data_attribute']);
     }
-
-    protected function initContext()
-    {
-        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->context->expects($this->any())
-            ->method('getUrlBuilder')
-            ->willReturn($this->urlBuilder);
-    }
 }

lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php

@@ -16,8 +16,7 @@ class QueueInstallerTest extends TestCase
 {
     public function testInstall()
     {
-        $bindingInstaller = $this->getMockForAbstractClass(QueueConfigItemInterface::class);
-        $model = new QueueInstaller($bindingInstaller);
+        $model = new QueueInstaller();
         $channel = $this->createMock(AMQPChannel::class);
 
         $queue = $this->getMockForAbstractClass(QueueConfigItemInterface::class);

setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php

@@ -95,7 +95,7 @@ public static function getCircularDependenciesReportBuilder()
             self::$circularDependenciesReportBuilder = new CircularReport\Builder(
                 self::getComposerJsonParser(),
                 new CircularReport\Writer(self::getCsvWriter()),
-                new CircularTool([], null)
+                new CircularTool()
             );
         }
         return self::$circularDependenciesReportBuilder;