Skip to content

Commit 352b9ef

Browse files
author
Bartosz Kubicki
committed
Merge branch '2.4-develop' into integration-testsuite-decomposition-proof-of-concept
Conflicts: app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/MarkAsReadTest.php app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/MassRemoveTest.php app/code/Magento/Rss/Test/Integration/Controller/Feed/IndexTest.php dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsReadTest.php dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/RemoveTest.php dev/tests/integration/testsuite/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/CriticalTest.php
2 parents 6f88d2a + 8b38e63 commit 352b9ef

File tree

8,368 files changed

+156343
-108811
lines changed

Some content is hidden

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

8,368 files changed

+156343
-108811
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
1111

1212
### Preconditions (*)
1313
<!---
14-
Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
14+
Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
1515
-->
1616
1.
1717
2.
@@ -32,3 +32,12 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
3232
<!--- Tell us what happened instead. Include error messages and issues. -->
3333
1. [Screenshots, logs or description]
3434
2.
35+
36+
---
37+
Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
38+
39+
- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
40+
- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
41+
- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
42+
- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
43+
- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,12 @@ Fields marked with (*) are required. Please don't remove the template.
1818

1919
### Proposed solution
2020
<!--- Suggest your potential solutions for this issue. -->
21+
22+
---
23+
Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
24+
25+
- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
26+
- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
27+
- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
28+
- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
29+
- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
2424
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
2525
-->
26-
1. magento/magento2#<issue_number>: Issue title
26+
1. Fixes magento/magento2#<issue_number>
2727

2828
### Manual testing scenarios (*)
2929
<!---

.travis.yml.sample

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

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\AdminAnalytics\Test\Unit\Condition;
79

810
use Magento\AdminAnalytics\Model\Condition\CanViewNotification;
911
use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger;
1012
use Magento\AdminAnalytics\Model\Viewer\Log;
13+
use Magento\Framework\App\CacheInterface;
1114
use Magento\Framework\App\ProductMetadataInterface;
1215
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
13-
use Magento\Framework\App\CacheInterface;
1416
use PHPUnit\Framework\MockObject\MockObject;
1517
use PHPUnit\Framework\TestCase;
1618

@@ -28,21 +30,16 @@ class CanViewNotificationTest extends TestCase
2830
/** @var Log|MockObject */
2931
private $logMock;
3032

31-
/** @var $cacheStorageMock MockObject|CacheInterface */
33+
/** @var MockObject|CacheInterface $cacheStorageMock */
3234
private $cacheStorageMock;
3335

3436
protected function setUp(): void
3537
{
3638
$this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
3739
->getMockForAbstractClass();
38-
$this->logMock = $this->getMockBuilder(Log::class)
39-
->getMock();
40-
$this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
41-
->disableOriginalConstructor()
42-
->getMock();
43-
$this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
44-
->disableOriginalConstructor()
45-
->getMock();
40+
$this->logMock = $this->createMock(Log::class);
41+
$this->viewerLoggerMock = $this->createMock(Logger::class);
42+
$this->productMetadataMock = $this->getMockForAbstractClass(ProductMetadataInterface::class);
4643
$objectManager = new ObjectManager($this);
4744
$this->canViewNotification = $objectManager->getObject(
4845
CanViewNotification::class,

app/code/Magento/AdminAnalytics/composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.1.3||~7.2.0||~7.3.0",
8+
"php": "~7.3.0||~7.4.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*",
1111
"magento/module-config": "*",
@@ -18,12 +18,11 @@
1818
"AFL-3.0"
1919
],
2020
"autoload": {
21-
"files": [
22-
"registration.php"
23-
],
24-
"psr-4": {
25-
"Magento\\AdminAnalytics\\": ""
26-
}
21+
"files": [
22+
"registration.php"
23+
],
24+
"psr-4": {
25+
"Magento\\AdminAnalytics\\": ""
26+
}
2727
}
2828
}
29-

app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/MarkAsReadTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
/***
5+
/**
66
* Copyright © Magento, Inc. All rights reserved.
77
* See COPYING.txt for license details.
88
*/
@@ -20,10 +20,10 @@ class MarkAsReadTest extends AbstractBackendController
2020
/**
2121
* @inheritdoc
2222
*/
23-
public function setUp(): void
23+
protected function setUp(): void
2424
{
25+
parent::setUp();
2526
$this->resource = 'Magento_AdminNotification::mark_as_read';
2627
$this->uri = 'backend/admin/notification/markasread';
27-
parent::setUp();
2828
}
2929
}

app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/MassMarkAsReadTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
/***
5+
/**
66
* Copyright © Magento, Inc. All rights reserved.
77
* See COPYING.txt for license details.
88
*/
@@ -18,11 +18,11 @@ class MassMarkAsReadTest extends AbstractBackendController
1818
* @return void
1919
* @throws AuthenticationException
2020
*/
21-
public function setUp(): void
21+
protected function setUp(): void
2222
{
23+
parent::setUp();
2324
$this->resource = 'Magento_AdminNotification::mark_as_read';
2425
$this->uri = 'backend/admin/notification/massmarkasread';
2526
$this->httpMethod = HttpRequest::METHOD_POST;
26-
parent::setUp();
2727
}
2828
}

app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/MassRemoveTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
/***
5+
/**
66
* Copyright © Magento, Inc. All rights reserved.
77
* See COPYING.txt for license details.
88
*/
@@ -18,11 +18,11 @@ class MassRemoveTest extends AbstractBackendController
1818
* @return void
1919
* @throws AuthenticationException
2020
*/
21-
public function setUp(): void
21+
protected function setUp(): void
2222
{
23+
parent::setUp();
2324
$this->resource = 'Magento_AdminNotification::adminnotification_remove';
2425
$this->uri = 'backend/admin/notification/massremove';
2526
$this->httpMethod = HttpRequest::METHOD_POST;
26-
parent::setUp();
2727
}
2828
}

app/code/Magento/AdminNotification/Test/Integration/Controller/Adminhtml/Notification/RemoveTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
/***
5+
/**
66
* Copyright © Magento, Inc. All rights reserved.
77
* See COPYING.txt for license details.
88
*/
@@ -17,10 +17,10 @@ class RemoveTest extends AbstractBackendController
1717
* @return void
1818
* @throws AuthenticationException
1919
*/
20-
public function setUp(): void
20+
protected function setUp(): void
2121
{
22+
parent::setUp();
2223
$this->resource = 'Magento_AdminNotification::adminnotification_remove';
2324
$this->uri = 'backend/admin/notification/remove';
24-
parent::setUp();
2525
}
2626
}

0 commit comments

Comments
 (0)