Merge branch 'MAGETWO-83424-Graph-Ql-Custom-Attributes' of github.com:magento-honey-badgers/magento2ce into MAGETWO-83424-Graph-Ql-Custom-Attributes

Author: cpartica

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

@@ -357,12 +357,12 @@ define([
             var element;
 
             _.each(this.disabledAttributes, function (attribute) {
-                registry.get('code = ' + attribute, 'index = ' + attribute).disabled(false);
+                registry.get('index = ' + attribute).disabled(false);
             });
             this.disabledAttributes = [];
 
             _.each(attributes, function (attribute) {
-                element = registry.get('code = ' + attribute.code, 'index = ' + attribute.code);
+                element = registry.get('index = ' + attribute.code);
 
                 if (!_.isUndefined(element)) {
                     element.disabled(true);

lib/internal/Magento/Framework/GraphQl/Query/PostFetchProcessorInterface.php renamed to app/code/Magento/Framework/GraphQl/Query/PostFetchProcessorInterface.php

@@ -17,6 +17,8 @@
 
 /**
  * Translate web API service contract layer from array-style schema to GraphQL types
+ *
+ * @api
  */
 class TypeGenerator
 {

app/code/Magento/GraphQl/Model/Type/ServiceContract/TypeGenerator.php

@@ -65,7 +65,7 @@
                 <item name="entityIdToId" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\EntityIdToId</item>
                 <item name="mediaGalleryEntries" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\MediaGalleryEntries</item>
                 <item name="options" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\Options</item>
-                <item name="price" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\Price</item>
+                <!--<item name="price" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\Price</item>-->
                 <item name="tierPrices" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\TierPrices</item>
             </argument>
         </arguments>

app/code/Magento/GraphQlCatalog/etc/graphql/di.xml

@@ -18,8 +18,10 @@
 
 /** @var Magento\Framework\Registry $registry */
 $registry = $objectManager->get(\Magento\Framework\Registry::class);
-$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate_AL');
-$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate_NY_AL', $rate);
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate', $rate);
+//$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate_AL');
+//$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate_NY_AL', $rate);
 
 $ruleData = [
     'code' => 'AL Test Rule',
@@ -32,3 +34,5 @@
 ];
 
 $taxRule = $objectManager->create(\Magento\Tax\Model\Calculation\Rule::class)->setData($ruleData)->save();
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rule');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rule', $taxRule);

dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al.php

@@ -239,19 +239,15 @@ public function isLess($value, $currency = null);
     /**
      * Returns the set service class
      *
-     * @return \Zend_Currency_CurrencyInterface
-     * @deprecated
-     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
+     * @return \Zend_Service
      */
     public function getService();
 
     /**
      * Sets a new exchange service
      *
-     * @param string|\Zend_Currency_CurrencyInterface $service Service class
-     * @return \Zend_Currency_CurrencyInterface
-     * @deprecated
-     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
+     * @param string|\Magento\Framework\Locale\CurrencyInterface $service Service class
+     * @return \Magento\Framework\CurrencyInterface
      */
     public function setService($service);
 }