Merge branch 'develop' of github.com:magento-pangolin/magento2ce into sprint-develop

Author: okolesnyk

.htaccess

@@ -36,7 +36,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
@@ -59,7 +59,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################

.htaccess.sample

@@ -35,7 +35,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################

.user.ini

@@ -1,4 +1,4 @@
-memory_limit = 768M
+memory_limit = 756M
 max_execution_time = 18000
 session.auto_start = off
 suhosin.session.cryptua = off

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
                     $tmpstring = implode('|', $this->_axisLabels[$idx]);
 
                     $valueBuffer[] = $indexid . ":|" . $tmpstring;
+                } elseif ($idx == 'y') {
+                    $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
                 }
                 $indexid++;
             }

app/code/Magento/Backend/Block/Media/Uploader.php

@@ -6,6 +6,7 @@
 namespace Magento\Backend\Block\Media;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Adminhtml media library uploader
@@ -30,25 +31,24 @@ class Uploader extends \Magento\Backend\Block\Widget
     protected $_fileSizeService;
 
     /**
-     * @var \Magento\Framework\Json\EncoderInterface
+     * @var Json
      */
-    protected $_jsonEncoder;
+    private $jsonEncoder;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param Json $jsonEncoder
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\File\Size $fileSize,
         array $data = [],
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder = null
+        Json $jsonEncoder = null
     ) {
-        $this->_jsonEncoder = $jsonEncoder ?:
-            ObjectManager::getInstance()->get(\Magento\Framework\Json\EncoderInterface::class);
         $this->_fileSizeService = $fileSize;
+        $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct($context, $data);
     }
 
@@ -118,7 +118,7 @@ public function getJsObjectName()
      */
     public function getConfigJson()
     {
-        return $this->_jsonEncoder->encode($this->getConfig()->getData());
+        return $this->jsonEncoder->encode($this->getConfig()->getData());
     }
 
     /**

app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php

@@ -62,6 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
+        $this->searchCriteriaBuilder->setFilterGroups((array)$searchCriteria->getFilterGroups());
         $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
@@ -71,9 +72,15 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
                     ->create(),
             ]
         );
+
+        $this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders());
         $this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage());
         $this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize());
-        return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
+
+        $searchResult = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
     }
 
     /**

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GraphQl\Controller;
+
+use GraphQL\Error\FormattedError;
+use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Webapi\Response;
+use Magento\GraphQl\Model\SchemaGeneratorInterface;
+
+/**
+ * Front controller for web API GraphQL area.
+ */
+class GraphQl implements FrontControllerInterface
+{
+    /**
+     * @var Response
+     */
+    private $response;
+
+    /**
+     * @var SchemaGeneratorInterface
+     */
+    private $schemaGenerator;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param Response $response
+     * @param SchemaGeneratorInterface $schemaGenerator
+     */
+    public function __construct(
+        Response $response,
+        SchemaGeneratorInterface $schemaGenerator
+    ) {
+        $this->response = $response;
+        $this->schemaGenerator = $schemaGenerator;
+    }
+
+    /**
+     * Handle GraphQL request
+     *
+     * @param RequestInterface $request
+     * @return ResponseInterface
+     */
+    public function dispatch(RequestInterface $request)
+    {
+        try {
+            if ($request->getHeader('Content-Type')
+                && strpos($request->getHeader('Content-Type'), 'application/json') !== false
+            ) {
+                $raw = file_get_contents('php://input') ?: '';
+                $data = json_decode($raw, true);
+            } else {
+                $data = $_REQUEST;
+            }
+            $schema = $this->schemaGenerator->generate();
+            $result = \GraphQL\GraphQL::execute(
+                $schema,
+                isset($data['query']) ? $data['query'] : '',
+                null,
+                null,
+                isset($data['variables']) ? $data['variables'] : []
+            );
+        } catch (\Exception $error) {
+            $result['extensions']['exception'] = FormattedError::createFromException($error);
+            $this->response->setStatusCode(500);
+        }
+        $this->response->setBody(json_encode($result))->setHeader('Content-Type', 'application/json');
+        return $this->response;
+    }
+}

app/code/Magento/GraphQl/Model/Resolver/MediaGalleryEntries.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GraphQl\Model\Resolver;
+
+use Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface;
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+
+/**
+ * Media gallery field resolver, used for GraphQL request processing.
+ */
+class MediaGalleryEntries
+{
+    /**
+     * @var ProductAttributeMediaGalleryManagementInterface
+     */
+    private $mediaGalleryManagement;
+
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * MediaGalleryEntries constructor.
+     *
+     * @param ProductAttributeMediaGalleryManagementInterface $mediaGalleryManagement
+     * @param ServiceOutputProcessor $serviceOutputProcessor
+     */
+    public function __construct(
+        ProductAttributeMediaGalleryManagementInterface $mediaGalleryManagement,
+        ServiceOutputProcessor $serviceOutputProcessor
+    ) {
+        $this->mediaGalleryManagement = $mediaGalleryManagement;
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+    }
+
+    /**
+     * Get media gallery entries for the specified product.
+     *
+     * @param string $sku
+     * @return array|null
+     */
+    public function getMediaGalleryEntries(string $sku)
+    {
+        try {
+            $mediaGalleryObjectArray = $this->mediaGalleryManagement->getList($sku);
+        } catch (NoSuchEntityException $e) {
+            // No error should be thrown, null result should be returned
+            return null;
+        }
+
+        $mediaGalleryList = $this->serviceOutputProcessor->process(
+            $mediaGalleryObjectArray,
+            ProductAttributeMediaGalleryManagementInterface::class,
+            'getList'
+        );
+
+        foreach ($mediaGalleryList as $key => $mediaGallery) {
+            if (isset($mediaGallery[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])
+                && isset($mediaGallery[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['video_content'])) {
+                $mediaGallery = array_merge(
+                    $mediaGallery,
+                    $mediaGallery[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]
+                );
+                $mediaGalleryList[$key] = $mediaGallery;
+            }
+        }
+
+        return $mediaGalleryList;
+    }
+}