From f1cab8e1d856e10bb364909b0c46954917c4a6a3 Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 13:49:28 +0100
Subject: [PATCH 01/11] Revert "magento/magento2#12285: The option <var
 name="allowfullscreen">false</var> for mobile device don't work in product
 view page gallery"

This reverts commit b8232c5d957b25cbb0c902f4928349617803b488.
---
 lib/internal/Magento/Framework/Config/Converter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 3e66f641b8697..380aeeee5a068 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -103,7 +103,7 @@ protected function parseVarElement(\DOMElement $node)
             }
         }
         if (!count($result)) {
-            $result = (strtolower($node->nodeValue) !== 'true' && strtolower($node->nodeValue) !== 'false')
+            $result = (strtolower($node->nodeValue) !== 'true' &&  strtolower($node->nodeValue) !== 'false')
                 ? $node->nodeValue
                 : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
         }

From b1c26db2fc9dfb0fa9021e11decd0aeebb55d005 Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 13:55:10 +0100
Subject: [PATCH 02/11] Revert "magento/magento2#12285: The option <var
 name="allowfullscreen">false</var> for mobile device don't work in product
 view page gallery"

This reverts commit bf40afa9414d35fe7f9125af8fc9c8042a054842.
---
 .../testsuite/Magento/Framework/Config/ConverterTest.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
