Add version 2.1.1

Author: imsamthomas

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.1.1
+=============
+To get detailed information about changes in Magento 2.1.1, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.1CE.html "Magento Community Edition (CE) Release Notes")
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

app/etc/di.xml

@@ -37,6 +37,7 @@
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
     <preference for="Magento\Framework\Api\Search\DocumentInterface" type="Magento\Framework\Api\Search\Document" />
     <preference for="Magento\Framework\Api\Search\AggregationInterface" type="Magento\Framework\Search\Response\Aggregation" />
+    <preference for="Magento\Framework\App\RequestSafetyInterface" type="Magento\Framework\App\Request\Http" />
     <type name="Magento\Store\Model\Store">
         <arguments>
             <argument name="currencyInstalled" xsi:type="string">system/currency/installed</argument>
@@ -1192,6 +1193,7 @@
         <arguments>
             <argument name="cacheList" xsi:type="array">
                 <item name="block_html" xsi:type="const">Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER</item>
+                <item name="collections" xsi:type="const">Magento\Framework\App\Cache\Type\Collection::TYPE_IDENTIFIER</item>
             </argument>
         </arguments>
     </type>

composer.json

@@ -2,13 +2,13 @@
     "name": "magento/project-community-edition",
     "description": "eCommerce Platform for Growth (Community Edition)",
     "type": "project",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/product-community-edition": "2.1.0",
+        "magento/product-community-edition": "2.1.1",
         "composer/composer": "@alpha"
     },
     "require-dev": {

composer.lock

@@ -105,5 +105,10 @@ public function testCreditmemoGet()
             $this->assertArrayHasKey($field, $actual);
             $this->assertEquals($expected[$field], $actual[$field]);
         }
+
+        //check that nullable fields were marked as optional and were not sent
+        foreach ($actual as $value) {
+            $this->assertNotNull($value);
+        }
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoGetTest.php

@@ -48,5 +48,10 @@ public function testInvoiceGet()
             $this->assertArrayHasKey($field, $result);
             $this->assertEquals($value, $result[$field]);
         }
+
+        //check that nullable fields were marked as optional and were not sent
+        foreach ($result as $value) {
+            $this->assertNotNull($value);
+        }
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceGetTest.php

@@ -81,5 +81,10 @@ public function testOrderGet()
         foreach ($expectedBillingAddressNotEmpty as $field) {
             $this->assertArrayHasKey($field, $result['billing_address']);
         }
+
+        //check that nullable fields were marked as optional and were not sent
+        foreach ($result as $value) {
+            $this->assertNotNull($value);
+        }
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php

@@ -53,6 +53,14 @@ public function testGet()
 
         $this->assertTrue(is_array($response));
         $this->assertOrderItem($orderItem, $response);
+
+        //check that nullable fields were marked as optional and were not sent
+        foreach ($response as $fieldName => $value) {
+            if ($fieldName == 'sku') {
+                continue;
+            }
+            $this->assertNotNull($value);
+        }
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php

@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da
     public function run()
     {
         $products = [];
-        $productsDataSets = explode(',', $this->products);
+        $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);
         foreach ($productsDataSets as $key => $productDataSet) {
             $productDataSet = explode('::', $productDataSet);
             $fixtureClass = $productDataSet[0];

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php

@@ -305,7 +305,6 @@ protected function prepareVariationsMatrix(array $data)
                     $row
                 );
             }
-
         }
     }