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

Oleksii Korshenko · web-flow · commit 9ed7081088dc · 2017-10-24T23:11:29.000-05:00
Public Pull Requests #11371 Magento UI - Cleanup of undefined mixins parameters and usage of "leaking" variables scope by @Igloczek #11679 MAGETWO-77673: in system.xml translate phrase not work, if comment starts from new line[port from 2.2-develop] by @nmalevanec #11652 [TASK] Moved Customer Groups Menu Item from Other settings to Customers by @lewisvoncken #11665 Fix app/code/Magento/Backend/Block/Media/Uploader.php getConfigJson() method by @adrian-martinez-interactiv4 #11663 Clean unreachable code in creditmemo model by @adrian-martinez-interactiv4 #11666 testGetIgnoresFirstSlash method in ObjectManagerTest has lost its purpose (dummy test) by @adrian-martinez-interactiv4 #11667 Travis: surround variable TRAVIS_BRANCH with double-quotes instead of single-quotes by @adrian-martinez-interactiv4 #11452 #11328 : app:config:dump adds extra space every time in multiline array value by @adrian-martinez-interactiv4 Fixed Public Issues #7767 in system.xml translate phrase not work #11328 app:config:dump adds extra space every time in multiline array value
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Media;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml media library uploader
  * @api
@@ -27,16 +29,25 @@ class Uploader extends \Magento\Backend\Block\Widget
      */
     protected $_fileSizeService;
 
+    /**
+     * @var \Magento\Framework\Json\EncoderInterface
+     */
+    protected $_jsonEncoder;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\File\Size $fileSize,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder = null
     ) {
+        $this->_jsonEncoder = $jsonEncoder ?:
+            ObjectManager::getInstance()->get(\Magento\Framework\Json\EncoderInterface::class);
         $this->_fileSizeService = $fileSize;
         parent::__construct($context, $data);
     }
@@ -107,7 +118,7 @@ public function getJsObjectName()
      */
     public function getConfigJson()
     {
-        return $this->_coreData->jsonEncode($this->getConfig()->getData());
+        return $this->_jsonEncoder->encode($this->getConfig()->getData());
     }
 
     /**
diff --git a/app/code/Magento/Customer/etc/adminhtml/menu.xml b/app/code/Magento/Customer/etc/adminhtml/menu.xml
@@ -10,6 +10,6 @@
         <add id="Magento_Customer::customer" title="Customers" translate="title" module="Magento_Customer" sortOrder="30" resource="Magento_Customer::customer"/>
         <add id="Magento_Customer::customer_manage" title="All Customers" translate="title" module="Magento_Customer" sortOrder="10" parent="Magento_Customer::customer" action="customer/index/" resource="Magento_Customer::manage"/>
         <add id="Magento_Customer::customer_online" title="Now Online" translate="title" module="Magento_Customer" sortOrder="30" parent="Magento_Customer::customer" action="customer/online/" resource="Magento_Customer::online"/>
-        <add id="Magento_Customer::customer_group" title="Customer Groups" translate="title" module="Magento_Customer" sortOrder="50" parent="Magento_Backend::other_settings" action="customer/group" resource="Magento_Customer::group"/>
+        <add id="Magento_Customer::customer_group" title="Customer Groups" translate="title" module="Magento_Customer" sortOrder="50" parent="Magento_Customer::customer" action="customer/group" resource="Magento_Customer::group"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -412,23 +412,6 @@ public function canCancel()
     public function canVoid()
     {
         return false;
-        $canVoid = false;
-        if ($this->getState() == self::STATE_REFUNDED) {
-            $canVoid = $this->getCanVoidFlag();
-            /**
-             * If we not retrieve negative answer from payment yet
-             */
-            if (is_null($canVoid)) {
-                $canVoid = $this->getOrder()->getPayment()->canVoid();
-                if ($canVoid === false) {
-                    $this->setCanVoidFlag(false);
-                    $this->_saveBeforeDestruct = true;
-                }
-            } else {
-                $canVoid = (bool)$canVoid;
-            }
-        }
-        return $canVoid;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -16,7 +16,7 @@
  *
  * Test Flow:
  * 1.Log in to backend as admin user.
- * 2.Navigate to Stores>Other Settings>Customer Groups.
+ * 2.Navigate to Customers > Customer Groups.
  * 3.Start to create new Customer Group.
  * 4.Fill in all data according to data set.
  * 5.Click "Save Customer Group" button.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -18,7 +18,7 @@
  *  2. Customer is created and assigned to this group.
  * Steps:
  *  1. Log in to backend as admin user.
- *  2. Navigate to Stores > Other Settings > Customer Groups.
+ *  2. Navigate to Customers > Customer Groups.
  *  3. Click on Customer Group from grid.
  *  4. Click on Delete "Customer Group".
  *  5. Confirm in pop-up.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
