Skip to content

Commit 8ccdc20

Browse files
committed
MAGETWO-34569: Remove Usages of 'sql' and 'data' Folders
- CR fixes
1 parent 7838549 commit 8ccdc20

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

dev/tests/api-functional/phpunit.xml.dist

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<whitelist>
2525
<!-- All CE modules -->
2626
<directory suffix=".php">../../app/code/Magento</directory>
27-
<exclude>
28-
<!-- Excluding installation and upgrade scripts -->
29-
<directory>../../app/code/Magento/*/Setup</directory>
30-
</exclude>
3127
</whitelist>
3228
</filter>
3329

dev/tests/integration/phpunit.xml.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<whitelist addUncoveredFilesFromWhiteList="true">
2828
<directory suffix=".php">../../../app/code/Magento</directory>
2929
<directory suffix=".php">../../../lib/internal/Magento</directory>
30-
<exclude>
31-
<directory suffix=".php">../../../app/code/Magento/*/Setup</directory>
32-
</exclude>
3330
</whitelist>
3431
</filter>
3532
<!-- PHP INI settings and constants definition -->

dev/tests/unit/phpunit.xml.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<directory suffix=".php">../../../app/code/Magento</directory>
2222
<directory suffix=".php">../../../lib/internal/Magento</directory>
2323
<directory suffix=".php">../../../setup/src/Magento</directory>
24-
<exclude>
25-
<directory suffix=".php">../../../app/code/Magento/*/Setup</directory>
26-
</exclude>
2724
</whitelist>
2825
</filter>
2926
<logging>

lib/internal/Magento/Framework/Module/Dir.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function getDir($moduleName, $type = '')
4747
{
4848
$path = $this->_string->upperCaseWords($moduleName, '_', '/');
4949
if ($type) {
50-
if (!in_array($type, ['etc', 'Setup', 'i18n', 'view', 'Controller'])) {
50+
if (!in_array($type, ['etc', 'i18n', 'view', 'Controller'])) {
5151
throw new \InvalidArgumentException("Directory type '{$type}' is not recognized.");
5252
}
5353
$path .= '/' . $type;

0 commit comments

Comments
 (0)