Skip to content

Commit d83d0f8

Browse files
committed
AC-1150 Update magento-coding-standard to v11 and remove moved tests from magento2 repo
1 parent dc88b53 commit d83d0f8

File tree

9 files changed

+11
-21
lines changed

9 files changed

+11
-21
lines changed

app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?php
2-
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
36
declare(strict_types=1);
47

58
namespace Magento\AdminAnalytics\Controller\Adminhtml\Config;
69

710
use Magento\Backend\App\Action;
8-
use Magento\Catalog\Helper\Catalog;
911
use Magento\Framework\App\Action\HttpPostActionInterface;
10-
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\Controller\ResultFactory;
1213
use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger as NotificationLogger;
1314
use Magento\Framework\App\ProductMetadataInterface;
@@ -52,7 +53,6 @@ public function __construct(
5253
$this->configFactory = $configFactory;
5354
$this->productMetadata = $productMetadata;
5455
$this->notificationLogger = $notificationLogger;
55-
$something = ObjectManager::getInstance()->get(Catalog::class);
5656
}
5757

5858
/**

app/code/Magento/AdminAnalytics/data/UpgradeData.php

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<type name="Magento\Framework\Notification\NotifierList">
1010
<arguments>
1111
<argument name="notifiers" xsi:type="array">
12-
<item key="" name="adminnotification" xsi:type="string">Magento\AdminNotification\Model\Inbox</item>
12+
<item name="adminnotification" xsi:type="string">Magento\AdminNotification\Model\Inbox</item>
1313
</argument>
1414
</arguments>
1515
</type>

app/code/Magento/AdminNotification/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module version="1" name="Magento_AdminNotification" >
9+
<module name="Magento_AdminNotification" >
1010
<sequence>
1111
<module name="Magento_Store"/>
1212
</sequence>

app/code/Magento/Catalog/etc/widget.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
-->
88
<widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Widget:etc/widget.xsd">
10-
<widget type="/Deprecated">
11-
<label translate="true">Catalog New Products List</label>
12-
<description translate="true">List of Products that are set as New</description>
13-
<supported_blocks>Deprecated
14-
<block>
15-
<block_name>Deprecated</block_name>
16-
</block>
17-
</supported_blocks>
18-
</widget>
1910
<widget id="new_products" class="Magento\Catalog\Block\Product\Widget\NewWidget" is_email_compatible="true"
2011
placeholder_image="Magento_Catalog::images/product_widget_new.png" ttl="86400">
2112
<label translate="true">Catalog New Products List</label>

app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ $wishlistHelper = $block->getData('wishlistHelper');
1212
?>
1313
<?php if ($block->getLink()): ?>
1414
<p id="wishlist-rss-email-link">
15-
<h2>{{escapehtml "H2"}}</h2>
1615
<?= $block->escapeHtml(__("RSS link to %1's wishlist", $wishlistHelper->getCustomerName())) ?>
1716
<br />
1817
<a href="<?= $block->escapeUrl($block->getLink()) ?>"><?= $block->escapeUrl($block->getLink()) ?></a>

dev/tests/static/testsuite/Magento/Test/Legacy/EmailTemplateTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public function testObsoleteDirectives()
1515
{
1616
$invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
1717
$invoker(
18-
/**
19-
* @param string $file
20-
*/
18+
/**
19+
* @param string $file
20+
*/
2121
function ($file) {
2222
$this->assertDoesNotMatchRegularExpression(
2323
'/\{\{htmlescape.*?\}\}/i',

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ function ($path) use ($ignoreListPattern) {
285285
}
286286
);
287287
}
288+
288289
$result = $codeSniffer->run($fileList);
289290
$report = file_get_contents($reportFile);
290291
$this->assertEquals(

dev/tests/static/testsuite/Magento/Test/Xml/LiveCodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void
3939
}
4040

4141
/**
42-
* Run the magento specific coding standards on the code
42+
* Run the magento specific coding standards on the codedata/UpgradeData.php
4343
*
4444
* @return void
4545
*/

0 commit comments

Comments
 (0)