MAGETWO-72279: Always use https for Vimeo video's. #10768

orlangur · orlangur · commit 649dec3b9e08 · 2017-09-04T16:02:33.000-05:00
- Merge Pull Request #10768 from hostep/magento2:use-https-for-vimeo - Merged commits: 1. c4da890
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -206,7 +206,6 @@ public function getProductAttributeValue($product, $attribute)
             ['select', 'boolean', 'multiselect']
         )
         ) {
-            //$value = $attribute->getSource()->getOptionText($product->getData($attribute->getAttributeCode()));
             $value = $attribute->getFrontend()->getValue($product);
         } else {
             $value = $product->getData($attribute->getAttributeCode());
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
@@ -34,7 +34,7 @@ if ($_attributeType && $_attributeType == 'text') {
 
 <?php if ($_attributeValue): ?>
 <div class="product attribute <?= /* @escapeNotVerified */ $_className ?>">
-    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
+    <?php if ($_attributeLabel != __('none')): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
     <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -369,7 +369,7 @@ public function applyInlineCssDataProvider()
                 '<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
                 'p { color: #000 }',
                 [
-                    '<head><style type="text/css">div { color: #111; }</style></head>',
+                    '<style type="text/css">div { color: #111; }</style>',
                     '<p style="color: #000;"></p>',
                 ],
             ],
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -302,7 +302,7 @@ define([
                     additionalParams += '&autoplay=1';
                 }
 
-                src = window.location.protocol + '//player.vimeo.com/video/' +
+                src = 'https://player.vimeo.com/video/' +
                     this._code + '?api=1&player_id=vimeo' +
                     this._code +
                     timestamp +
@@ -525,7 +525,7 @@ define([
                     );
                 } else if (type === 'vimeo') {
                     $.ajax({
-                        url: window.location.protocol + '//www.vimeo.com/api/v2/video/' + id + '.json',
+                        url: 'https://www.vimeo.com/api/v2/video/' + id + '.json',
                         dataType: 'jsonp',
                         data: {
                             format: 'json'
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {
             if (this._loop) {
                 additionalParams += '&loop=1';
             }
-            src = window.location.protocol + '//player.vimeo.com/video/' +
+            src = 'https://player.vimeo.com/video/' +
                 this._code + '?api=1&player_id=vimeo' +
                 this._code +
                 timestamp +
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -1774,7 +1774,7 @@ public function getTracksCollection()
      */
     public function hasInvoices()
     {
-        return $this->getInvoiceCollection()->count();
+        return (bool)$this->getInvoiceCollection()->count();
     }
 
     /**
@@ -1784,7 +1784,7 @@ public function hasInvoices()
      */
     public function hasShipments()
     {
-        return $this->getShipmentsCollection()->count();
+        return (bool)$this->getShipmentsCollection()->count();
     }
 
     /**
@@ -1794,7 +1794,7 @@ public function hasShipments()
      */
     public function hasCreditmemos()
     {
-        return $this->getCreditmemosCollection()->count();
+        return (bool)$this->getCreditmemosCollection()->count();
     }
 
     /**
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
@@ -27,12 +27,12 @@ define([
      * Creates constructor function which allows
      * initialization without usage of a 'new' operator.
      *
-     * @param {Object} protoProps - Prototypal propeties of a new consturctor.
-     * @param {Function} consturctor
-     * @returns {Function} Created consturctor.
+     * @param {Object} protoProps - Prototypal propeties of a new constructor.
+     * @param {Function} constructor
+     * @returns {Function} Created constructor.
      */
-    function createConstructor(protoProps, consturctor) {
-        var UiClass = consturctor;
+    function createConstructor(protoProps, constructor) {
+        var UiClass = constructor;
 
         if (!UiClass) {
 
@@ -61,7 +61,7 @@ define([
     Class = createConstructor({
 
         /**
-         * Entry point to the initialization of consturctors' instance.
+         * Entry point to the initialization of constructor's instance.
          *
          * @param {Object} [options={}]
          * @returns {Class} Chainable.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "composer/composer": "1.4.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "pelago/emogrifier": "0.1.1",
+        "pelago/emogrifier": "1.2.0",
         "tubalmartin/cssmin": "4.1.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.22.0",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -75,13 +75,12 @@ public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected
         $emogrifier->setCss($css);
         $emogrifier->setHtml($html);
         $result = $emogrifier->emogrify();
+
         /**
-         * Tests a bug in the library where there's no spaces to CSS string before passing to Emogrifier
-         * to fix known parsing issue with library.
-         * This test should will fail when this bug is fixed in the library and we should fix the adapter.
-         * https://github.com/jjriv/emogrifier/issues/370
+         * This test was implemented for the issue which existed in the older version of Emogrifier.
+         * Test was updated, as the library got updated as well.
          */
-        $this->assertNotContains($cssExpected, $result);
+        $this->assertContains($cssExpected, $result);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -41,13 +41,7 @@ public function setHtml($html)
      */
     public function setCss($css)
     {
-        /**
-         * Adds space to CSS string before passing to Emogrifier to fix known parsing issue with library.
-         * https://github.com/jjriv/emogrifier/issues/370
-         */
-        $cssWithAddedSpaces = preg_replace('#([\{\}>])#i', ' $1 ', $css);
-
-        $this->emogrifier->setCss($cssWithAddedSpaces);
+        $this->emogrifier->setCss($css);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,6 @@ public function getProductAttributeValue($product, $attribute)`
`206`	`206`	`['select', 'boolean', 'multiselect']`
`207`	`207`	`)`
`208`	`208`	`) {`
`209`		`- //$value = $attribute->getSource()->getOptionText($product->getData($attribute->getAttributeCode()));`
`210`	`209`	`$value = $attribute->getFrontend()->getValue($product);`
`211`	`210`	`} else {`
`212`	`211`	`$value = $product->getData($attribute->getAttributeCode());`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public function applyInlineCssDataProvider()`
`369`	`369`	`'<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',`
`370`	`370`	`'p { color: #000 }',`
`371`	`371`	`[`
`372`		`- '<head><style type="text/css">div { color: #111; }</style></head>',`
	`372`	`+ '<style type="text/css">div { color: #111; }</style>',`
`373`	`373`	`'<p style="color: #000;"></p>',`
`374`	`374`	`],`
`375`	`375`	`],`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {`
`317`	`317`	`if (this._loop) {`
`318`	`318`	`additionalParams += '&loop=1';`
`319`	`319`	`}`
`320`		`- src = window.location.protocol + '//player.vimeo.com/video/' +`
	`320`	`+ src = 'https://player.vimeo.com/video/' +`
`321`	`321`	`this._code + '?api=1&player_id=vimeo' +`
`322`	`322`	`this._code +`
`323`	`323`	`timestamp +`
Original file line number	Diff line number	Diff line change
`@@ -1774,7 +1774,7 @@ public function getTracksCollection()`
`1774`	`1774`	`*/`
`1775`	`1775`	`public function hasInvoices()`
`1776`	`1776`	`{`
`1777`		`- return $this->getInvoiceCollection()->count();`
	`1777`	`+ return (bool)$this->getInvoiceCollection()->count();`
`1778`	`1778`	`}`
`1779`	`1779`
`1780`	`1780`	`/**`
`@@ -1784,7 +1784,7 @@ public function hasInvoices()`
`1784`	`1784`	`*/`
`1785`	`1785`	`public function hasShipments()`
`1786`	`1786`	`{`
`1787`		`- return $this->getShipmentsCollection()->count();`
	`1787`	`+ return (bool)$this->getShipmentsCollection()->count();`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`	`1790`	`/**`
`@@ -1794,7 +1794,7 @@ public function hasShipments()`
`1794`	`1794`	`*/`
`1795`	`1795`	`public function hasCreditmemos()`
`1796`	`1796`	`{`
`1797`		`- return $this->getCreditmemosCollection()->count();`
	`1797`	`+ return (bool)$this->getCreditmemosCollection()->count();`
`1798`	`1798`	`}`
`1799`	`1799`
`1800`	`1800`	`/**`