Merge remote-tracking branch 'magento-l3/ACP2E-2481' into 2.4-develop

Author: Sarmistha

app/code/Magento/Catalog/Model/Category.php

@@ -109,6 +109,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
      * @deprecated 102.0.0
+     * @see \Magento\UrlRewrite\Model\UrlFinderInterface
      */
     protected $_urlRewrite;
 
@@ -315,6 +316,7 @@ protected function getCustomAttributesCodes()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\ResourceModel\Category
      * @deprecated 102.0.6 because resource models should be used directly
+     * @see \Magento\Catalog\Model\ResourceModel\Category
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @since 102.0.6
      */
@@ -615,6 +617,7 @@ public function getUrl()
                     UrlRewrite::ENTITY_ID => $this->getId(),
                     UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
                     UrlRewrite::STORE_ID => $this->getStoreId(),
+                    UrlRewrite::REDIRECT_TYPE => 0
                 ]
             );
             if ($rewrite) {

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php

@@ -14,13 +14,18 @@
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\Tree;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
 use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Math\Random;
 use Magento\Framework\Url;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -57,8 +62,14 @@ class CategoryTest extends TestCase
     /** @var CategoryRepositoryInterface */
     private $categoryRepository;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $dataFixtureStorage;
+
     /**
      * @inheritdoc
+     * @throws LocalizedException
      */
     protected function setUp(): void
     {
@@ -69,6 +80,7 @@ protected function setUp(): void
         $this->_model = $this->objectManager->create(Category::class);
         $this->categoryResource = $this->objectManager->get(CategoryResource::class);
         $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
+        $this->dataFixtureStorage = DataFixtureStorageManager::getStorage();
     }
 
     public function testGetUrlInstance(): void
@@ -509,4 +521,21 @@ protected function getCategoryByName($categoryName)
 
         return $collection->getItemByColumnValue('name', $categoryName);
     }
+
+    /**
+     * @return void
+     * @throws LocalizedException|\Exception
+     */
+    #[
+        DataFixture(CategoryFixture::class, as: 'category'),
+    ]
+    public function testGetUrlAfterUpdate()
+    {
+        $category = $this->dataFixtureStorage->get('category');
+        $category->setUrlKey('new-url');
+        $category->setSaveRewritesHistory(true);
+        $this->categoryResource->save($category);
+
+        $this->assertStringEndsWith('new-url.html', $category->getUrl());
+    }
 }