33310 change strict resolver to fix empty email template variables

Author: silinmykola

app/code/Magento/Newsletter/Model/Queue.php

@@ -253,7 +253,6 @@ public function sendPerSubscriber($count = 20)
 
         /** @var \Magento\Newsletter\Model\Subscriber $item */
         foreach ($collection->getItems() as $item) {
-            $item->setData('unsubscriptionLink', $item->getUnsubscriptionLink());
             $transport = $this->_transportBuilder->setTemplateOptions(
                 ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $item->getStoreId()]
             )->setTemplateVars(

app/code/Magento/Newsletter/Model/Template.php

@@ -224,7 +224,7 @@ public function getTemplateText()
                 'template_text',
                 __(
                     'Follow this link to unsubscribe <!-- This tag is for unsubscribe link  -->' .
-                    '<a href="{{var subscriber.unsubscriptionLink}}">{{var subscriber.unsubscriptionLink}}' .
+                    '<a href="{{var subscriber.getUnsubscriptionLink()}}">{{var subscriber.getUnsubscriptionLink()}}' .
                     '</a>'
                 )
             );

app/code/Magento/Newsletter/i18n/en_US.csv

@@ -91,7 +91,7 @@ Paused,Paused
 "You selected an invalid queue.","You selected an invalid queue."
 "We cannot mark as received subscriber.","We cannot mark as received subscriber."
 "Duplicate template code","Duplicate template code"
-"Follow this link to unsubscribe <!-- This tag is for unsubscribe link  --><a href=""{{var subscriber.unsubscriptionLink}}"">{{var subscriber.unsubscriptionLink}}</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link  --><a href=""{{var subscriber.unsubscriptionLink}}"">{{var subscriber.unsubscriptionLink}}</a>"
+"Follow this link to unsubscribe <!-- This tag is for unsubscribe link  --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>","Follow this link to unsubscribe <!-- This tag is for unsubscribe link  --><a href=""{{var subscriber.getUnsubscriptionLink()}}"">{{var subscriber.getUnsubscriptionLink()}}</a>"
 "No such entity with %fieldName = %fieldValue","No such entity with %fieldName = %fieldValue"
 "Choose Store View:","Choose Store View:"
 "Newsletter Message Preview","Newsletter Message Preview"

lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php

@@ -115,8 +115,10 @@ private function handleGetterMethod(int $i, Template $filter, array $templateVar
                 ...$stackArgs[$i]['args']
             );
         } else {
-            $dataKey = $this->extractDataKeyFromGetter($stackArgs[$i]['name']);
-            $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable']->getData($dataKey);
+            $stackArgs[$i]['variable'] = call_user_func_array(
+                [$stackArgs[$i - 1]['variable'], $stackArgs[$i]['name']],
+                $stackArgs[$i]['args']
+            );
         }
     }