|
7 | 7 | */
|
8 | 8 | namespace Magento\Framework\Config;
|
9 | 9 |
|
10 |
| -use Magento\Framework\Module\Dir\Reader as DirReader; |
| 10 | +use Magento\Framework\App\Filesystem\DirectoryList; |
11 | 11 | use Magento\Framework\Filesystem;
|
| 12 | +use Magento\Framework\Module\Dir\Reader as DirReader; |
| 13 | +use Magento\Framework\View\Design\Fallback\RulePool; |
| 14 | +use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface; |
12 | 15 | use Magento\Framework\View\Design\ThemeInterface;
|
13 | 16 | use Magento\Framework\View\DesignInterface;
|
14 |
| -use Magento\Framework\App\Filesystem\DirectoryList; |
15 |
| -use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface; |
16 |
| -use Magento\Framework\View\Design\Fallback\RulePool; |
17 | 17 |
|
18 | 18 | /**
|
19 | 19 | * Class FileResolver
|
@@ -53,6 +53,11 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface, D
|
53 | 53 | */
|
54 | 54 | protected $resolver;
|
55 | 55 |
|
| 56 | + /** |
| 57 | + * @var DirectoryList |
| 58 | + */ |
| 59 | + protected $directoryList; |
| 60 | + |
56 | 61 | /**
|
57 | 62 | * @param DirReader $moduleReader
|
58 | 63 | * @param FileIteratorFactory $iteratorFactory
|
@@ -105,7 +110,7 @@ public function get($filename, $scope)
|
105 | 110 | );
|
106 | 111 | if (file_exists($designPath)) {
|
107 | 112 | try {
|
108 |
| - $designDom = new \DOMDocument; |
| 113 | + $designDom = new \DOMDocument(); |
109 | 114 | $designDom->load($designPath);
|
110 | 115 | $iterator[$designPath] = $designDom->saveXML();
|
111 | 116 | } catch (\Exception $e) {
|
@@ -174,7 +179,7 @@ private function getParentConfigs(ThemeInterface $theme, array $iterator, $index
|
174 | 179 | $theme->getParentTheme()
|
175 | 180 | );
|
176 | 181 |
|
177 |
| - $parentDom = new \DOMDocument; |
| 182 | + $parentDom = new \DOMDocument(); |
178 | 183 | $parentDom->load($parentDesignPath);
|
179 | 184 |
|
180 | 185 | $iterator[$index] = $parentDom->saveXML();
|
|
0 commit comments