Skip to content

Commit 03848e2

Browse files
freddenfredden
authored
Merge branch '2.4-develop' into sitemap/cms-page-exclude
2 parents 0cc6020 + 6057eb8 commit 03848e2

File tree

4,203 files changed

+120634
-162776
lines changed

Some content is hidden

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

4,203 files changed

+120634
-162776
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/bootstrap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
</div>
2828
HTML;
2929
}
30+
http_response_code(503);
3031
exit(1);
3132
}
3233

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

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

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

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\AdminAdobeIms\Api;
9+
10+
use Magento\AdminAdobeIms\Api\Data\ImsWebapiInterface;
11+
12+
use Magento\AdminAdobeIms\Api\Data\ImsWebapiSearchResultsInterface;
13+
use Magento\Framework\Api\SearchCriteriaInterface;
14+
use Magento\Framework\Exception\CouldNotSaveException;
15+
use Magento\Framework\Exception\LocalizedException;
16+
use Magento\Framework\Exception\NoSuchEntityException;
17+
18+
/**
19+
* Declare ims web api repository
20+
* @api
21+
*/
22+
interface ImsWebapiRepositoryInterface
23+
{
24+
/**
25+
* Save ims token
26+
*
27+
* @param ImsWebapiInterface $entity
28+
* @return void
29+
* @throws CouldNotSaveException
30+
*/
31+
public function save(ImsWebapiInterface $entity): void;
32+
33+
/**
34+
* Get ims token
35+
*
36+
* @param int $entityId
37+
* @return ImsWebapiInterface
38+
* @throws NoSuchEntityException
39+
*/
40+
public function get(int $entityId): ImsWebapiInterface;
41+
42+
/**
43+
* Get ims token(s) by admin user id
44+
*
45+
* @param int $adminUserId
46+
* @return ImsWebapiInterface[]
47+
* @throws NoSuchEntityException
48+
*/
49+
public function getByAdminUserId(int $adminUserId): array;
50+
51+
/**
52+
* Get entity by access token hash
53+
*
54+
* @param string $tokenHash
55+
* @return ImsWebapiInterface
56+
* @throws NoSuchEntityException
57+
*/
58+
public function getByAccessTokenHash(string $tokenHash): ImsWebapiInterface;
59+
60+
/**
61+
* Get ims token by search criteria
62+
*
63+
* @param SearchCriteriaInterface $searchCriteria
64+
* @return ImsWebapiSearchResultsInterface
65+
* @throws NoSuchEntityException
66+
*/
67+
public function getList(SearchCriteriaInterface $searchCriteria): ImsWebapiSearchResultsInterface;
68+
69+
/**
70+
* Delete ims tokens for admin user id.
71+
*
72+
* @param int $adminUserId
73+
* @return bool
74+
* @throws NoSuchEntityException
75+
* @throws LocalizedException
76+
*/
77+
public function deleteByAdminUserId(int $adminUserId): bool;
78+
}

0 commit comments

Comments
 (0)