Merge pull request #5997 from magento-tsg/2.4-develop-pr73

[TSG] Fixes for 2.4 (pr73) (2.4-develop)

Author: zakdma

app/code/Magento/Theme/Plugin/Data/Collection.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Plugin\Data;
+
+use Magento\Framework\Data\Collection as DataCollection;
+
+/**
+ * Plugin to return last page if current page greater then collection size.
+ */
+class Collection
+{
+    /**
+     * Return last page if current page greater then last page.
+     *
+     * @param DataCollection $subject
+     * @param int $result
+     * @return int
+     */
+    public function afterGetCurPage(DataCollection $subject, int $result): int
+    {
+        if ($result > $subject->getLastPageNumber()) {
+            $result = 1;
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Theme/etc/di.xml

@@ -326,4 +326,7 @@
             <argument name="filesystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>

app/code/Magento/Theme/etc/webapi_rest/di.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" disabled="true"/>
+    </type>
+</config>

app/code/Magento/Theme/etc/webapi_soap/di.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" disabled="true"/>
+    </type>
+</config>

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/CollectionTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Attribute;
+
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+ */
+class CollectionTest extends TestCase
+{
+    /**
+     * @var CollectionFactory .
+     */
+    private $attributesCollectionFactory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->attributesCollectionFactory = $objectManager->get(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @dataProvider attributesCollectionGetCurrentPageDataProvider
+     *
+     * @param array|null $condition
+     * @param int $currentPage
+     * @param int $expectedCurrentPage
+     * @return void
+     */
+    public function testAttributesCollectionGetCurrentPage(
+        ?array $condition,
+        int $currentPage,
+        int $expectedCurrentPage
+    ): void {
+        $attributeCollection = $this->attributesCollectionFactory->create();
+        $attributeCollection->setCurPage($currentPage)->setPageSize(20);
+
+        if ($condition !== null) {
+            $attributeCollection->addFieldToFilter('is_global', $condition);
+        }
+
+        $this->assertEquals($expectedCurrentPage, (int)$attributeCollection->getCurPage());
+    }
+
+    /**
+     * @return array[]
+     */
+    public function attributesCollectionGetCurrentPageDataProvider(): array
+    {
+        return [
+            [
+                'condition' => null,
+                'currentPage' => 1,
+                'expectedCurrentPage' => 1,
+            ],
+            [
+                'condition' => ['eq' => 0],
+                'currentPage' => 1,
+                'expectedCurrentPage' => 1,
+            ],
+            [
+                'condition' => ['eq' => 0],
+                'currentPage' => 15,
+                'expectedCurrentPage' => 1,
+            ],
+        ];
+    }
+}