Merge branch '2.4-develop' into graphql-api-enhancements

Author: cod40403

app/code/Magento/Backend/Test/Unit/Helper/ButtonTestHelper.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Block\Widget\Button;
+
+/**
+ * Test helper for Button class with custom methods
+ */
+class ButtonTestHelper extends Button
+{
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * Skip parent constructor to avoid dependencies
+     */
+    public function __construct()
+    {
+        // Skip parent constructor - clean initialization
+        $this->data = [];
+    }
+
+    /**
+     * Custom isAllowed method for testing
+     *
+     * @param string|null $resource
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isAllowed($resource = null): bool
+    {
+        return $this->data['is_allowed'] ?? true;
+    }
+
+    /**
+     * Set is allowed for testing
+     *
+     * @param bool $isAllowed
+     * @return self
+     */
+    public function setIsAllowed(bool $isAllowed): self
+    {
+        $this->data['is_allowed'] = $isAllowed;
+        return $this;
+    }
+
+    /**
+     * Override getAuthorization method
+     *
+     * @return mixed
+     */
+    public function getAuthorization()
+    {
+        return $this->data['authorization'] ?? null;
+    }
+
+    /**
+     * Set authorization for testing
+     *
+     * @param mixed $authorization
+     * @return self
+     */
+    public function setAuthorization($authorization): self
+    {
+        $this->data['authorization'] = $authorization;
+        return $this;
+    }
+
+    /**
+     * Override toHtml method
+     *
+     * @return string
+     */
+    public function toHtml(): string
+    {
+        return $this->data['html'] ?? '';
+    }
+
+    /**
+     * Set HTML output for testing
+     *
+     * @param string $html
+     * @return self
+     */
+    public function setHtml(string $html): self
+    {
+        $this->data['html'] = $html;
+        return $this;
+    }
+}

app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/ExtendTest.php

@@ -35,13 +35,10 @@ class ExtendTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->registry = $this->getMockBuilder(Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->formFactory = $this->getMockBuilder(
+        $this->registry = $this->createMock(Registry::class);
+        $this->formFactory = $this->createMock(
             FormFactory::class
-        )->disableOriginalConstructor()
-            ->getMock();
+        );
         $this->objectManagerHelper = new ObjectManager($this);
         $objects = [
             [
@@ -65,9 +62,7 @@ protected function setUp(): void
      */
     public function getProduct()
     {
-        $product = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $product = $this->createMock(Product::class);
         $this->registry->expects($this->once())
             ->method('registry')
             ->with('product')
@@ -80,9 +75,7 @@ public function getProduct()
     public function testGetExtendedElement()
     {
         $switchAttributeCode = 'test_code';
-        $form = $this->getMockBuilder(Form::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $form = $this->createMock(Form::class);
         $hasKey = new ArrayHasKey('value');
         $form->expects($this->once())->method('addField')->with(
             $switchAttributeCode,

app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/OptionTest.php

@@ -9,50 +9,35 @@
 
 use Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
 use Magento\Framework\DataObject;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\LayoutInterface;
+use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 
 class OptionTest extends TestCase
 {
+    /**
+     * @return void
+     * @throws Exception
+     */
     public function testGetAddButtonId()
     {
         $button = new DataObject();
+        $button->setId(42);
 
-        $itemsBlock = $this->getMockBuilder(DataObject::class)
-            ->addMethods(['getChildBlock'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $itemsBlock->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getChildBlock'
-        )->with(
-            'add_button'
-        )->willReturn(
-            $button
-        );
+        $itemsBlock = $this->createMock(AbstractBlock::class);
+        $itemsBlock->method('getChildBlock')->with('add_button')->willReturn($button);
 
-        $layout = $this->getMockBuilder(DataObject::class)
-            ->addMethods(['getBlock'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $layout->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getBlock'
-        )->with(
-            'admin.product.bundle.items'
-        )->willReturn(
-            $itemsBlock
-        );
+        $layout = $this->createMock(LayoutInterface::class);
+        $layout->method('getBlock')->with('admin.product.bundle.items')->willReturn($itemsBlock);
 
         $block = $this->createPartialMock(
             Option::class,
             ['getLayout']
         );
         $block->expects($this->atLeastOnce())->method('getLayout')->willReturn($layout);
 
-        $this->assertNotEquals(42, $block->getAddButtonId());
-        $button->setId(42);
+        // Test that the button ID is correctly retrieved
         $this->assertEquals(42, $block->getAddButtonId());
     }
 }