@@ -13,7 +13,7 @@
 /**
  * Steps:
  * 1. Login to backend as admin user.
- * 2. Navigate to Stores > Other Settings > Customer Groups.
+ * 2. Navigate to Customers > Customer Groups.
  * 3. Select system Customer Group specified in data set from grid.
  * 4. Perform all assertions.
  *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
@@ -18,7 +18,7 @@
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest24">
-            <data name="menuItem" xsi:type="string">Stores > Customer Groups</data>
+            <data name="menuItem" xsi:type="string">Customers > Customer Groups</data>
             <data name="pageTitle" xsi:type="string">Customer Groups</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -19,7 +19,7 @@
  * 1. Customer Group is created
  * Steps:
  * 1. Log in to backend as admin user
- * 2. Navigate to Stores > Other Settings > Customer Groups
+ * 2. Navigate to Customers > Customer Groups
  * 3. Click on Customer Group from grid
  * 4. Update data according to data set
  * 5. Click "Save Customer Group" button
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
@@ -13,7 +13,7 @@
 /**
  * Steps:
  * 1. Login to backend as admin user.
- * 2. Navigate to Stores > Other Settings > Customer Groups.
+ * 2. Navigate to Customers > Customer Groups.
  * 3. Select system Customer Group specified in data set from grid.
  * 4. Perform all assertions.
  *
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
@@ -71,7 +71,7 @@ case $TEST_SUITE in
             --output-file="$changed_files_ce" \
             --base-path="$TRAVIS_BUILD_DIR" \
             --repo='https://github.com/magento/magento2.git' \
-            --branch='$TRAVIS_BRANCH'
+            --branch="$TRAVIS_BRANCH"
         cat "$changed_files_ce" | sed 's/^/  + including /'
 
         cd ../../..
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -21,20 +21,20 @@ class PhpFormatter implements FormatterInterface
     public function format($data, array $comments = [])
     {
         if (!empty($comments) && is_array($data)) {
-            return "<?php\nreturn array (\n" . $this->formatData($data, $comments, '  ') . "\n);\n";
+            return "<?php\nreturn array (\n" . $this->formatData($data, $comments) . "\n);\n";
         }
         return "<?php\nreturn " . var_export($data, true) . ";\n";
     }
 
     /**
      * Format supplied data
      *
-     * @param $data
-     * @param $comments
+     * @param string[] $data
+     * @param string[] $comments
      * @param string $prefix
      * @return string
      */
-    protected function formatData($data, $comments, $prefix = '')
+    private function formatData($data, $comments = [], $prefix = '  ')
     {
         $elements = [];
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
@@ -11,8 +11,8 @@ class PhpFormatterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider formatWithCommentDataProvider
-     * @param string|array $data
-     * @param array $comments
+     * @param string[] $data
+     * @param string[] $comments
      * @param string $expectedResult
      */
     public function testFormat($data, $comments, $expectedResult)
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php
@@ -400,7 +400,7 @@ public function testGetIgnoresFirstSlash()
     {
         $this->assertSame(
             $this->_object->get(\Magento\Test\Di\Child::class),
-            $this->_object->get(\Magento\Test\Di\Child::class)
+            $this->_object->get('\\' . \Magento\Test\Di\Child::class)
         );
     }
 }
diff --git a/lib/web/css/source/lib/_icons.less b/lib/web/css/source/lib/_icons.less
@@ -285,6 +285,10 @@
     .lib-icon-text-hide();
 }
 
+._lib-icon-image-url(@_path) when not (@_path = false) {
+    .lib-css(background-image, url(@_path));
+}
+
 ._lib-icon-image(
     @_icon-image,
     @_icon-image-width,
@@ -294,9 +298,7 @@
     @_icon-image-position-x,
     @_icon-image-position-y
 ) {
-    .lib-url-check(@_icon-image);
-
-    .lib-css(background-image, @lib-url-check-output); // @lib-url-check-output is a returned variable of .lib-url-check() mixin
+    ._lib-icon-image-url(@_icon-image);
     .lib-css(background-position-x, @_icon-image-position-x);
     .lib-css(background-position-y, @_icon-image-position-y);
     .lib-css(line-height, @_icon-image-height);
diff --git a/lib/web/css/source/lib/_pages.less b/lib/web/css/source/lib/_pages.less
diff --git a/lib/web/css/source/lib/_utilities.less b/lib/web/css/source/lib/_utilities.less
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* Test Flow:`
`18`	`18`	`* 1.Log in to backend as admin user.`
`19`		`- * 2.Navigate to Stores>Other Settings>Customer Groups.`
	`19`	`+ * 2.Navigate to Customers > Customer Groups.`
`20`	`20`	`* 3.Start to create new Customer Group.`
`21`	`21`	`* 4.Fill in all data according to data set.`
`22`	`22`	`* 5.Click "Save Customer Group" button.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* Steps:`
`15`	`15`	`* 1. Login to backend as admin user.`
`16`		`- * 2. Navigate to Stores > Other Settings > Customer Groups.`
	`16`	`+ * 2. Navigate to Customers > Customer Groups.`
`17`	`17`	`* 3. Select system Customer Group specified in data set from grid.`
`18`	`18`	`* 4. Perform all assertions.`
`19`	`19`	`*`