Merge pull request #1441 from magento-engcom/develop-prs

Public Pull Requests magento/magento2#10670
magento · Aug 29, 2017 · b9d696e · b9d696e
2 parents feb1c5a + c446d38
commit b9d696e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
@@ -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

diff --git a/app/code/Magento/Ui/Component/Action.php b/app/code/Magento/Ui/Component/Action.php
@@ -6,7 +6,6 @@
 namespace Magento\Ui\Component;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Zend\Stdlib\JsonSerializable;
 
 /**
  * Class Action
@@ -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,

diff --git a/lib/internal/Magento/Framework/DB/Sql/Expression.php b/lib/internal/Magento/Framework/DB/Sql/Expression.php
@@ -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