PHPUnit 10 fixes

Author: nishant04412

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php

@@ -38,6 +38,11 @@
  */
 class StockItemRepositoryTest extends TestCase
 {
+ /**
+ * @var string
+ */
+ private static $date = '2023-01-01 00:00:00';
+
  /**
  * @var StockItemRepository
  */
@@ -304,7 +309,6 @@ public function testSave(
  array $existingStockItemMockConfig
  ) {
  $productId = 1;
- $date = '2023-01-01 00:00:00';
  $stockStateProviderMockConfig += [
  'verifyStock' => ['expects' => $this->once(), 'with' => [$this->stockItemMock], 'willReturn' => true,],
  'verifyNotification' => [
@@ -331,7 +335,7 @@ public function testSave(
  'setStockId' => ['expects' => $this->once(), 'with' => [1], 'willReturnSelf' => true,],
  'setLowStockDate' => [
  'expects' => $this->exactly(2),
- 'willReturnCallback' => [[null], [$date],],
+ 'willReturnCallback' => [[null], [self::$date]],
  'willReturnSelf' => true,
  ],
  'hasStockStatusChangedAutomaticallyFlag' => ['expects' => $this->once(), 'willReturn' => false,],
@@ -355,7 +359,7 @@ public function testSave(
  ->willReturn(true);
  $this->dateTime->expects($this->once())
  ->method('gmtDate')
- ->willReturn($date);
+ ->willReturn(self::$date);
  $this->stockItemResourceMock->expects($this->once())
  ->method('save')
  ->with($this->stockItemMock)
@@ -507,7 +511,11 @@ private function configMock(MockObject $mockObject, array $configs): void
  $mockMethod->with(...$config['with']);
  }
  if (isset($config['willReturnCallback'])) {
- $mockMethod->willReturnCallback(...$config['willReturnCallback']);
+ $mockMethod->willReturnCallback(function ($config) {
+ return match ($config) {
+ [null], [self::$date] => true
+ };
+ });
  }
  if (isset($config['willReturnSelf'])) {
  $mockMethod->willReturnSelf();

app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php

@@ -79,6 +79,13 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
  */
  protected $entityManager;
 
+ /**
+ * Store associated with rule entities information map
+ *
+ * @var array
+ */
+ protected $_associatedEntitiesMap = [];
+
  /**
  * Rule constructor.
  * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -93,6 +100,7 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
  * @param PriceCurrencyInterface $priceCurrency
  * @param string|null $connectionName
  * @param EntityManager|null $entityManager
+ * @param \Magento\Framework\DataObject|null $associatedEntityMap
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
  public function __construct(
@@ -107,7 +115,8 @@ public function __construct(
  \Magento\Framework\Stdlib\DateTime $dateTime,
  PriceCurrencyInterface $priceCurrency,
  $connectionName = null,
- ?EntityManager $entityManager = null
+ ?EntityManager $entityManager = null,
+ \Magento\Framework\DataObject $associatedEntityMap = null
  ) {
  $this->_storeManager = $storeManager;
  $this->_conditionFactory = $conditionFactory;
@@ -119,7 +128,7 @@ public function __construct(
  $this->dateTime = $dateTime;
  $this->priceCurrency = $priceCurrency;
  $this->entityManager = $entityManager ?? ObjectManager::getInstance()->get(EntityManager::class);
- $this->_associatedEntitiesMap = ObjectManager::getInstance()
+ $this->_associatedEntitiesMap = $associatedEntityMap ?? ObjectManager::getInstance()
  // phpstan:ignore this is a virtual class
  ->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
  ->getData();

app/code/Magento/CatalogRule/Test/Unit/Model/ResourceModel/RuleTest.php

@@ -64,6 +64,24 @@ protected function setUp(): void
  $context = $this->createMock(Context::class);
  $context->expects($this->once())->method('getResources')->willReturn($this->resource);
 
+ $associatedEntitiesMap = $this->createPartialMock(DataObject::class, ['getData']);
+ $associatedEntitiesMap->expects($this->any())
+ ->method('getData')
+ ->willReturn(
+ [
+ 'website' => [
+ 'associations_table' => 'catalogrule_website',
+ 'rule_id_field' => 'rule_id',
+ 'entity_id_field' => 'website_id'
+ ],
+ 'customer_group' => [
+ 'associations_table' => 'catalogrule_customer_group',
+ 'rule_id_field' => 'rule_id',
+ 'entity_id_field' => 'customer_group_id'
+ ],
+ ]
+ );
+
  $this->model = new Rule(
  $context,
  $this->createMock(StoreManagerInterface::class),
@@ -77,6 +95,7 @@ protected function setUp(): void
  $this->createMock(PriceCurrencyInterface::class),
  null,
  $this->createMock(EntityManager::class),
+ $associatedEntitiesMap
  );
  }
 

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

@@ -945,7 +945,7 @@ public function testGetTracking($tracking, $shipTimeStamp, $expectedDate, $expec
  *
  * @return array
  */
- public function shipDateDataProvider(): array
+ public static function shipDateDataProvider(): array
  {
  return [
  'tracking1' => [
@@ -1111,6 +1111,7 @@ private function getRateMethodFactory()
  $priceCurrency = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
  $rateMethod = $this->getMockBuilder(Method::class)
  ->setConstructorArgs(['priceCurrency' => $priceCurrency])
+ ->onlyMethods([])
  ->getMock();
  $rateMethodFactory = $this->getMockBuilder(MethodFactory::class)
  ->disableOriginalConstructor()

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -221,6 +221,7 @@ public function testGetSummaryStats()
  $localeEmulator = $this->getMockForAbstractClass(LocaleEmulatorInterface::class);
  $localeEmulator->method('emulate')
  ->willReturnCallback(fn (callable $callback) => $callback());
+ $this->objectManagerHelper->prepareObjectManager();
  $import = new Import(
  $logger,
  $filesystem,

app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php

@@ -17,6 +17,8 @@
 use Magento\Framework\Url\EncoderInterface;
 use Magento\Framework\View\Design\Theme\Customization;
 use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Filesystem\Io\File;
 use Magento\Theme\Helper\Storage;
 use Magento\Theme\Model\Theme;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -93,6 +95,11 @@ class StorageTest extends TestCase
  */
  private $filesystemDriver;
 
+ /**
+ * @var File|MockObject
+ */
+ private $file;
+
  /**
  * @inheritDoc
  */
@@ -125,17 +132,29 @@ protected function setUp(): void
  $this->contextHelper->expects($this->any())->method('getUrlDecoder')->willReturn($this->urlDecoder);
  $this->themeFactory->expects($this->any())->method('create')->willReturn($this->theme);
  $this->filesystemDriver = $this->createMock(DriverInterface::class);
+ $this->file = $this->createMock(File::class);
+
+ $this->file->expects($this->any())
+ ->method('getPathInfo')
+ ->willReturnCallback(
+ function ($path) {
+ return pathinfo($path);
+ }
+ );
 
  $this->theme->expects($this->any())
  ->method('getCustomization')
  ->willReturn($this->customization);
 
+// $objectManager = new ObjectManager($this);
+// $objectManager->prepareObjectManager();
+
  $this->helper = new Storage(
  $this->contextHelper,
  $this->filesystem,
  $this->session,
  $this->themeFactory,
- null,
+ $this->file,
  $this->filesystemDriver
  );
  }
@@ -190,6 +209,8 @@ public function testGetThumbnailDirectory(): void
  ['root', 'image', \Magento\Theme\Model\Wysiwyg\Storage::THUMBNAIL_DIRECTORY]
  );
 
+
+
  $this->assertEquals($thumbnailDir, $this->helper->getThumbnailDirectory($imagePath));
  }
 
@@ -443,7 +464,8 @@ public function testGetThemeNotFound(): void
  $this->contextHelper,
  $this->filesystem,
  $this->session,
- $this->themeFactory
+ $this->themeFactory,
+ $this->file
  );
  $helper->getStorageRoot();
  }
@@ -519,14 +541,13 @@ private function initializeDefaultRequestMock(): void
  {
  $this->request
  ->method('getParam')
- ->withConsecutive(
- [Storage::PARAM_THEME_ID],
- [Storage::PARAM_CONTENT_TYPE]
- )
- ->willReturnOnConsecutiveCalls(
- 6,
- \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE
- );
+ ->willReturnCallback(function ($param) {
+ return match ($param) {
+ Storage::PARAM_THEME_ID => 6,
+ Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE,
+ default => '',
+ };
+ });
  }
 
  /**
@@ -546,15 +567,19 @@ private function resetRequestMock(array $withArgs, array $willReturnArgs): void
  $this->contextHelper->expects($this->any())->method('getRequest')->willReturn($this->request);
  $this->request
  ->method('getParam')
- ->withConsecutive(...$withArgs)
- ->willReturnOnConsecutiveCalls(...$willReturnArgs);
+ ->willReturnCallback(function ($withArgs) use ($willReturnArgs) {
+ static $callCount = 0;
+ $returnValue = $willReturnArgs[$callCount] ?? null;
+ $callCount++;
+ return $returnValue;
+ });
 
  $this->helper = new Storage(
  $this->contextHelper,
  $this->filesystem,
  $this->session,
  $this->themeFactory,
- null,
+ $this->file,
  $this->filesystemDriver
  );
  }

vendor/.htaccess

@@ -0,0 +1,7 @@
+<IfVersion < 2.4>
+ order allow,deny
+ deny from all
+</IfVersion>
+<IfVersion >= 2.4>
+ Require all denied
+</IfVersion>