From a9254a7a56323b7dc3544ba509a7cb9defc2db4e Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Fri, 27 May 2016 10:33:15 -0500
Subject: [PATCH 1/7] MAGETWO-53545: Incorrect WSDL List #4537

 - fix how returned service names are processed
---
 app/code/Magento/Webapi/Controller/Soap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Webapi/Controller/Soap.php b/app/code/Magento/Webapi/Controller/Soap.php
index 0fde56dd6b73b..a449504ee1083 100644
--- a/app/code/Magento/Webapi/Controller/Soap.php
+++ b/app/code/Magento/Webapi/Controller/Soap.php
@@ -134,7 +134,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
                 $this->_setResponseBody($responseBody);
             } else if ($this->_isWsdlListRequest()) {
                 $servicesList = [];
-                foreach (array_keys($this->_wsdlGenerator->getListOfServices()) as $serviceName) {
+                foreach ($this->_wsdlGenerator->getListOfServices() as $serviceName) {
                     $servicesList[$serviceName]['wsdl_endpoint'] = $this->_soapServer->getEndpointUri()
                         . '?' . \Magento\Webapi\Model\Soap\Server::REQUEST_PARAM_WSDL . '&services=' . $serviceName;
                 }

From 3ee38508bac7ff180b2e573b1aea5b7e53c25e68 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Fri, 27 May 2016 16:51:50 -0500
Subject: [PATCH 2/7] MAGETWO-52766: [Github] Template Minification is broken
 on the front-end #4365

 - correct regex to allow for "// and '// patterns
---
 .../Magento/Framework/View/Template/Html/Minifier.php         | 2 +-
 .../Framework/View/Test/Unit/Template/Html/MinifierTest.php   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 69bd404606d0a..797fcae985555 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -131,7 +131,7 @@ public function minify($file)
                             '#(?<!:|\\\\|\'|")//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
-                                '#(?<!:)//[^\n\r]*(\s\?\>)#',
+                                '#(?<!:|\'|")//[^\n\r]*(\s\?\>)#',
                                 '$1',
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 94fa61e04cbe5..b51c5570057cf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -149,6 +149,8 @@ public function testMinify()
             //]]>
         </script>
         <?php echo "http://some.link.com/" ?>
+        <?php echo "//some.link.com/" ?>
+        <?php echo '//some.link.com/' ?>
         <em>inline text</em>
         <a href="http://www.<?php echo 'hi' ?>"></a>
     </body>
@@ -174,7 +176,7 @@ public function testMinify()
                 }
             });
             //]]>
-</script><?php echo "http://some.link.com/" ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a></body></html>
+</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a></body></html>
 TEXT;
 
         $this->appDirectoryMock->expects($this->once())

From 57aec98436f096e1e8baa4d3b3d64cefec4034c0 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Tue, 31 May 2016 14:37:29 -0500
Subject: [PATCH 3/7] MAGETWO-52766: [Github] Template Minification is broken
 on the front-end #4365

 - add <link> to test
---
 .../Framework/View/Test/Unit/Template/Html/MinifierTest.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index b51c5570057cf..d9f0353451db8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -124,6 +124,8 @@ public function testMinify()
     <head>
         <title>Test title</title>
     </head>
+    <link rel="stylesheet" href='https://www.example.com/2' type="text/css" />
+    <link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" />
     <body>
         <a href="http://somelink.com/text.html">Text Link</a>
         <img src="test.png" alt="some text" />
@@ -158,7 +160,7 @@ public function testMinify()
 TEXT;
 
         $expectedContent = <<<TEXT
