Skip to content

Commit 2625251

Browse files
committed
MAGETWO-70491: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-70491-PR-9796
2 parents 8e75c6e + f215f3d commit 2625251

File tree

275 files changed

+5709
-1724
lines changed

Some content is hidden

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

275 files changed

+5709
-1724
lines changed

app/code/Magento/AdminNotification/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdminNotification',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

app/code/Magento/AdvancedPricingImportExport/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdvancedPricingImportExport',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedPricingImportExport', __DIR__);

app/code/Magento/Analytics/Model/Config/Data.php

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

app/code/Magento/Analytics/Model/Config/Reader/Xml.php

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

app/code/Magento/Analytics/Model/Config/SchemaLocator.php

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

app/code/Magento/Analytics/ReportXml/Config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Analytics\ReportXml;
77

8-
use Magento\Analytics\ReportXml\Config\Data;
8+
use Magento\Framework\Config\DataInterface;
99

1010
/**
1111
* Class Config
@@ -15,17 +15,17 @@
1515
class Config implements ConfigInterface
1616
{
1717
/**
18-
* @var Data
18+
* @var DataInterface
1919
*/
2020
private $data;
2121

2222
/**
2323
* Config constructor.
2424
*
25-
* @param Data $data
25+
* @param DataInterface $data
2626
*/
2727
public function __construct(
28-
Data $data
28+
DataInterface $data
2929
) {
3030
$this->data = $data;
3131
}

app/code/Magento/Analytics/ReportXml/Config/Data.php

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

app/code/Magento/Analytics/ReportXml/Config/Reader/Xml.php

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

app/code/Magento/Analytics/ReportXml/Config/SchemaLocator.php

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

0 commit comments

Comments
 (0)