From c593a50f5c9e18b00f7e7e26adce39801eba132d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Tue, 29 Jun 2021 14:57:44 -0400
Subject: [PATCH 1/7] DS-489: Remove twig string loader from shared twig code

---
 .../src/Layout/GridCellNode.php               | 25 +++++--------------
 .../src/Layout/GridTagNode.php                | 22 +++++++---------
 .../src/SSR/SSRTagNode.php                    |  8 ++++--
 3 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php b/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
index 1d409308be..63a164ebb0 100644
--- a/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
+++ b/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
@@ -96,25 +96,12 @@ static public function cellFunctionToCall(){
      */
     $attributes = new Attribute($merged_attributes);
 
-    $stringLoader = new BoltStringLoader();
-
-    //Setup data into 2 groups: attributes + everything else that we're going to namespace under the component name.
-    $data         = array(
-      "attributes" => $attributes,
-      "cell" => $GLOBALS['cell_props'][ $GLOBALS['cell_counter'] ]
-    );
-
-    //@TODO: pull in template logic used here from external Twig file.
-    $string       = "
-      {% set classes = [] %}
-
-      <div {{ attributes.addClass(classes) | raw }}>
-      $contents
-      </div>
-    ";
-
-    // Pre-render the inline Twig template + the data we've merged and normalized
-    $rendered = $stringLoader->render(array("string" => $string, "data" => $data));
+    $env = new \Twig_Environment(new \Twig_Loader_Array([]), [
+      'debug' => true,
+      'autoescape' => false,
+    ]);
+    $template = $env->createTemplate('<div {{ attributes | raw }}> {{ contents }} </div>');
+    $rendered = $env->render($template, array('contents' => $contents, 'attributes' => $attributes ));
 
     echo $rendered, PHP_EOL;
   }
