MAGETWO-67871: Requesting autogenerated classes that are not in constructor cause fatal errors in production mode

Igor Melnikov · Igor Melnikov · commit 8635ba45ad94 · 2017-05-25T06:31:26.000-04:00
- refactor
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -1619,7 +1619,7 @@ private function getSetupPhpFiles($flags = null)
     {
         $files = [];
         $setupAppPath = BP . '/setup';
-        if (file_exists($setupAppPath) && $flags & self::INCLUDE_SETUP) {
+        if ($flags & self::INCLUDE_SETUP && file_exists($setupAppPath)) {
             $regexIterator = $this->regexIteratorFactory->create(
                 $setupAppPath,
                 '/.*php$/'

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,7 @@ private function getSetupPhpFiles($flags = null)`
`1619`	`1619`	`{`
`1620`	`1620`	`$files = [];`
`1621`	`1621`	`$setupAppPath = BP . '/setup';`
`1622`		`- if (file_exists($setupAppPath) && $flags & self::INCLUDE_SETUP) {`
	`1622`	`+ if ($flags & self::INCLUDE_SETUP && file_exists($setupAppPath)) {`
`1623`	`1623`	`$regexIterator = $this->regexIteratorFactory->create(`
`1624`	`1624`	`$setupAppPath,`
`1625`	`1625`	`'/.*php$/'`