Skip to content

[PHPDOC] Fix bad phpdoc \Magento\Sales\Model\Order\Email\Container\Template::$id property #39150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 17, 2025
Merged

[PHPDOC] Fix bad phpdoc \Magento\Sales\Model\Order\Email\Container\Template::$id property #39150

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8807b9a
Fix bad \Magento\Sales\Model\Order\Email\Container\Template::$id prop…
Sep 10, 2024
c6a39c3
Merge branch '2.4-develop' into bad-phpdoc-sales-email-container-temp…
dimitriBouteille Oct 14, 2024
ee96d20
Merge branch '2.4-develop' into bad-phpdoc-sales-email-container-temp…
engcom-Hotel Jan 17, 2025
ada27be
fixed static test failure
engcom-Charlie Jan 20, 2025
02e590b
Merge branch '2.4-develop' into bad-phpdoc-sales-email-container-temp…
engcom-Charlie Jan 20, 2025
191ab87
Merge branch '2.4-develop' into bad-phpdoc-sales-email-container-temp…
engcom-Charlie Jan 22, 2025
a364e14
Merge branch '2.4-develop' into bad-phpdoc-sales-email-container-temp…
dimitriBouteille Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/code/Magento/Sales/Model/Order/Email/Container/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2017 Adobe
* All Rights Reserved.
*/
namespace Magento\Sales\Model\Order\Email\Container;

Expand All @@ -25,7 +25,7 @@ class Template implements ResetAfterRequestInterface
protected $templateId;

/**
* @var int
* @var int|string
*/
protected $id;

Expand Down Expand Up @@ -74,7 +74,7 @@ public function getTemplateOptions()
/**
* Set email template id
*
* @param int $id
* @param int|string $id
* @return void
*/
public function setTemplateId($id)
Expand All @@ -85,7 +85,7 @@ public function setTemplateId($id)
/**
* Get email template id
*
* @return int
* @return int|string
*/
public function getTemplateId()
{
Expand Down