Skip to content

Commit ee4a029

Browse files
author
Erik Hansen
committed
MAGETWO-37672: Responsive Email Foundation
- Moved logo email ID to a constant - Misc code cleanup
1 parent c05b10d commit ee4a029

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

app/code/Magento/Email/Model/AbstractTemplate.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
2424
*/
2525
const DEFAULT_DESIGN_AREA = 'frontend';
2626

27+
/**
28+
* Default path to email logo
29+
*/
30+
const DEFAULT_LOGO_FILE_ID = 'Magento_Email::logo_email.png';
31+
2732
/**
2833
* Email logo url
2934
*
@@ -368,7 +373,7 @@ public function getDefaultEmailLogo()
368373
{
369374
$designParams = $this->getDesignParams();
370375
return $this->assetRepo->getUrlWithParams(
371-
'Magento_Email::logo_email.png',
376+
self::DEFAULT_LOGO_FILE_ID,
372377
$designParams
373378
);
374379
}

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
7676
private $backendUrlBuilder;
7777

7878
/**
79-
* @var \Pelago\Emogrifier|\PHPUnit_Framework_MockObject_MockObject
79+
* @var \Pelago\Emogrifier
8080
*/
8181
private $emogrifier;
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected function getFilterFactory()
232232
*/
233233
public function isValidForSend()
234234
{
235-
return !$this->_scopeConfig->isSetFlag(
235+
return !$this->scopeConfig->isSetFlag(
236236
\Magento\Email\Model\Template::XML_PATH_SYSTEM_SMTP_DISABLE,
237237
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
238238
) && $this->getTemplateSenderName() && $this->getTemplateSenderEmail() && $this->getTemplateSubject();

app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
301301
/**
302302
* @return array
303303
*/
304-
public function getProcessedTemplateProvider()
304+
public function getProcessedTemplateDataProvider()
305305
{
306306
return [
307307
'default' => [

0 commit comments

Comments
 (0)