Skip to content

Commit 36da159

Browse files
mrtuvnmrtuvn
authored
Merge branch '2.4-develop' into reduce-console-async-log
2 parents 8e36ee1 + b436194 commit 36da159

File tree

3,537 files changed

+96400
-159048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,537 files changed

+96400
-159048
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Bug report
2+
description: Technical issue with the Magento 2 core components
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
8+
- type: textarea
9+
attributes:
10+
label: Preconditions and environment
11+
description: |
12+
Describe your environment.
13+
Provide all the details that will help us to reproduce the bug.
14+
value: |
15+
- Magento version
16+
- Anything else that would help a developer reproduce the bug
17+
- type: textarea
18+
attributes:
19+
label: Steps to reproduce
20+
description: |
21+
Provide a set of clear steps to reproduce this bug.
22+
placeholder: |
23+
Example:
24+
1. Navigate to storefront as a guest.
25+
2. Open Test Category.
26+
3. Click “Add to Cart” on the Virtual Product.
27+
4. Open mini shopping cart and click “Proceed to Checkout”.
28+
validations:
29+
required: true
30+
- type: textarea
31+
attributes:
32+
label: Expected result
33+
description: |
34+
Tell us what you expected to happen.
35+
placeholder: |
36+
Example:
37+
Order is placed successfully, customer is redirected to the success page.
38+
validations:
39+
required: true
40+
- type: textarea
41+
attributes:
42+
label: Actual result
43+
description: |
44+
Tell us what happened. Include error messages and issues.
45+
placeholder: |
46+
Example:
47+
“Place order” button is not visible, order cannot be placed.
48+
validations:
49+
required: true
50+
- type: textarea
51+
attributes:
52+
label: Additional information
53+
description: |
54+
Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
55+
Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
56+
- type: textarea
57+
attributes:
58+
label: Release note
59+
description: |
60+
Help us to provide meaningful release notes to the community.
61+
- type: checkboxes
62+
attributes:
63+
label: Triage and priority
64+
description: |
65+
Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
66+
This information helps us during the Confirmation and Issue triage processes.
67+
options:
68+
- label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
69+
- label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
70+
- label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
71+
- label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
72+
- label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

‎SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Magento values the contributions of the security research community, and we look
44

55
## Where should I report security issues?
66

7-
We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/magento). Please provide us with relevant technical details and repro steps to expedite our investigation. If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.
7+
We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/adobe). Please provide us with relevant technical details and repro steps to expedite our investigation. If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.
88

99
## Learning More About Security
1010
To learn more about securing a Magento store, please visit the [Security Center](https://magento.com/security).

‎app/code/Magento/AdminAdobeIms/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
view/adminhtml/web/node_modules/

‎app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\AdminAdobeIms\Api\Data;
10+
11+
use Magento\Framework\Api\ExtensibleDataInterface;
12+
13+
/**
14+
* Declare the ims token data service object
15+
* @api
16+
*/
17+
interface ImsWebapiInterface extends ExtensibleDataInterface
18+
{
19+
/**
20+
* Get ID
21+
*
22+
* @return int|null
23+
*/
24+
public function getId();
25+
26+
/**
27+
* Get admin user ID
28+
*
29+
* @return int|null
30+
*/
31+
public function getAdminUserId(): ?int;
32+
33+
/**
34+
* Set admin user ID
35+
*
36+
* @param int $value
37+
* @return $this
38+
*/
39+
public function setAdminUserId(int $value): ImsWebapiInterface;
40+
41+
/**
42+
* Get access token hash
43+
*
44+
* @return string|null
45+
*/
46+
public function getAccessTokenHash(): ?string;
47+
48+
/**
49+
* Set access token hash
50+
*
51+
* @param string $value
52+
* @return $this
53+
*/
54+
public function setAccessTokenHash(string $value): ImsWebapiInterface;
55+
56+
/**
57+
* Get access token
58+
*
59+
* @return string|null
60+
*/
61+
public function getAccessToken(): ?string;
62+
63+
/**
64+
* Set access token
65+
*
66+
* @param string $value
67+
* @return $this
68+
*/
69+
public function setAccessToken(string $value): ImsWebapiInterface;
70+
71+
/**
72+
* Get creation time
73+
*
74+
* @return string|null
75+
*/
76+
public function getCreatedAt(): ?string;
77+
78+
/**
79+
* Set creation time
80+
*
81+
* @param string $value
82+
* @return $this
83+
*/
84+
public function setCreatedAt(string $value): ImsWebapiInterface;
85+
86+
/**
87+
* Get update time
88+
*
89+
* @return string|null
90+
*/
91+
public function getUpdatedAt(): ?string;
92+
93+
/**
94+
* Set update time
95+
*
96+
* @param string $value
97+
* @return $this
98+
*/
99+
public function setUpdatedAt(string $value): ImsWebapiInterface;
100+
101+
/**
102+
* Get last check time
103+
*
104+
* @return string|null
105+
*/
106+
public function getLastCheckTime(): ?string;
107+
108+
/**
109+
* Set last check time
110+
*
111+
* @param string $value
112+
* @return $this
113+
*/
114+
public function setLastCheckTime(string $value): ImsWebapiInterface;
115+
116+
/**
117+
* Get expires time of token
118+
*
119+
* @return string|null
120+
*/
121+
public function getAccessTokenExpiresAt(): ?string;
122+
123+
/**
124+
* Set expires time of token
125+
*
126+
* @param string $value
127+
* @return $this
128+
*/
129+
public function setAccessTokenExpiresAt(string $value): ImsWebapiInterface;
130+
131+
/**
132+
* Retrieve existing extension attributes object or create a new one.
133+
*
134+
* @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface|null
135+
*/
136+
public function getExtensionAttributes(): ImsWebapiExtensionInterface;
137+
138+
/**
139+
* Set extension attributes
140+
*
141+
* @param \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface $extensionAttributes
142+
* @return $this
143+
*/
144+
public function setExtensionAttributes(ImsWebapiExtensionInterface $extensionAttributes): ImsWebapiInterface;
145+
}

‎app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\AdminAdobeIms\Api\Data;
10+
11+
use Magento\AdminAdobeIms\Api\Data\ImsWebapiInterface;
12+
use Magento\Framework\Api\SearchResultsInterface;
13+
14+
/**
15+
* Interface ImsWebapiSearchResultsInterface
16+
*
17+
* @api
18+
*/
19+
interface ImsWebapiSearchResultsInterface extends SearchResultsInterface
20+
{
21+
/**
22+
* Get ims token list.
23+
*
24+
* @return ImsWebapiInterface[]
25+
*/
26+
public function getItems();
27+
28+
/**
29+
* Set ims token list.
30+
*
31+
* @param ImsWebapiInterface[] $items
32+
* @return $this
33+
*/
34+
public function setItems(array $items);
35+
}

‎app/code/Magento/AdminAdobeIms/Api/ImsLogOutInterface.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\AdminAdobeIms\Api;
10+
11+
/**
12+
* Declare functionality for user logout from the Adobe IMS account
13+
*
14+
* @api
15+
*/
16+
interface ImsLogOutInterface
17+
{
18+
/**
19+
* LogOut User from Adobe IMS Account
20+
*
21+
* @param string|null $accessToken
22+
* @return bool
23+
*/
24+
public function execute(?string $accessToken = null) : bool;
25+
}

0 commit comments

Comments
 (0)