Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-83402-PR-11592

Stanislav Idolov · Stanislav Idolov · commit b510857787ad · 2017-11-20T08:50:00.000+02:00
diff --git a/app/code/Magento/Integration/etc/acl.xml b/app/code/Magento/Integration/etc/acl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Integration::extensions" title="System Extensions" translate="title" sortOrder="30">
+                        <resource id="Magento_Integration::integrations" title="System Integrations" translate="title" sortOrder="40" />
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/Robots/Controller/Index/Index.php b/app/code/Magento/Robots/Controller/Index/Index.php
@@ -43,6 +43,7 @@ public function execute()
         /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create(true);
         $resultPage->addHandle('robots_index_index');
+        $resultPage->setHeader('Content-Type', 'text/plain');
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
@@ -51,6 +51,9 @@ public function testExecute()
         $resultPageMock->expects($this->once())
             ->method('addHandle')
             ->with('robots_index_index');
+        $resultPageMock->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Type', 'text/plain');
 
         $this->resultPageFactory->expects($this->any())
             ->method('create')
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
@@ -7,8 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="root">
-            <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
-        </referenceContainer>
+        <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
     </body>
 </page>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
@@ -1,2 +1,3 @@
 four and 75/100,4.75
-four and 5/10,4.50
+four and 5/10,4.50
+
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -193,7 +193,9 @@ private function readPackCsv($vendor, $package)
             foreach ($foundCsvFiles as $foundCsvFile) {
                 $file = $directoryRead->openFile($foundCsvFile);
                 while (($row = $file->readCsv()) !== false) {
-                    $result[$row[0]] = $row[1];
+                    if (is_array($row) && count($row) > 1) {
+                        $result[$row[0]] = $row[1];
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public function execute()`
`43`	`43`	`/** @var Page $resultPage */`
`44`	`44`	`$resultPage = $this->resultPageFactory->create(true);`
`45`	`45`	`$resultPage->addHandle('robots_index_index');`
	`46`	`+ $resultPage->setHeader('Content-Type', 'text/plain');`
`46`	`47`	`return $resultPage;`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ private function readPackCsv($vendor, $package)`
`193`	`193`	`foreach ($foundCsvFiles as $foundCsvFile) {`
`194`	`194`	`$file = $directoryRead->openFile($foundCsvFile);`
`195`	`195`	`while (($row = $file->readCsv()) !== false) {`
`196`		`- $result[$row[0]] = $row[1];`
	`196`	`+ if (is_array($row) && count($row) > 1) {`
	`197`	`+ $result[$row[0]] = $row[1];`
	`198`	`+ }`
`197`	`199`	`}`
`198`	`200`	`}`
`199`	`201`	`}`