index 1d2e090d1923b..f68e36d39a3bf 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
@@ -49,7 +49,6 @@ public function testParseVarElement($sourceString, $expected)
      */
     public function parseVarElementDataProvider()
     {
-        // @codingStandardsIgnoreStart
         $sourceString = <<<'XML'
 <?xml version="1.0"?>
 <view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
@@ -62,7 +61,6 @@ public function parseVarElementDataProvider()
     </vars>
  </view>
 XML;
-        // @codingStandardsIgnoreEnd
         $expectedResult = [
             'vars' => [
                 'Magento_Test' => [

From 67ddd87c31b02e5635c3761b173b158c5010e57d Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 13:55:53 +0100
Subject: [PATCH 03/11] Revert "magento/magento2#12285: The option <var
 name="allowfullscreen">false</var> for mobile device don't work in product
 view page gallery"

This reverts commit ccc35c24de7b27d5e3cd4e42bdbfd57f8ce6de9d.
---
 .../Framework/Config/ConverterTest.php        | 92 -------------------
 .../Magento/Framework/Config/Converter.php    |  4 +-
 2 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
deleted file mode 100644
index f68e36d39a3bf..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Config;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Tests Magento\Framework\Config\Convert
- */
-class ConverterTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var Converter
-     */
-    private $converter;
-
-    /**
-     * Tests config value "false" is not interpreted as true.
-     *
-     * @param string $sourceString
-     * @param array $expected
-     * @dataProvider parseVarElementDataProvider
-     */
-    public function testParseVarElement($sourceString, $expected)
-    {
-        $document = new \DOMDocument();
-        $document->loadXML($sourceString);
-        $actual = $this->converter->convert($document);
-
-        self::assertEquals(
-            $expected,
-            $actual
-        );
-    }
-
-    /**
-     * Data provider for testParseVarElement.
-     *
-     * @return array
-     */
-    public function parseVarElementDataProvider()
-    {
-        $sourceString = <<<'XML'
-<?xml version="1.0"?>
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
-    <vars module="Magento_Test">    
-        <var name="str">some string</var>  
-        <var name="int-1">1</var>        
-        <var name="int-0">0</var>        
-        <var name="bool-true">true</var> 
-        <var name="bool-false">false</var> 
-    </vars>
- </view>
-XML;
-        $expectedResult = [
-            'vars' => [
-                'Magento_Test' => [
-                    'str' => 'some string',
-                    'int-1' => '1',
-                    'int-0' => '0',
-                    'bool-true' => true,
-                    'bool-false' => false
-                ]
-            ]
-        ];
-
-        return [
-            [
-                $sourceString,
-                $expectedResult
-            ],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->converter = $this->objectManager->get(Converter::class);
-    }
-}
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 380aeeee5a068..0401471f27ea5 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -103,9 +103,7 @@ protected function parseVarElement(\DOMElement $node)
             }
         }
         if (!count($result)) {
-            $result = (strtolower($node->nodeValue) !== 'true' &&  strtolower($node->nodeValue) !== 'false')
-                ? $node->nodeValue
-                : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
+            $result = $node->nodeValue;
         }
         return $result;
     }

From ee0d3bcff5e7a4ac1946f774bddcf1eac49661dc Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 14:01:25 +0100
Subject: [PATCH 04/11] Added missed return type of array to function comments

---
 lib/internal/Magento/Framework/View/Element/AbstractBlock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 84dd4270c59cf..5c74edc9d4c6c 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -1142,7 +1142,7 @@ protected function _getSidPlaceholder($cacheKey = null)
      *
      * @param string $name variable name
      * @param string|null $module optional module name
-     * @return string|false
+     * @return string|false|array
      */
     public function getVar($name, $module = null)
     {

From 2921bf88b657ed2c2a548c787e0b9b2e84829214 Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 14:02:36 +0100
Subject: [PATCH 05/11] Implemented different fix for #12285

---
 .../Catalog/Block/Product/View/Gallery.php    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 17828b9d375d3..8961ddf35fbd9 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -100,7 +100,9 @@ public function getMagnifier()
      */
     public function getBreakpoints()
     {
-        return $this->jsonEncoder->encode($this->getVar('breakpoints'));
+        $breakpoints = $this->getVar('breakpoints');
+        array_walk_recursive($breakpoints, [$this, 'convertBooleans']);
+        return $this->jsonEncoder->encode($breakpoints);
     }
 
     /**
@@ -138,6 +140,23 @@ public function getGalleryImagesJson()
         return json_encode($imagesItems);
     }
 
+    /**
+     * Convert string to booleans
+     *
+     * @param string $item
+     * @param string $key
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected static function convertBooleans(&$item, $key)
+    {
+        if (strtolower($item) == 'true') {
+            $item = true;
+        }
+        if (strtolower($item) == 'false') {
+            $item = false;
+        }
+    }
+
     /**
      * Retrieve gallery url
      *

From cb267b92ec1e622de1103f0bde5f45c7813dda88 Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 16:49:43 +0100
Subject: [PATCH 06/11] Updated gallery.phtml to support changes made to getVar
 function

---
 .../templates/product/view/gallery.phtml      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index b2fa8e9aaf80f..b5a61b7259b2c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -45,19 +45,19 @@
                 "data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
                 "options": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
-                    <?php if (($block->getVar("gallery/loop"))) : ?>
-                        "loop": <?= $block->escapeHtml($block->getVar("gallery/loop")) ?>,
+                    <?php if ($block->getVar("gallery/loop")) : ?>
+                        "loop": <?= /* @noEscape */ $block->getVar("gallery/loop") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/keyboard"))) : ?>
-                        "keyboard": <?= $block->escapeHtml($block->getVar("gallery/keyboard")) ?>,
+                    <?php if ($block->getVar("gallery/keyboard")) : ?>
+                        "keyboard": <?= /* @noEscape */ $block->getVar("gallery/keyboard") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/arrows"))) : ?>
-                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/arrows")) ?>,
+                    <?php if ($block->getVar("gallery/arrows")) : ?>
+                        "arrows": <?= /* @noEscape */ $block->getVar("gallery/arrows") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/allowfullscreen"))) : ?>
-                        "allowfullscreen": <?= $block->escapeHtml($block->getVar("gallery/allowfullscreen")) ?>,
+                    <?php if ($block->getVar("gallery/allowfullscreen")) : ?>
+                        "allowfullscreen": <?= /* @noEscape */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if (is_bool($block->getVar("gallery/caption"))) : ?>
+                    <?php if ($block->getVar("gallery/caption")) : ?>
                         "showCaption": <?= /* @noEscape */ $block->getVar("gallery/caption") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php
@@ -87,8 +87,8 @@
                         "transitionduration": <?= $block->escapeHtml($block->getVar("gallery/transition/duration")) ?>,
                     <?php endif; ?>
                     "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
-                    <?php if (($block->getVar("gallery/navarrows"))) : ?>
-                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/navarrows")) ?>,
+                    <?php if ($block->getVar("gallery/navarrows")) : ?>
+                        "navarrows": <?= /* @noEscape */ $block->getVar("gallery/navarrows") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
@@ -96,17 +96,17 @@
                 "fullscreen": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
-                        "loop": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/loop")) ?>,
+                        "loop": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
                     <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
-                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/navarrows")) ?>,
+                        "navarrows": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
-                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/arrows")) ?>,
+                        "arrows": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if (is_bool($block->getVar("gallery/fullscreen/caption"))) : ?>
+                    <?php if ($block->getVar("gallery/fullscreen/caption")) : ?>
                         <?php $showCaption = $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false'; ?>
                         "showCaption": <?= /* @noEscape */ $showCaption ?>,
                     <?php endif; ?>

From 234188a8888a3f2eaab121d370267de773d6c41a Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 17:09:14 +0100
Subject: [PATCH 07/11] Updated gallery.phtml to support revertions to getVar
 functionality

---
 .../templates/product/view/gallery.phtml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index b5a61b7259b2c..b1464233b4f4b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -46,19 +46,19 @@
                 "options": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
                     <?php if ($block->getVar("gallery/loop")) : ?>
-                        "loop": <?= /* @noEscape */ $block->getVar("gallery/loop") ? 'true' : 'false'; ?>,
+                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/loop"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/keyboard")) : ?>
-                        "keyboard": <?= /* @noEscape */ $block->getVar("gallery/keyboard") ? 'true' : 'false'; ?>,
+                        "keyboard": <?= /* @noEscape */ filter_var($this->getVar("gallery/keyboard"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ $block->getVar("gallery/arrows") ? 'true' : 'false'; ?>,
+                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/arrows"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/allowfullscreen")) : ?>
-                        "allowfullscreen": <?= /* @noEscape */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false'; ?>,
+                        "allowfullscreen": <?= /* @noEscape */ filter_var($this->getVar("gallery/allowfullscreen"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/caption")) : ?>
-                        "showCaption": <?= /* @noEscape */ $block->getVar("gallery/caption") ? 'true' : 'false'; ?>,
+                        "showCaption": <?= /* @noEscape */ filter_var($this->getVar("gallery/caption"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php
                         $imgWidth = $block->getImageAttribute('product_page_image_medium', 'width');
@@ -88,7 +88,7 @@
                     <?php endif; ?>
                     "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
                     <?php if ($block->getVar("gallery/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ $block->getVar("gallery/navarrows") ? 'true' : 'false'; ?>,
+                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
@@ -96,18 +96,18 @@
                 "fullscreen": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
-                        "loop": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false'; ?>,
+                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/loop"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
                     <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false'; ?>,
+                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false'; ?>,
+                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/arrows"), FILTER_VALIDATE_BOOLEAN); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/caption")) : ?>
-                        <?php $showCaption = $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false'; ?>
+                        <?php $showCaption = filter_var($this->getVar("gallery/fullscreen/caption"), FILTER_VALIDATE_BOOLEAN); ?>
                         "showCaption": <?= /* @noEscape */ $showCaption ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")) : ?>

From 723c8cc9ec7d4534affa66322875b82bdb4edaaa Mon Sep 17 00:00:00 2001
From: gwharton <graham@gwharton.me.uk>
Date: Fri, 7 Sep 2018 17:17:07 +0100
Subject: [PATCH 08/11] Updated gallery.phtml to support revertions to getVar
 functionality

---
 .../templates/product/view/gallery.phtml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index b1464233b4f4b..2c79d716db771 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -46,19 +46,19 @@
                 "options": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
                     <?php if ($block->getVar("gallery/loop")) : ?>
-                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/loop"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/loop"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/keyboard")) : ?>
-                        "keyboard": <?= /* @noEscape */ filter_var($this->getVar("gallery/keyboard"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "keyboard": <?= /* @noEscape */ filter_var($this->getVar("gallery/keyboard"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/arrows"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/arrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/allowfullscreen")) : ?>
-                        "allowfullscreen": <?= /* @noEscape */ filter_var($this->getVar("gallery/allowfullscreen"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "allowfullscreen": <?= /* @noEscape */ filter_var($this->getVar("gallery/allowfullscreen"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/caption")) : ?>
-                        "showCaption": <?= /* @noEscape */ filter_var($this->getVar("gallery/caption"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "showCaption": <?= /* @noEscape */ filter_var($this->getVar("gallery/caption"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php
                         $imgWidth = $block->getImageAttribute('product_page_image_medium', 'width');
@@ -88,7 +88,7 @@
                     <?php endif; ?>
                     "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
                     <?php if ($block->getVar("gallery/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
@@ -96,18 +96,18 @@
                 "fullscreen": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
-                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/loop"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/loop"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
                     <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/arrows"), FILTER_VALIDATE_BOOLEAN); ?>,
+                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/arrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/caption")) : ?>
-                        <?php $showCaption = filter_var($this->getVar("gallery/fullscreen/caption"), FILTER_VALIDATE_BOOLEAN); ?>
+                        <?php $showCaption = filter_var($this->getVar("gallery/fullscreen/caption"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>
                         "showCaption": <?= /* @noEscape */ $showCaption ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")) : ?>

From ab476ad30a1e9719dc0401e632083dd4ae8e4493 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Sat, 8 Sep 2018 12:23:53 +0100
Subject: [PATCH 09/11] Resolved long line violations

---
 .../templates/product/view/gallery.phtml      | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 2c79d716db771..5bc274f385c8d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -45,20 +45,30 @@
                 "data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
                 "options": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
-                    <?php if ($block->getVar("gallery/loop")) : ?>
-                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/loop"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                    <?php if (($block->getVar("gallery/loop"))) : ?>
+                        "loop": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/loop"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/keyboard")) : ?>
-                        "keyboard": <?= /* @noEscape */ filter_var($this->getVar("gallery/keyboard"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                    <?php if (($block->getVar("gallery/keyboard"))) : ?>
+                        "keyboard": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/keyboard"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/arrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                    <?php if (($block->getVar("gallery/arrows"))) : ?>
+                        "arrows": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/arrows"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/allowfullscreen")) : ?>
-                        "allowfullscreen": <?= /* @noEscape */ filter_var($this->getVar("gallery/allowfullscreen"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                    <?php if (($block->getVar("gallery/allowfullscreen"))) : ?>
+                        "allowfullscreen": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/allowfullscreen"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/caption")) : ?>
-                        "showCaption": <?= /* @noEscape */ filter_var($this->getVar("gallery/caption"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                        "showCaption": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/caption"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php
                         $imgWidth = $block->getImageAttribute('product_page_image_medium', 'width');
@@ -88,7 +98,9 @@
                     <?php endif; ?>
                     "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
                     <?php if ($block->getVar("gallery/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                        "navarrows": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
@@ -96,19 +108,26 @@
                 "fullscreen": {
                     "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
-                        "loop": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/loop"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                        "loop": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/fullscreen/loop"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
-                    <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
-                        "navarrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                    <?php if (($block->getVar("gallery/transition/navarrows"))) : ?>
+                        "navarrows": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
                     <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
-                        "arrows": <?= /* @noEscape */ filter_var($this->getVar("gallery/fullscreen/arrows"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>,
+                        "arrows": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/fullscreen/arrows"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/caption")) : ?>
-                        <?php $showCaption = filter_var($this->getVar("gallery/fullscreen/caption"), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'; ?>
-                        "showCaption": <?= /* @noEscape */ $showCaption ?>,
+                        "showCaption": <?= /* @noEscape */
+                        filter_var($block->getVar("gallery/fullscreen/caption"), FILTER_VALIDATE_BOOLEAN)
+                        ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")) : ?>
                         "transitionduration": <?=

From cfd78af26efc28f61b828e83c0f6c6ec4a9b082a Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Sat, 8 Sep 2018 12:34:52 +0100
Subject: [PATCH 10/11] Corrected gallery/fullscreen/navarrows

---
 .../Catalog/view/frontend/templates/product/view/gallery.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 5bc274f385c8d..23b010ee953de 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -113,7 +113,7 @@
                         ? 'true' : 'false'; ?>,
                     <?php endif; ?>
                     "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
-                    <?php if (($block->getVar("gallery/transition/navarrows"))) : ?>
+                    <?php if ($block->getVar("gallery/fullscreen/navarrows")) : ?>
                         "navarrows": <?= /* @noEscape */
                         filter_var($block->getVar("gallery/fullscreen/navarrows"), FILTER_VALIDATE_BOOLEAN)
                         ? 'true' : 'false'; ?>,

From 5cbd31a47de093686688d08a0b94b690da22fb8e Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Sat, 8 Sep 2018 15:04:50 +0100
Subject: [PATCH 11/11] Reverted accidental removal of brackets

---
 .../Catalog/view/frontend/templates/product/view/gallery.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 23b010ee953de..1ff5e0c8a5eb0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -97,7 +97,7 @@
                         "transitionduration": <?= $block->escapeHtml($block->getVar("gallery/transition/duration")) ?>,
                     <?php endif; ?>
                     "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
-                    <?php if ($block->getVar("gallery/navarrows")) : ?>
+                    <?php if (($block->getVar("gallery/navarrows"))) : ?>
                         "navarrows": <?= /* @noEscape */
                         filter_var($block->getVar("gallery/navarrows"), FILTER_VALIDATE_BOOLEAN)
                         ? 'true' : 'false'; ?>,