diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php index e0c49a15b273599bb4aca41726a314133d015032..ccc0b9c83f287f5c5329f17250b59b39beda60d2 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php @@ -12,7 +12,7 @@ use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator; use Magento\UrlRewrite\Model\UrlPersistInterface; use Magento\UrlRewrite\Service\V1\Data\UrlRewrite; use Magento\Framework\App\ObjectManager; -use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\Serialize\Serializer\Json; class Remove { @@ -25,25 +25,25 @@ class Remove /** @var ChildrenCategoriesProvider */ protected $childrenCategoriesProvider; - /** @var SerializerInterface */ + /** @var Json */ private $serializer; /** * @param UrlPersistInterface $urlPersist * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator * @param ChildrenCategoriesProvider $childrenCategoriesProvider - * @param SerializerInterface|null $serializer + * @param Json|null $serializer */ public function __construct( UrlPersistInterface $urlPersist, ProductUrlRewriteGenerator $productUrlRewriteGenerator, ChildrenCategoriesProvider $childrenCategoriesProvider, - SerializerInterface $serializer = null + Json $serializer = null ) { $this->urlPersist = $urlPersist; $this->productUrlRewriteGenerator = $productUrlRewriteGenerator; $this->childrenCategoriesProvider = $childrenCategoriesProvider; - $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); + $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class); } /** diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php index 16bf67b08afffd505ba9d86b62beb5fedc2231f6..e334bf414013fa5f29570ebc09e95d439bbfa2bc 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php @@ -13,7 +13,7 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\Event\Observer as EventObserver; use Magento\UrlRewrite\Model\UrlPersistInterface; use Magento\UrlRewrite\Service\V1\Data\UrlRewrite; -use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\Serialize\Serializer\Json; class UrlRewriteHandler { @@ -38,7 +38,7 @@ class UrlRewriteHandler /** @var CategoryBasedProductRewriteGenerator */ private $categoryBasedProductRewriteGenerator; - /** @var SerializerInterface */ + /** @var Json */ private $serializer; /** @@ -47,7 +47,7 @@ class UrlRewriteHandler * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator * @param UrlPersistInterface $urlPersist * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory - * @param SerializerInterface|null $serializer + * @param Json|null $serializer */ public function __construct( \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider, @@ -55,14 +55,14 @@ class UrlRewriteHandler ProductUrlRewriteGenerator $productUrlRewriteGenerator, UrlPersistInterface $urlPersist, \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory, - SerializerInterface $serializer = null + Json $serializer = null ) { $this->childrenCategoriesProvider = $childrenCategoriesProvider; $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator; $this->productUrlRewriteGenerator = $productUrlRewriteGenerator; $this->urlPersist = $urlPersist; $this->productCollectionFactory = $productCollectionFactory; - $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); + $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class); } /** diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php index 863c15e41fcb228ca4c54e0760f19949530ed2c1..a2cd880e85acca6c60df9078b54df53f28d5c3ca 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php @@ -39,7 +39,7 @@ class RemoveTest extends \PHPUnit_Framework_TestCase */ private $objectMock; - /** @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */ private $serializerMock; protected function setUp() @@ -55,7 +55,7 @@ class RemoveTest extends \PHPUnit_Framework_TestCase $this->objectMock = $this->getMockBuilder(Category::class) ->disableOriginalConstructor() ->getMock(); - $this->serializerMock = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class, [], [], '', false); + $this->serializerMock = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false); } public function testAroundDelete() diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php index 10005c44bc57c18d892d0cb2576661d740cf3911..efd755f7003bb9ac29d1de1319efb80e2a55d605 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php @@ -34,7 +34,7 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $categoryRepository; - /** @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */ protected $serializer; /** @@ -42,7 +42,7 @@ class CategoryUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class, [], [], '', false); + $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false); $this->serializer->expects($this->any()) ->method('serialize') ->willReturnCallback( diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php index 40f364ef6ba6e1eada07ce8d46330cc74c04aa40..18459637a4758b5c88f2b18573b8ed302e47fad2 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php @@ -41,12 +41,12 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit_Framework_TestCase /** @var ProductScopeRewriteGenerator */ private $productScopeGenerator; - /** @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */ private $serializer; public function setUp() { - $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class, [], [], '', false); + $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false); $this->serializer->expects($this->any()) ->method('serialize') ->willReturnCallback( diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php index 0a7dece2a86f0701c6c046e20876ad6907851124..db6d0548fb7b81c4c0877053a24bf0eaccd0c3d9 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php @@ -11,7 +11,7 @@ use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator; use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator; use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory; use Magento\UrlRewrite\Model\UrlPersistInterface; -use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\Serialize\Serializer\Json; class UrlRewriteHandlerTest extends \PHPUnit_Framework_TestCase { @@ -68,7 +68,7 @@ class UrlRewriteHandlerTest extends \PHPUnit_Framework_TestCase $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class) ->disableOriginalConstructor() ->getMock(); - $this->serializerMock = $this->getMockBuilder(SerializerInterface::class) + $this->serializerMock = $this->getMockBuilder(Json::class) ->disableOriginalConstructor() ->getMock(); diff --git a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php index 3dbf8ff69bcf67a6c49c1ed9a65a6a2079d771c8..e2eaae257b2912c6cfa0178739c70a949d0c06e2 100644 --- a/app/code/Magento/UrlRewrite/Model/UrlRewrite.php +++ b/app/code/Magento/UrlRewrite/Model/UrlRewrite.php @@ -6,7 +6,7 @@ namespace Magento\UrlRewrite\Model; use Magento\Framework\App\ObjectManager; -use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\Serialize\Serializer\Json; /** * @method int getEntityId() @@ -26,7 +26,7 @@ use Magento\Framework\Serialize\SerializerInterface; class UrlRewrite extends \Magento\Framework\Model\AbstractModel { /** - * @var SerializerInterface + * @var Json */ private $serializer; @@ -37,7 +37,7 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection * @param array $data - * @param SerializerInterface $serializer + * @param Json $serializer */ public function __construct( \Magento\Framework\Model\Context $context, @@ -45,9 +45,9 @@ class UrlRewrite extends \Magento\Framework\Model\AbstractModel \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, array $data = [], - SerializerInterface $serializer = null + Json $serializer = null ) { - $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); + $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class); parent::__construct($context, $registry, $resource, $resourceCollection, $data); } diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php index cb7ae6ec328d9f740aaf406431b10bc81599be71..8ed0479a07637fac5cc6f95dfd510c6240e0ad96 100644 --- a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php +++ b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php @@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Service\V1\Data; use Magento\Framework\Api\AbstractSimpleObject; use Magento\Framework\App\ObjectManager; -use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\Serialize\Serializer\Json; /** * Data abstract class for url storage @@ -40,7 +40,7 @@ class UrlRewrite extends AbstractSimpleObject ]; /** - * @var SerializerInterface + * @var Json */ private $serializer; @@ -48,13 +48,13 @@ class UrlRewrite extends AbstractSimpleObject * UrlRewrite constructor. * * @param array $data - * @param SerializerInterface $serializer + * @param Json $serializer */ public function __construct( $data = [], - SerializerInterface $serializer = null + Json $serializer = null ) { - $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); + $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class); parent::__construct($data); } diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/UrlRewriteTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/UrlRewriteTest.php index a50d90c0475397df3e201ceb381d0e917e9d0dad..c072a752394e32c7498e2f38adca6a89dac5ed9c 100644 --- a/app/code/Magento/UrlRewrite/Test/Unit/Model/UrlRewriteTest.php +++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/UrlRewriteTest.php @@ -26,7 +26,7 @@ class UrlRewriteTest extends \PHPUnit_Framework_TestCase false ); $resourceCollection = $this->getMock(\Magento\Framework\Data\Collection\AbstractDb::class, [], [], '', false); - $serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class, [], [], '', false); + $serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false); $serializer->expects($this->any()) ->method('serialize') ->willReturnCallback( diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Service/V1/Data/UrlRewriteTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Service/V1/Data/UrlRewriteTest.php index 883368600fbd0d9ccbee40320037797aece3f079..6bc71547f98e079eda89dd4de2fa1c694cc45e3b 100644 --- a/app/code/Magento/UrlRewrite/Test/Unit/Service/V1/Data/UrlRewriteTest.php +++ b/app/code/Magento/UrlRewrite/Test/Unit/Service/V1/Data/UrlRewriteTest.php @@ -16,7 +16,7 @@ class UrlRewriteTest extends \PHPUnit_Framework_TestCase { $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class, [], [], '', false); + $serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false); $serializer->expects($this->any()) ->method('serialize') ->willReturnCallback(