ISSUE-33310 Fix the code to appear unsubscribe link in newsletter template

Author: engcom-Bravo

app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php

@@ -75,6 +75,9 @@ protected function _toHtml()
         if ($this->getRequest()->getParam('subscriber')) {
             $vars['subscriber']->load($this->getRequest()->getParam('subscriber'));
         }
+        $vars['subscriber_data']['unsubscription_link'] = $vars['subscriber'] ?
+            $vars['subscriber']->getUnsubscriptionLink() :
+            null;
 
         $template->emulateDesign($this->getStoreId());
         $templateProcessed = $this->_appState->emulateAreaCode(

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

@@ -259,7 +259,12 @@ public function sendPerSubscriber($count = 20)
             $transport = $this->_transportBuilder->setTemplateOptions(
                 ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $item->getStoreId()]
             )->setTemplateVars(
-                ['subscriber' => $item]
+                [
+                    'subscriber' => $item,
+                    'subscriber_data' => [
+                        'unsubscription_link' => $item->getUnsubscriptionLink()
+                    ]
+                ]
             )->setFrom(
                 ['name' => $this->getNewsletterSenderName(), 'email' => $this->getNewsletterSenderEmail()]
             )->addTo(

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.getUnsubscriptionLink()}}">{{var subscriber.getUnsubscriptionLink()}}' .
+                    '<a href="{{var subscriber_data.unsubscription_link}}">{{var subscriber_data.unsubscription_link}}' .
                     '</a>'
                 )
             );

app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php

@@ -100,7 +100,14 @@ public function testToHtml()
             ->with(
                 Template::DEFAULT_DESIGN_AREA,
                 [$this->templateMock, 'getProcessedTemplate'],
-                [['subscriber' => null]]
+                [
+                    [
+                        'subscriber' => null,
+                        'subscriber_data' => [
+                            'unsubscription_link' => null
+                        ]
+                    ]
+                ]
             )
             ->willReturn('Processed Template');
 
@@ -141,7 +148,10 @@ public function testToHtmlForNewTemplate()
                 ],
                 [
                     [
-                        'subscriber' => null
+                        'subscriber' => null,
+                        'subscriber_data' => [
+                            'unsubscription_link' => null
+                        ]
                     ]
                 ]
             )
@@ -162,7 +172,9 @@ public function testToHtmlWithSubscriber()
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->expects($this->atLeastOnce())->method('load')->with(3)->willReturnSelf();
         $this->subscriberFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($subscriber);
-
+        $subscriber->expects($this->exactly(2))
+            ->method('getUnsubscriptionLink')
+            ->willReturn('http://example.com/newsletter/subscriber/unsubscribe/');
         $this->templateMock->expects($this->atLeastOnce())->method('emulateDesign')->with(1);
         $this->templateMock->expects($this->atLeastOnce())->method('revertDesign');
 
@@ -175,7 +187,10 @@ public function testToHtmlWithSubscriber()
                 ],
                 [
                     [
-                        'subscriber' => $subscriber
+                        'subscriber' => $subscriber,
+                        'subscriber_data' => [
+                            'unsubscription_link' => $subscriber->getUnsubscriptionLink()
+                        ]
                     ]
                 ]
             )

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

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