Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Zend_Json from the unit test in the CustomerImportExport module #8706

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Remove Zend_Json from the unit test in the CustomerImportExport module #8706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function testGetNextBunch($entityType, $bunchData, $expectedData)
->getMock();
$jsonDecoderMock->expects($this->once())
->method('decode')
->willReturn(\Zend_Json::decode($bunchData));
->willReturn(json_decode($bunchData, true));
$jsonHelper = $helper->getObject(
\Magento\Framework\Json\Helper\Data::class,
[
Expand Down Expand Up @@ -140,7 +140,7 @@ public function getNextBunchDataProvider()
return [
'address entity' => [
'$entityType' => CustomerComposite::COMPONENT_ENTITY_ADDRESS,
'$bunchData' => \Zend_Json::encode(
'$bunchData' => json_encode(
[
[
'_scope' => CustomerComposite::SCOPE_DEFAULT,
Expand Down Expand Up @@ -170,7 +170,7 @@ public function getNextBunchDataProvider()
],
'customer entity default scope' => [
'$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,
'$bunchData' => \Zend_Json::encode(
'$bunchData' => json_encode(
[
[
'_scope' => CustomerComposite::SCOPE_DEFAULT,
Expand Down Expand Up @@ -202,7 +202,7 @@ public function getNextBunchDataProvider()
],
'customer entity address scope' => [
'$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,
'$bunchData' => \Zend_Json::encode(
'$bunchData' => json_encode(
[
[
'_scope' => CustomerComposite::SCOPE_ADDRESS,
Expand Down