MAGETWO-87526: URL rewrite for store is not created for child if parent category has non-default URL key on store

Author: le0n4eg

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/UpdateUrlPath.php

@@ -5,13 +5,14 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Category;
 
-use \Magento\Catalog\Model\Category;
-use \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-use \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use \Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-use \Magento\UrlRewrite\Model\UrlPersistInterface;
-use \Magento\Store\Model\Store;
-use \Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
 
 /**
  * Generate and save url-rewrites for category if its parent have specified url-key for different store views
@@ -61,14 +62,14 @@ public function __construct(
      *
      * @param CategoryResource $subject
      * @param CategoryResource $result
-     * @param Category $category
+     * @param AbstractModel $category
      * @return CategoryResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterSave(
         CategoryResource $subject,
         CategoryResource $result,
-        Category $category
+        AbstractModel $category
     ) {
         $parentCategoryId = $category->getParentId();
         if ($category->isObjectNew()

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/UpdateUrlPathTest.php

@@ -114,10 +114,10 @@ public function testAroundSaveWithoutRootCategory()
         $this->category->expects($this->atLeastOnce())->method('isInRootCategoryList')->willReturn(false);
         $this->category->expects($this->never())->method('getStoreIds');
 
-       $this->assertEquals(
-           $this->categoryResource,
-           $this->updateUrlPathPlugin->afterSave($this->categoryResource, $this->categoryResource, $this->category)
-       );
+        $this->assertEquals(
+            $this->categoryResource,
+            $this->updateUrlPathPlugin->afterSave($this->categoryResource, $this->categoryResource, $this->category)
+        );
     }
 
     public function testAroundSaveWithRootCategory()