diff --git a/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php b/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
index cf144cfd03..c496ed5e0a 100644
--- a/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
+++ b/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
@@ -79,26 +79,22 @@ static public function functionToCall(){
     // Run the captured attributes through D8's createAttribute function, prior to rendering
     $attributes = new Attribute($merged_attributes);
 
-    $stringLoader = new BoltStringLoader();
-
-    //Setup data into 2 groups: attributes + everything else that we're going to namespace under the component name.
-    $data         = array(
-      "attributes" => $attributes,
-      "grid" => $GLOBALS['grid_props'][ $GLOBALS['counter'] ]
-    );
-    //@TODO: pull in template logic used here from external Twig file.
-    $string       = "
+    $env = new \Twig_Environment(new \Twig_Loader_Array([]), [
+      'debug' => true,
+      'autoescape' => false,
+    ]);
+    $template = $env->createTemplate("
       {% set classes = [
         grid.size ? 'o-grid--' ~ grid.size : '',
         grid.center ? 'o-grid--center' : '',
         grid.reverse == 'true' ? 'o-grid--rev' : ''
       ] %}
       <div {{ attributes.addClass(classes) | raw }}>
-      $contents
+        {{ contents }}
       </div>
-    ";
-    // Pre-render the inline Twig template + the data we've merged and normalized
-    $rendered = $stringLoader->render(array("string" => $string, "data" => $data));
+    ");
+    $rendered = $env->render($template, array('contents' => $contents, 'attributes' => $attributes, 'grid' => $GLOBALS['grid_props'][$GLOBALS['counter']] ));
+
     echo $rendered, PHP_EOL;
   }
 
diff --git a/packages/twig-integration/twig-extensions-shared/src/SSR/SSRTagNode.php b/packages/twig-integration/twig-extensions-shared/src/SSR/SSRTagNode.php
index 3e91d66284..4fb6cf9e03 100644
--- a/packages/twig-integration/twig-extensions-shared/src/SSR/SSRTagNode.php
+++ b/packages/twig-integration/twig-extensions-shared/src/SSR/SSRTagNode.php
@@ -23,9 +23,13 @@ static public function functionToCall(){
     $params = func_get_args();
     $contents = array_shift($params);
 
-    $stringLoader = new BoltStringLoader();
+    $env = new \Twig_Environment(new \Twig_Loader_Array([]), [
+      'debug' => true,
+      'autoescape' => false,
+    ]);
+    $template = $env->createTemplate('{{ contents }}');
+    $twig_to_html = $env->render($template, ['contents' => $contents]);
 
-    $twig_to_html = $stringLoader->render(array("string" => $contents, "data" => []));
     $rendered_html = \Bolt\TwigFunctions::bolt_ssr($twig_to_html);
     echo $rendered_html, PHP_EOL;
   }

From 297fd9f7d2955b167301d169185ddf2307ec66bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Tue, 29 Jun 2021 15:01:23 -0400
Subject: [PATCH 2/7] DS-489: Replace unsupported 'sameas' with 'same as'

---
 .../pattern-lab-utils/_schema-docs-macros.twig     | 14 +++++++-------
 .../15-action-blocks-borderless-variations.twig    |  2 +-
 .../bolt-action-blocks/src/action-blocks.twig      |  4 ++--
 packages/components/bolt-band/src/band.twig        |  2 +-
 .../components/bolt-headline/src/_typography.twig  |  2 +-
 packages/components/bolt-image/src/image.twig      |  4 ++--
 packages/components/bolt-list/src/list.twig        |  4 ++--
 packages/components/bolt-navbar/src/navbar-li.twig |  2 +-
 .../bolt-page-header/src/page-header.twig          |  2 +-
 packages/components/bolt-table/src/table.twig      |  4 ++--
 packages/components/bolt-tooltip/src/tooltip.twig  |  2 +-
 packages/components/bolt-trigger/src/trigger.twig  |  2 +-
 packages/layouts/bolt-list/src/list.twig           |  4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig b/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig
index 8ed4ed86c3..8d42414819 100644
--- a/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig
+++ b/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig
@@ -164,9 +164,9 @@
       <!-- default value -->
       <td class="c-bds-docs-table__col">
 
-        {% if prop.default is sameas(false) %}
+        {% if prop.default is same as(false) %}
           <code>false</code>
-        {% elseif prop.default is sameas(true) %}
+        {% elseif prop.default is same as(true) %}
           <code>true</code>
         {% elseif prop.default is empty %}
           —
@@ -273,9 +273,9 @@
                     <!-- default value -->
                     <td class="c-bds-docs-table__col">
 
-                      {% if prop.default is sameas(false) %}
+                      {% if prop.default is same as(false) %}
                         <code>false</code>
-                      {% elseif prop.default is sameas(true) %}
+                      {% elseif prop.default is same as(true) %}
                         <code>true</code>
                       {% elseif prop.default is empty %}
                         —
@@ -338,9 +338,9 @@
                         <!-- default value -->
                         <td class="c-bds-docs-table__col">
 
-                          {% if prop.default is sameas(false) %}
+                          {% if prop.default is same as(false) %}
                             <code>false</code>
-                          {% elseif prop.default is sameas(true) %}
+                          {% elseif prop.default is same as(true) %}
                             <code>true</code>
                           {% elseif prop.default is empty %}
                             —
@@ -413,5 +413,5 @@
         </bolt-schema-table>
       </div>
     </details>
-  {% endif %}  
+  {% endif %}
 {% endmacro %}
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig
index 5f3521b7e1..282c2c28b4 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig
@@ -21,7 +21,7 @@
 
 {% for borderless in [true, false] %}
   <h3>
-    Borderless: {% if borderless is sameas(true) %}true{% elseif borderless is sameas(false) %}false{% endif %}
+    Borderless: {% if borderless is same as(true) %}true{% elseif borderless is same as(false) %}false{% endif %}
   </h3>
   <div class="u-bolt-margin-bottom-medium">
     {% include "@bolt-components-action-blocks/action-blocks.twig" with {
diff --git a/packages/components/bolt-action-blocks/src/action-blocks.twig b/packages/components/bolt-action-blocks/src/action-blocks.twig
index 287e4f7fa7..33b7c0e0b2 100644
--- a/packages/components/bolt-action-blocks/src/action-blocks.twig
+++ b/packages/components/bolt-action-blocks/src/action-blocks.twig
@@ -19,9 +19,9 @@
 {% endif %}
 
 {# DEPRECATED: use borderless instead #}
-{% if border is sameas(true) %}
+{% if border is same as(true) %}
   {% set borderless = false %}
-{% elseif border is sameas(false) %}
+{% elseif border is same as(false) %}
   {% set borderless = true %}
 {% endif %}
 
diff --git a/packages/components/bolt-band/src/band.twig b/packages/components/bolt-band/src/band.twig
index 2dc452840b..6f5479f87f 100644
--- a/packages/components/bolt-band/src/band.twig
+++ b/packages/components/bolt-band/src/band.twig
@@ -5,7 +5,7 @@
 {% endif %}
 
 {# Deprecated #}
-{% if fullBleed is sameas(true) or fullBleed is sameas(false) %}
+{% if fullBleed is same as(true) or fullBleed is same as(false) %}
   {% set full_bleed = fullBleed %}
 {% endif %}
 {# row_gutter, content_row_start, items are also deprecated but this twig still supports them, see more comments below where items are being rendered #}
diff --git a/packages/components/bolt-headline/src/_typography.twig b/packages/components/bolt-headline/src/_typography.twig
index efae0ba7cd..58f6739973 100644
--- a/packages/components/bolt-headline/src/_typography.twig
+++ b/packages/components/bolt-headline/src/_typography.twig
@@ -26,7 +26,7 @@
 {% set autoshrink = autoshrink is defined ? autoshrink : schema.properties.autoshrink.default %}
 
 {# For backwards compatibility only, setting icon to exactly 'false' is the same as specifying 'none'.  Deprecated. #}
-{% if icon is sameas(false) %}
+{% if icon is same as(false) %}
   {% set icon = "none" %}
 {% endif %}
 
diff --git a/packages/components/bolt-image/src/image.twig b/packages/components/bolt-image/src/image.twig
index bb53d56340..61ae5f52e7 100644
--- a/packages/components/bolt-image/src/image.twig
+++ b/packages/components/bolt-image/src/image.twig
@@ -5,7 +5,7 @@
 {% endif %}
 
 {# DEPRECATED. 'ratio' should be a string, but boolean was previously supported. Boolean is now DEPRECATED. #}
-{% if ratio is sameas(false) or ratio is sameas(true) %}
+{% if ratio is same as(false) or ratio is same as(true) %}
   {% set _ratio_bool = ratio %}
 {% else %}
   {% set _ratio_string = ratio %}
@@ -37,7 +37,7 @@
 {% set _ph_image = placeholder_image|default(_image_data_bolt.base64|default(schema.properties.placeholder_image.default)) %}
 
 {% set _use_ratio = useAspectRatio or _ratio_bool ?? true %}
-{% set _can_use_ratio = _use_ratio is sameas(true) and _ratio_string != 'none' and width > 0 and height > 0 and not cover %}
+{% set _can_use_ratio = _use_ratio is same as(true) and _ratio_string != 'none' and width > 0 and height > 0 and not cover %}
 {# Only JPGs allowed, PNGs can have transparency and may not look right layered over placeholder #}
 {% set _can_use_placeholder = _can_use_ratio or cover %}
 
diff --git a/packages/components/bolt-list/src/list.twig b/packages/components/bolt-list/src/list.twig
index 50f5fcb8ec..9a6f6084cb 100755
--- a/packages/components/bolt-list/src/list.twig
+++ b/packages/components/bolt-list/src/list.twig
@@ -24,8 +24,8 @@
 {% set separator = separator in separator_options ? separator : schema.properties.separator.default %}
 {% set align = align in align_options ? align : schema.properties.align.default %}
 {% set valign = valign in valign_options ? valign : schema.properties.valign.default %}
-{% set inset = inset is sameas(true) or inset is sameas(false) ? inset : schema.properties.inset.default %}
-{% set nowrap = nowrap is sameas(true) or nowrap is sameas(false) ? nowrap : schema.properties.nowrap.default %}
+{% set inset = inset is same as(true) or inset is same as(false) ? inset : schema.properties.inset.default %}
+{% set nowrap = nowrap is same as(true) or nowrap is same as(false) ? nowrap : schema.properties.nowrap.default %}
 
 {# Conditions for the semantic tag usage #}
 {% if tag == "ol" or tag == "ul" %}
diff --git a/packages/components/bolt-navbar/src/navbar-li.twig b/packages/components/bolt-navbar/src/navbar-li.twig
index 3d554b99c5..3a1df621c5 100644
--- a/packages/components/bolt-navbar/src/navbar-li.twig
+++ b/packages/components/bolt-navbar/src/navbar-li.twig
@@ -14,7 +14,7 @@
   'js-bolt-navbar-item'
 ] %}
 
-{% if this.data.current.value is sameas(true) %}
+{% if this.data.current.value is same as(true) %}
   {% set attributes = attributes.setAttribute('data-bolt-current') %}
 {% endif %}
 
diff --git a/packages/components/bolt-page-header/src/page-header.twig b/packages/components/bolt-page-header/src/page-header.twig
index 1dafa2e5b2..7973b43711 100644
--- a/packages/components/bolt-page-header/src/page-header.twig
+++ b/packages/components/bolt-page-header/src/page-header.twig
@@ -20,7 +20,7 @@
 {% set attributes = attributes.setAttribute('data-bolt-page-header-desktop-bp', bolt.data.breakpoints.large) %}
 
 {# Set data-attribute used by Navbar for calculating offset. #}
-{% if this.data.static.value is sameas(false) %}
+{% if this.data.static.value is same as(false) %}
   {% set attributes = attributes.setAttribute('data-bolt-sticky-header', '') %}
 {% endif %}
 
diff --git a/packages/components/bolt-table/src/table.twig b/packages/components/bolt-table/src/table.twig
index a566b56150..4e23bd1e26 100644
--- a/packages/components/bolt-table/src/table.twig
+++ b/packages/components/bolt-table/src/table.twig
@@ -14,8 +14,8 @@
 
 {# Check that the component's current prop values are valid. if not, default to the schema default #}
 {% set format = format in format_options ? format : schema.properties.format.default %}
-{% set borderless = borderless is sameas(true) or borderless is sameas(false) ? borderless : schema.properties.borderless.default %}
-{% set first_col_fixed_width = first_col_fixed_width is sameas(true) or first_col_fixed_width is sameas(false) ? first_col_fixed_width : schema.properties.first_col_fixed_width.default %}
+{% set borderless = borderless is same as(true) or borderless is same as(false) ? borderless : schema.properties.borderless.default %}
+{% set first_col_fixed_width = first_col_fixed_width is same as(true) or first_col_fixed_width is same as(false) ? first_col_fixed_width : schema.properties.first_col_fixed_width.default %}
 
 {% set top_headers = headers.top %}
 {% set side_headers = headers.side %}
diff --git a/packages/components/bolt-tooltip/src/tooltip.twig b/packages/components/bolt-tooltip/src/tooltip.twig
index 1081deb51a..57e8f486cf 100644
--- a/packages/components/bolt-tooltip/src/tooltip.twig
+++ b/packages/components/bolt-tooltip/src/tooltip.twig
@@ -37,7 +37,7 @@
 {% elseif direction == "down" %}
   {% set placement = "bottom" %}
 {% endif %}
-{% if noWrap is sameas(true) or noWrap is sameas(false) %}
+{% if noWrap is same as(true) or noWrap is same as(false) %}
   {% set noWrap = null %}
 {% endif %}
 {% if spacing %}
diff --git a/packages/components/bolt-trigger/src/trigger.twig b/packages/components/bolt-trigger/src/trigger.twig
index 9cb8fc851a..6fa8564f4e 100644
--- a/packages/components/bolt-trigger/src/trigger.twig
+++ b/packages/components/bolt-trigger/src/trigger.twig
@@ -50,7 +50,7 @@
 {% set classes = [
   base_class,
   display ? "#{base_class}--display-#{display}" : "",
-  cursor and not disabled is sameas(true) ? "#{base_class}--cursor-#{cursor}" : "",
+  cursor and not disabled is same as(true) ? "#{base_class}--cursor-#{cursor}" : "",
   no_outline ? "#{base_class}--outline-none" : "",
 ] %}
 
diff --git a/packages/layouts/bolt-list/src/list.twig b/packages/layouts/bolt-list/src/list.twig
index 8c494918d9..73e0af292b 100755
--- a/packages/layouts/bolt-list/src/list.twig
+++ b/packages/layouts/bolt-list/src/list.twig
@@ -24,8 +24,8 @@
 {% set separator = separator in separator_options ? separator : schema.properties.separator.default %}
 {% set align = align in align_options ? align : schema.properties.align.default %}
 {% set valign = valign in valign_options ? valign : schema.properties.valign.default %}
-{% set inset = inset is sameas(true) or inset is sameas(false) ? inset : schema.properties.inset.default %}
-{% set nowrap = nowrap is sameas(true) or nowrap is sameas(false) ? nowrap : schema.properties.nowrap.default %}
+{% set inset = inset is same as(true) or inset is same as(false) ? inset : schema.properties.inset.default %}
+{% set nowrap = nowrap is same as(true) or nowrap is same as(false) ? nowrap : schema.properties.nowrap.default %}
 
 {# Conditions for the semantic tag usage #}
 {% if tag == "ol" or tag == "ul" %}

From eb3da84d73dcd27a6e21ae0d778b9611b55c56a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Tue, 29 Jun 2021 16:33:07 -0400
Subject: [PATCH 3/7] DS-489: Fix .class syntax

Dot notation does some fancy magic behind the scenes.  Read more here:
https://twig.symfony.com/doc/2.x/templates.html

Something that was added in Twig 2.x, when using foo.bar, it will check
for a `hasBar` method on the underlying object if `bar` is not a property
of it.  In this case, `hasClass` is a method, but not one we intend to
ever call.  This syntax makes that clear to twig, I think.
---
 .../bolt-accordion/src/AccordionItem/accordion-item.twig        | 2 +-
 packages/components/bolt-accordion/src/accordion.twig           | 2 +-
 packages/components/bolt-action-blocks/src/action-blocks.twig   | 2 +-
 packages/components/bolt-banner/src/banner.twig                 | 2 +-
 packages/components/bolt-blockquote/src/blockquote.twig         | 2 +-
 packages/components/bolt-button/src/button.twig                 | 2 +-
 packages/components/bolt-chip/src/chip.twig                     | 2 +-
 packages/components/bolt-link/src/link.twig                     | 2 +-
 packages/components/bolt-menu/src/menu.twig                     | 2 +-
 packages/components/bolt-modal/src/modal.twig                   | 2 +-
 packages/components/bolt-navbar/src/navbar.twig                 | 2 +-
 packages/components/bolt-popover/src/popover.twig               | 2 +-
 packages/components/bolt-stack/src/stack.twig                   | 2 +-
 packages/components/bolt-tabs/src/TabPanel/tab-panel.twig       | 2 +-
 packages/components/bolt-tabs/src/tabs.twig                     | 2 +-
 packages/components/bolt-toc/src/_toc-item.twig                 | 2 +-
 packages/components/bolt-toc/src/toc.twig                       | 2 +-
 packages/components/bolt-tooltip/src/tooltip.twig               | 2 +-
 packages/components/bolt-trigger/src/trigger.twig               | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig b/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig
index e95005f9a9..b56b1ffb41 100644
--- a/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig
+++ b/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig
@@ -60,7 +60,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-accordion/src/accordion.twig b/packages/components/bolt-accordion/src/accordion.twig
index 46eb775c0c..658169eae2 100644
--- a/packages/components/bolt-accordion/src/accordion.twig
+++ b/packages/components/bolt-accordion/src/accordion.twig
@@ -23,7 +23,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-action-blocks/src/action-blocks.twig b/packages/components/bolt-action-blocks/src/action-blocks.twig
index 33b7c0e0b2..602cc072ab 100644
--- a/packages/components/bolt-action-blocks/src/action-blocks.twig
+++ b/packages/components/bolt-action-blocks/src/action-blocks.twig
@@ -56,7 +56,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-banner/src/banner.twig b/packages/components/bolt-banner/src/banner.twig
index c158903948..927953bd46 100644
--- a/packages/components/bolt-banner/src/banner.twig
+++ b/packages/components/bolt-banner/src/banner.twig
@@ -24,7 +24,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-blockquote/src/blockquote.twig b/packages/components/bolt-blockquote/src/blockquote.twig
index 6d91985ab9..9ea84daf7d 100644
--- a/packages/components/bolt-blockquote/src/blockquote.twig
+++ b/packages/components/bolt-blockquote/src/blockquote.twig
@@ -43,7 +43,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-button/src/button.twig b/packages/components/bolt-button/src/button.twig
index a6f071cf0c..808418b630 100644
--- a/packages/components/bolt-button/src/button.twig
+++ b/packages/components/bolt-button/src/button.twig
@@ -100,7 +100,7 @@ Sort classes passed in via attributes into two groups:
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' == true %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'has-' == true %}
diff --git a/packages/components/bolt-chip/src/chip.twig b/packages/components/bolt-chip/src/chip.twig
index 90c302df0f..26f04a5132 100644
--- a/packages/components/bolt-chip/src/chip.twig
+++ b/packages/components/bolt-chip/src/chip.twig
@@ -48,7 +48,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}
diff --git a/packages/components/bolt-link/src/link.twig b/packages/components/bolt-link/src/link.twig
index bc767b1ead..d820f1c362 100644
--- a/packages/components/bolt-link/src/link.twig
+++ b/packages/components/bolt-link/src/link.twig
@@ -69,7 +69,7 @@ Sort classes passed in via attributes into two groups:
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}
diff --git a/packages/components/bolt-menu/src/menu.twig b/packages/components/bolt-menu/src/menu.twig
index e336878ad3..95ad9177b9 100644
--- a/packages/components/bolt-menu/src/menu.twig
+++ b/packages/components/bolt-menu/src/menu.twig
@@ -22,7 +22,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}
diff --git a/packages/components/bolt-modal/src/modal.twig b/packages/components/bolt-modal/src/modal.twig
index 0b5c9fdf09..1ccd64e2e8 100644
--- a/packages/components/bolt-modal/src/modal.twig
+++ b/packages/components/bolt-modal/src/modal.twig
@@ -9,7 +9,7 @@
 {% set uuid = this.data.uuid|default(bolt.data.config.env == "test" ? "12345" : random()) %}
 {% set outer_classes = [] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "c-bolt-" == false %}
     {% set outer_classes = outer_classes|merge([class]) %}
   {% endif %}
diff --git a/packages/components/bolt-navbar/src/navbar.twig b/packages/components/bolt-navbar/src/navbar.twig
index 878d06ac5a..a90e4fde89 100644
--- a/packages/components/bolt-navbar/src/navbar.twig
+++ b/packages/components/bolt-navbar/src/navbar.twig
@@ -19,7 +19,7 @@
   content ? 'c-bolt-navbar--custom' : ''
 ] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% set classes = classes|merge([class]) %}
 {% endfor %}
 
diff --git a/packages/components/bolt-popover/src/popover.twig b/packages/components/bolt-popover/src/popover.twig
index a9cf424b70..1b6f04f939 100644
--- a/packages/components/bolt-popover/src/popover.twig
+++ b/packages/components/bolt-popover/src/popover.twig
@@ -20,7 +20,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-stack/src/stack.twig b/packages/components/bolt-stack/src/stack.twig
index beccf9f23e..f53c158e6f 100644
--- a/packages/components/bolt-stack/src/stack.twig
+++ b/packages/components/bolt-stack/src/stack.twig
@@ -15,7 +15,7 @@
 #}
 {% set outer_classes = [] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'c-bolt-' == false %}
     {% set outer_classes = outer_classes|merge([class]) %}
   {% endif %}
diff --git a/packages/components/bolt-tabs/src/TabPanel/tab-panel.twig b/packages/components/bolt-tabs/src/TabPanel/tab-panel.twig
index 97d76033e0..2b227f9162 100644
--- a/packages/components/bolt-tabs/src/TabPanel/tab-panel.twig
+++ b/packages/components/bolt-tabs/src/TabPanel/tab-panel.twig
@@ -30,7 +30,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-tabs/src/tabs.twig b/packages/components/bolt-tabs/src/tabs.twig
index 4c28b4a599..b9e786934b 100644
--- a/packages/components/bolt-tabs/src/tabs.twig
+++ b/packages/components/bolt-tabs/src/tabs.twig
@@ -26,7 +26,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-toc/src/_toc-item.twig b/packages/components/bolt-toc/src/_toc-item.twig
index 8daf235428..82f6212645 100644
--- a/packages/components/bolt-toc/src/_toc-item.twig
+++ b/packages/components/bolt-toc/src/_toc-item.twig
@@ -23,7 +23,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-toc/src/toc.twig b/packages/components/bolt-toc/src/toc.twig
index a0535a1d04..4cfb31e122 100644
--- a/packages/components/bolt-toc/src/toc.twig
+++ b/packages/components/bolt-toc/src/toc.twig
@@ -24,7 +24,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-tooltip/src/tooltip.twig b/packages/components/bolt-tooltip/src/tooltip.twig
index 57e8f486cf..9f30db34a6 100644
--- a/packages/components/bolt-tooltip/src/tooltip.twig
+++ b/packages/components/bolt-tooltip/src/tooltip.twig
@@ -23,7 +23,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}
diff --git a/packages/components/bolt-trigger/src/trigger.twig b/packages/components/bolt-trigger/src/trigger.twig
index 6fa8564f4e..fe2896f37e 100644
--- a/packages/components/bolt-trigger/src/trigger.twig
+++ b/packages/components/bolt-trigger/src/trigger.twig
@@ -62,7 +62,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

From 7e90c6658cd26d4e8b20159b6c4ccf324c6f0561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Thu, 1 Jul 2021 14:43:22 -0400
Subject: [PATCH 4/7] DS-489: Fix implicitly imported macros

See https://twig.symfony.com/doc/1.x/deprecated.html#macros

> As of Twig 2.0, macros imported in a file are not available in child
> templates anymore (via an include call for instance). You need to
> import macros explicitly in each file where you are using them.
---
 .../pattern-lab/_patterns/40-components/text/05-text.twig     | 4 +---
 .../40-components/text/10-text-typographic-recipes.twig       | 1 +
 .../_patterns/40-components/text/15-text-tag-variations.twig  | 1 +
 .../40-components/text/20-text-display-variations.twig        | 1 +
 .../40-components/text/25-text-color-variations.twig          | 1 +
 .../40-components/text/30-text-align-variations.twig          | 1 +
 .../40-components/text/35-text-opacity-variations.twig        | 1 +
 .../_patterns/40-components/text/40-text-quoted.twig          | 1 +
 .../40-components/text/45-text-line-height-variations.twig    | 1 +
 .../40-components/text/50-text-letter-spacing-variations.twig | 1 +
 .../40-components/text/55-text-transform-variations.twig      | 1 +
 .../40-components/text/60-text-font-family-variations.twig    | 1 +
 .../40-components/text/65-text-font-size-variations.twig      | 1 +
 .../40-components/text/70-text-font-style-variations.twig     | 1 +
 .../40-components/text/75-text-font-weight-variations.twig    | 1 +
 15 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig
index a250044a82..9029cf74c6 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% set text_demo %}
 <bolt-text>
@@ -15,6 +16,3 @@
   </bolt-text>
   {% include text_code.code_example(text_demo, true) %}
 {% endblock %}
-
-
-
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig
index c123be8b44..d1d5a243d1 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig
index 69de18d5aa..1ae320e983 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig
index be85775f37..c3d94f8223 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% set text_demo %}
 <bolt-text display="block">
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig
index 6b5e26375e..9cd986329a 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig
index 29332e453c..08a3c38cb0 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig
index 46132a5b34..50ca285103 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig
index 7d8f39b6cd..4b99f5f862 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig
index 3a33e678d5..6ad78cbadc 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig
index d24319360b..1ea3c62bd5 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig
index 8444a356c8..f66ad6ed99 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig
index 61d42639b6..b5745e5c36 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig
index 5fc8d61ec1..2aa88b1afb 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig
index e34f1a24cb..c3bb8cf71d 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>
diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig
index a52295099c..28cf557f4b 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

From 9ae7907ecb83ed298cf877b6991538f44944b401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Tue, 6 Jul 2021 16:21:55 -0400
Subject: [PATCH 5/7] DS-547: Restore global data

The implemented/extended classes here were deprecated well before this
code was originally written in 2018, in
https://github.com/boltdesignsystem/bolt/pull/426.

In any case, \Twig\Extension\GlobalsInterface is needed to for the
getGlobals() method to work now.
See https://twig.symfony.com/doc/2.x/advanced.html
---
 .../twig-extensions-shared/src/TwigExtensions/BoltCore.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/twig-integration/twig-extensions-shared/src/TwigExtensions/BoltCore.php b/packages/twig-integration/twig-extensions-shared/src/TwigExtensions/BoltCore.php
index 30350f7cdd..c7b2aca2da 100644
--- a/packages/twig-integration/twig-extensions-shared/src/TwigExtensions/BoltCore.php
+++ b/packages/twig-integration/twig-extensions-shared/src/TwigExtensions/BoltCore.php
@@ -5,10 +5,13 @@
 use BasaltInc\TwigTools;
 use Bolt;
 use \Webmozart\PathUtil\Path; // https://github.com/webmozart/path-util
+use Twig\Extension\InitRuntimeInterface;
+use Twig\Extension\GlobalsInterface;
+use Twig\Extension\AbstractExtension;
 
 require_once 'Faker.php';
 
-class BoltCore extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface {
+class BoltCore extends AbstractExtension implements InitRuntimeInterface, GlobalsInterface {
 
   public $data = [];
   public $version;

From fcab813f253c9a5b4e6fae78854f10405ec0a0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Tue, 6 Jul 2021 16:23:37 -0400
Subject: [PATCH 6/7] DS-489: Properly check that blocks are defined

---
 .../04-templates/_academy-detail-page-template.twig       | 4 ++--
 .../04-templates/_academy-landing-page-template.twig      | 2 +-
 .../card-replacement-media/_card-replacement-media.twig   | 4 ++--
 .../src/card-replacement/card-replacement.twig            | 6 +++---
 packages/components/bolt-toolbar/toolbar.twig             | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig b/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig
index bd8539727f..9255edc57d 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig
@@ -1,5 +1,5 @@
-{% set pageControls = block("page_controls") %}
-{% set sideNav = block("side_nav") %}
+{% set pageControls = block("page_controls") is defined ? block("page_controls") : '' %}
+{% set sideNav = block("side_nav") is defined ? block("side_nav") : '' %}
 {% set breadcrumbs = [
   {
     "text": "Home",
diff --git a/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig b/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig
index 1027a70944..bd3cc7c192 100644
--- a/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig
+++ b/docs-site/src/pages/pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig
@@ -1,4 +1,4 @@
-{% if block("page_content") %}
+{% if block("page_content") is defined %}
   {% set mainContentBlock %}
     {{ block("page_content") }}
   {% endset %}
diff --git a/packages/components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig b/packages/components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig
index f8898b8c58..ee48800830 100644
--- a/packages/components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig
+++ b/packages/components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig
@@ -14,12 +14,12 @@
 {% if _card_replacement_media_content %}
   {{ _card_replacement_media_content }}
 {% else %}
-  {% if _card_replacement_image or block('media') %}
+  {% if _card_replacement_image or block('media') is defined %}
     <bolt-card-replacement-media {{ attributes }}>
       <ssr-keep for="bolt-card-replacement-media" class="c-bolt-card_replacement__media">
         {% if _card_replacement_image %}
           {% include '@bolt-components-image/image.twig' with _card_replacement_image only %}
-        {% elseif block('media') %}
+        {% elseif block('media') is defined %}
           {{ block('media') }}
         {% endif %}
       </ssr-keep>
diff --git a/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig b/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig
index 1075fb700b..c412dd861e 100644
--- a/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig
+++ b/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig
@@ -15,19 +15,19 @@
   {% set _link_attributes = create_attribute(link.attributes|default({})) %}
 {% endif %}
 
-{% if block('background') %}
+{% if block('background') is defined %}
   {% set _background_block %}
     {{ block('background') }}
   {% endset %}
 {% endif %}
 
-{% if block('media') %}
+{% if block('media') is defined %}
   {% set _media_block %}
     {{ block('media') }}
   {% endset %}
 {% endif %}
 
-{% if block('body') %}
+{% if block('body') is defined %}
   {% set _body_block %}
     {{ block('body') }}
   {% endset %}
diff --git a/packages/components/bolt-toolbar/toolbar.twig b/packages/components/bolt-toolbar/toolbar.twig
index 7d236f5665..3af419e644 100644
--- a/packages/components/bolt-toolbar/toolbar.twig
+++ b/packages/components/bolt-toolbar/toolbar.twig
@@ -10,7 +10,7 @@
 <div {{ attributes.addClass(classes) }}>
   <div class="c-bolt-toolbar__inner">
     <div class="c-bolt-toolbar__items">
-      {% if title or block('content_before') or content_before %}
+      {% if title or block('content_before') is defined or content_before %}
         <div class="c-bolt-toolbar__item c-bolt-toolbar__item--before">
           {% if title %}
             <div class="c-bolt-toolbar__title">
@@ -20,7 +20,7 @@
             </div>
           {% endif %}
 
-          {%  if block("content_before") %}
+          {%  if block("content_before") is defined %}
             {{ block("content_before") }}
           {% else %}
             {{ content_before }}
@@ -28,7 +28,7 @@
         </div>
       {% endif %}
 
-      {% if block("content") or content %}
+      {% if block("content") is defined or content %}
         <div class="c-bolt-toolbar__item c-bolt-toolbar__item--center">
           {%  if block("content") %}
             {{ block("content") }}
@@ -38,7 +38,7 @@
         </div>
       {% endif %}
 
-      {% if block("content_after") or content_after %}
+      {% if block("content_after") is defined or content_after %}
         <div class="c-bolt-toolbar__item c-bolt-toolbar__item--after">
           {% if block("content_after") %}
             {{ block("content_after") }}

From a0dd61233fb8e77e979e32cea46d74be0cbb7b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=CC=81my=20Denton?= <Remy.Denton@pega.com>
Date: Mon, 12 Jul 2021 18:17:58 -0400
Subject: [PATCH 7/7] DS-489: Update PHP array syntax

---
 .../twig-extensions-shared/src/Layout/GridCellNode.php          | 2 +-
 .../twig-extensions-shared/src/Layout/GridTagNode.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php b/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
index 63a164ebb0..33d0302ed9 100644
--- a/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
+++ b/packages/twig-integration/twig-extensions-shared/src/Layout/GridCellNode.php
@@ -101,7 +101,7 @@ static public function cellFunctionToCall(){
       'autoescape' => false,
     ]);
     $template = $env->createTemplate('<div {{ attributes | raw }}> {{ contents }} </div>');
-    $rendered = $env->render($template, array('contents' => $contents, 'attributes' => $attributes ));
+    $rendered = $env->render($template, ['contents' => $contents, 'attributes' => $attributes]);
 
     echo $rendered, PHP_EOL;
   }
diff --git a/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php b/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
index c496ed5e0a..f4202f59b3 100644
--- a/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
+++ b/packages/twig-integration/twig-extensions-shared/src/Layout/GridTagNode.php
@@ -93,7 +93,7 @@ static public function functionToCall(){
         {{ contents }}
       </div>
     ");
-    $rendered = $env->render($template, array('contents' => $contents, 'attributes' => $attributes, 'grid' => $GLOBALS['grid_props'][$GLOBALS['counter']] ));
+    $rendered = $env->render($template, ['contents' => $contents, 'attributes' => $attributes, 'grid' => $GLOBALS['grid_props'][$GLOBALS['counter']]]);
 
     echo $rendered, PHP_EOL;
   }