Skip to content

Commit 354d883

Browse files
author
Dmitry Kologrivov
committed
MAGETWO-44227: Fix static tests
1 parent bb1d132 commit 354d883

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

app/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,8 +1065,8 @@
10651065
<type name="Magento\Framework\Config\View">
10661066
<arguments>
10671067
<argument name="fileName" xsi:type="string">view.xml</argument>
1068-
<argument name="converterInterface" xsi:type="object">Magento\Framework\Config\Converter</argument>
1069-
<argument name="schemaLocatorInterface" xsi:type="object">Magento\Framework\Config\SchemaLocator</argument>
1068+
<argument name="converter" xsi:type="object">Magento\Framework\Config\Converter</argument>
1069+
<argument name="schemaLocator" xsi:type="object">Magento\Framework\Config\SchemaLocator</argument>
10701070
<argument name="fileResolver" xsi:type="object">Magento\Framework\Config\FileResolver</argument>
10711071
</arguments>
10721072
</type>

lib/internal/Magento/Framework/Config/View.php

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,42 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
2121
*/
2222
protected $xpath;
2323

24-
/**
25-
* @var Reader
26-
*/
27-
private $xsdReader;
28-
2924
/**
3025
* @param FileResolverInterface $fileResolver
31-
* @param ConverterInterface $converterInterface
32-
* @param SchemaLocatorInterface $schemaLocatorInterface
26+
* @param ConverterInterface $converter
27+
* @param SchemaLocatorInterface $schemaLocator
3328
* @param ValidationStateInterface $validationState
29+
* @param string $fileName
3430
* @param UrnResolver $urnResolver
35-
* @param array $fileName
31+
* @param array $idAttributes
32+
* @param string $domDocumentClass
33+
* @param string $defaultScope
3634
* @param array $xpath
3735
*/
3836
public function __construct(
3937
FileResolverInterface $fileResolver,
40-
ConverterInterface $converterInterface,
41-
SchemaLocatorInterface $schemaLocatorInterface,
38+
ConverterInterface $converter,
39+
SchemaLocatorInterface $schemaLocator,
4240
ValidationStateInterface $validationState,
43-
UrnResolver $urnResolver,
4441
$fileName,
42+
UrnResolver $urnResolver,
43+
$idAttributes = [],
44+
$domDocumentClass = 'Magento\Framework\Config\Dom',
45+
$defaultScope = 'global',
4546
$xpath = []
4647
) {
4748
$this->xpath = $xpath;
4849
$this->urnResolver = $urnResolver;
4950
$idAttributes = $this->_getIdAttributes();
5051
parent::__construct(
5152
$fileResolver,
52-
$converterInterface,
53-
$schemaLocatorInterface,
53+
$converter,
54+
$schemaLocator,
5455
$validationState,
5556
$fileName,
56-
$idAttributes
57+
$idAttributes,
58+
$domDocumentClass,
59+
$defaultScope
5760
);
5861
$this->data = $this->read();
5962
}

0 commit comments

Comments
 (0)