Skip to content

Commit f90deb1

Browse files
merge magento/2.4-develop into magento-techdivision/MC-33061-fix-sql-view-backup
2 parents 9279fce + 03a986d commit f90deb1

File tree

749 files changed

+4489
-28820
lines changed

Some content is hidden

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

749 files changed

+4489
-28820
lines changed

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAdminWithCredentialsActionGroup.xml

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

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAsAdminActionGroup.xml

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

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,27 @@
1111
use Magento\Framework\App\ProductMetadataInterface;
1212
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1313
use Magento\Framework\App\CacheInterface;
14+
use PHPUnit\Framework\MockObject\MockObject;
15+
use PHPUnit\Framework\TestCase;
1416

15-
/**
16-
* Class CanViewNotificationTest
17-
*/
18-
class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
17+
class CanViewNotificationTest extends TestCase
1918
{
2019
/** @var CanViewNotification */
2120
private $canViewNotification;
2221

23-
/** @var Logger|\PHPUnit_Framework_MockObject_MockObject */
22+
/** @var Logger|MockObject */
2423
private $viewerLoggerMock;
2524

26-
/** @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
25+
/** @var ProductMetadataInterface|MockObject */
2726
private $productMetadataMock;
2827

29-
/** @var Log|\PHPUnit_Framework_MockObject_MockObject */
28+
/** @var Log|MockObject */
3029
private $logMock;
3130

32-
/** @var $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
31+
/** @var $cacheStorageMock MockObject|CacheInterface */
3332
private $cacheStorageMock;
3433

35-
public function setUp()
34+
protected function setUp(): void
3635
{
3736
$this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
3837
->getMockForAbstractClass();

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323

2424
<before>
25-
<actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
</before>
2727
<after>
2828
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Analytics/etc/di.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,13 @@
161161
<item name="25" xsi:type="string">payment/banktransfer/active</item>
162162
<item name="26" xsi:type="string">payment/cashondelivery/title</item>
163163
<item name="27" xsi:type="string">payment/cashondelivery/active</item>
164-
<item name="28" xsi:type="string">payment/authorizenet_directpost/title</item>
165-
<item name="29" xsi:type="string">payment/authorizenet_directpost/active</item>
166-
<item name="30" xsi:type="string">payment/paypal_billing_agreement/title</item>
167-
<item name="31" xsi:type="string">payment/paypal_billing_agreement/active</item>
168-
<item name="32" xsi:type="string">payment/braintree/title</item>
169-
<item name="33" xsi:type="string">payment/braintree/active</item>
170-
<item name="34" xsi:type="string">payment/braintree_paypal/title</item>
171-
<item name="35" xsi:type="string">payment/braintree_paypal/active</item>
172-
<item name="36" xsi:type="string">analytics/general/vertical</item>
164+
<item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
165+
<item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
166+
<item name="30" xsi:type="string">payment/braintree/title</item>
167+
<item name="31" xsi:type="string">payment/braintree/active</item>
168+
<item name="32" xsi:type="string">payment/braintree_paypal/title</item>
169+
<item name="33" xsi:type="string">payment/braintree_paypal/active</item>
170+
<item name="34" xsi:type="string">analytics/general/vertical</item>
173171
</argument>
174172
</arguments>
175173
</type>

app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php

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

app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php

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

app/code/Magento/Authorizenet/Block/Transparent/Iframe.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php

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

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php

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

0 commit comments

Comments
 (0)