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

Removed deprecated Zend\Stdlib\JsonSerializable references #10670

Merged
merged 2 commits into from
Aug 29, 2017
Merged

Removed deprecated Zend\Stdlib\JsonSerializable references #10670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6980c0f
Removed all references to the \Zend\Stdlib\JsonSerializable class sin…
dverkade Aug 26, 2017
f5776a6
Fixed coding standard violation
dverkade Aug 26, 2017
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
3 changes: 1 addition & 2 deletions app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@

use Magento\Framework\Phrase;
use Magento\Framework\UrlInterface;
use Zend\Stdlib\JsonSerializable;
use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;

/**
* Class Options
*/
class Options implements JsonSerializable
class Options implements \JsonSerializable
{
/**
* @var array
Expand Down
5 changes: 2 additions & 3 deletions app/code/Magento/Ui/Component/Action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
namespace Magento\Ui\Component;

use Magento\Framework\View\Element\UiComponent\ContextInterface;
use Zend\Stdlib\JsonSerializable;

/**
* Class Action
Expand All @@ -16,15 +15,15 @@ class Action extends AbstractComponent
const NAME = 'action';

/**
* @var array|JsonSerializable
* @var array|\JsonSerializable
*/
protected $actions;

/**
* @param ContextInterface $context
* @param array $components
* @param array $data
* @param array|JsonSerializable $actions
* @param array|\JsonSerializable $actions
*/
public function __construct(
ContextInterface $context,
Expand Down
4 changes: 1 addition & 3 deletions lib/internal/Magento/Framework/DB/Sql/Expression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
*/
namespace Magento\Framework\DB\Sql;

use Zend\Stdlib\JsonSerializable;

/**
* Class is wrapper over Zend_Db_Expr for implement JsonSerializable interface.
*/
class Expression extends \Zend_Db_Expr implements ExpressionInterface, JsonSerializable
class Expression extends \Zend_Db_Expr implements ExpressionInterface, \JsonSerializable
{
/**
* @inheritdoc
Expand Down