-<?php /** * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><script>
+<?php /** * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><link rel="stylesheet" href='https://www.example.com/2' type="text/css" /><link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" /><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><script>
             var i = 1;
             var j = 1;
 

From dcb649963ae94fe924aef3c63539f7990ac8310c Mon Sep 17 00:00:00 2001
From: Hayder Sharhan <hsharhan@ebay.com>
Date: Wed, 1 Jun 2016 13:33:03 -0500
Subject: [PATCH 4/7] MAGETWO-52993: [Github] Media Uploader Issues #2958

- Error will now be displayed to user that format is not supported..
---
 .../Controller/Adminhtml/Wysiwyg/Images/Upload.php |  2 +-
 lib/web/mage/loader.js                             | 14 +++++++++++++-
 lib/web/mage/loader_old.js                         | 12 ++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 3cc4b06de0dfb..7851f9e3f3d9d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -39,7 +39,7 @@ public function execute()
             $targetPath = $this->getStorage()->getSession()->getCurrentPath();
             $result = $this->getStorage()->uploadFile($targetPath, $this->getRequest()->getParam('type'));
         } catch (\Exception $e) {
-            $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
+            $result = ['error' => true, 'message' => $e->getMessage()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
diff --git a/lib/web/mage/loader.js b/lib/web/mage/loader.js
index d6eea4d67c75b..97b540f909a83 100644
--- a/lib/web/mage/loader.js
+++ b/lib/web/mage/loader.js
@@ -178,7 +178,7 @@ define([
                 .addClass(this.options.loadingClass)
                 .attr({
                     'aria-busy': true
-                })
+                });
 
             if (settings && settings.showLoader) {
                 var ctx = this._getJqueryObj(settings.loaderContext);
@@ -201,6 +201,18 @@ define([
             if (settings && settings.showLoader) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
+
+            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
+                var tempErrorMessage = document.createElement("div");
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
+
+                tempErrorMessage.addEventListener("click", function () {
+                    tempErrorMessage.remove();
+                }, false);
+
+                document.querySelector("#content_header").appendChild(tempErrorMessage);
+            }
         }
 
     });
diff --git a/lib/web/mage/loader_old.js b/lib/web/mage/loader_old.js
index 9b394ae9429b9..e2cf96f98eb7f 100644
--- a/lib/web/mage/loader_old.js
+++ b/lib/web/mage/loader_old.js
@@ -197,6 +197,18 @@
             if (settings && settings.showLoader && !settings.dontHide) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
+
+            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
+                var tempErrorMessage = document.createElement("div");
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
+
+                tempErrorMessage.addEventListener("click", function () {
+                    tempErrorMessage.remove();
+                }, false);
+
+                document.querySelector("#content_header").appendChild(tempErrorMessage);
+            }
         }
     });
 

From fff497ff398088d267c25640f630ed62579ee79a Mon Sep 17 00:00:00 2001
From: Hayder Sharhan <hsharhan@ebay.com>
Date: Fri, 3 Jun 2016 14:53:51 -0500
Subject: [PATCH 5/7] MAGETWO-52993: [Github] Media Uploader Issues #2958

- Changed clicking logic. Moved logic to correct place.
---
 .../Controller/Adminhtml/Wysiwyg/Images/Upload.php |  2 +-
 .../templates/browser/content/uploader.phtml       |  6 ++++++
 lib/web/mage/loader.js                             | 14 +-------------
 lib/web/mage/loader_old.js                         | 12 ------------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 7851f9e3f3d9d..3cc4b06de0dfb 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -39,7 +39,7 @@ public function execute()
             $targetPath = $this->getStorage()->getSession()->getCurrentPath();
             $result = $this->getStorage()->uploadFile($targetPath, $this->getRequest()->getParam('type'));
         } catch (\Exception $e) {
-            $result = ['error' => true, 'message' => $e->getMessage()];
+            $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 2ee12c1be3b51..6fe3f0b285fbc 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -71,8 +71,14 @@ require([
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
             $(progressSelector).css('width', '100%');
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
+                $("#content_header").children(".message").remove();
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
+                var tempErrorMessage = document.createElement("div");
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = data.result.error;
+
+                $("#content_header").append(tempErrorMessage);
                 $(progressSelector).removeClass('upload-progress').addClass('upload-failure');
             }
         },
diff --git a/lib/web/mage/loader.js b/lib/web/mage/loader.js
index 97b540f909a83..d6eea4d67c75b 100644
--- a/lib/web/mage/loader.js
+++ b/lib/web/mage/loader.js
@@ -178,7 +178,7 @@ define([
                 .addClass(this.options.loadingClass)
                 .attr({
                     'aria-busy': true
-                });
+                })
 
             if (settings && settings.showLoader) {
                 var ctx = this._getJqueryObj(settings.loaderContext);
@@ -201,18 +201,6 @@ define([
             if (settings && settings.showLoader) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
-
-            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
-                var tempErrorMessage = document.createElement("div");
-                tempErrorMessage.className = "message message-warning warning";
-                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
-
-                tempErrorMessage.addEventListener("click", function () {
-                    tempErrorMessage.remove();
-                }, false);
-
-                document.querySelector("#content_header").appendChild(tempErrorMessage);
-            }
         }
 
     });
diff --git a/lib/web/mage/loader_old.js b/lib/web/mage/loader_old.js
index e2cf96f98eb7f..9b394ae9429b9 100644
--- a/lib/web/mage/loader_old.js
+++ b/lib/web/mage/loader_old.js
@@ -197,18 +197,6 @@
             if (settings && settings.showLoader && !settings.dontHide) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
-
-            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
-                var tempErrorMessage = document.createElement("div");
-                tempErrorMessage.className = "message message-warning warning";
-                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
-
-                tempErrorMessage.addEventListener("click", function () {
-                    tempErrorMessage.remove();
-                }, false);
-
-                document.querySelector("#content_header").appendChild(tempErrorMessage);
-            }
         }
     });
 

From 98701f3a3f22e9399ae4c5b9b3c4811a356bd487 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Tue, 7 Jun 2016 11:41:07 -0500
Subject: [PATCH 6/7] MAGETWO-52993: [Github] Media Uploader Issues #2958

 - updates for CR feedback
---
 .../Cms/view/adminhtml/templates/browser/content.phtml      | 1 +
 .../view/adminhtml/templates/browser/content/uploader.phtml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
index 84947051e798b..70a9239af5805 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
@@ -20,6 +20,7 @@
                 <div class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></div>
             </div>
         </div>
+        <div id="error-message" data-action="show-error"></div>
         <div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></div>
         <div id="contents"></div>
     </div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 6fe3f0b285fbc..120dc057b30e9 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -69,16 +69,16 @@ require([
         },
         done: function (e, data) {
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
+            var tempErrorMessage = document.createElement("div");
             $(progressSelector).css('width', '100%');
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
-                $("#content_header").children(".message").remove();
+                $('[data-action="show-error"]').children(".message").remove();
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
-                var tempErrorMessage = document.createElement("div");
                 tempErrorMessage.className = "message message-warning warning";
                 tempErrorMessage.innerHTML = data.result.error;
 
-                $("#content_header").append(tempErrorMessage);
+                $('[data-action="show-error"]').append(tempErrorMessage);
                 $(progressSelector).removeClass('upload-progress').addClass('upload-failure');
             }
         },

From bf8e73782118b3508c2a1ebba833ce645edf55c7 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Tue, 7 Jun 2016 15:06:16 -0500
Subject: [PATCH 7/7] MAGETWO-52993: [Github] Media Uploader Issues #2958

 - clear error message every time a new file is chosen for upload.
---
 .../Cms/view/adminhtml/templates/browser/content/uploader.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 120dc057b30e9..24482f1fb4209 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -71,8 +71,8 @@ require([
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
             var tempErrorMessage = document.createElement("div");
             $(progressSelector).css('width', '100%');
+            $('[data-action="show-error"]').children(".message").remove();
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
-                $('[data-action="show-error"]').children(".message").remove();
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
                 tempErrorMessage.className = "message message-warning warning";