MAGETWO-70840: more safe includes on application start #3129

 - updated glob list to use the path relative to project root
 - fixed tests

Author: Oleksii Korshenko

app/etc/registration_globlist.php

@@ -1,13 +1,18 @@
 <?php
 /**
- * Glob patterns relative to this files parent directory, used by
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Glob patterns relative to the project root directory, used by
  * registration.php to generate a list of includes.
  */
 return [
-    'code/*/*/cli_commands.php',
-    'code/*/*/registration.php',
-    'design/*/*/*/registration.php',
-    'i18n/*/*/registration.php',
-    '../lib/internal/*/*/registration.php',
-    '../lib/internal/*/*/*/registration.php',
+    'app/code/*/*/cli_commands.php',
+    'app/code/*/*/registration.php',
+    'app/design/*/*/*/registration.php',
+    'app/i18n/*/*/registration.php',
+    'lib/internal/*/*/registration.php',
+    'lib/internal/*/*/*/registration.php',
 ];

app/registration.php

@@ -1,11 +1,10 @@
 <?php
 /**
- * Register components (via a list of glob patterns)
- *
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
+//Register components (via a list of glob patterns)
 namespace Magento\NonComposerComponentRegistration;
 
 use RuntimeException;
@@ -19,25 +18,16 @@
 function main()
 {
     $globPatterns = require __DIR__ . '/etc/registration_globlist.php';
-    $baseDir = __DIR__ . '/';
+    $baseDir = dirname(__DIR__) . '/';
 
     foreach ($globPatterns as $globPattern) {
         // Sorting is disabled intentionally for performance improvement
         $files = glob($baseDir . $globPattern, GLOB_NOSORT);
         if ($files === false) {
             throw new RuntimeException("glob(): error with '$baseDir$globPattern'");
         }
-        array_map(__NAMESPACE__ . '\file', $files);
+        array_map(function ($file) { require_once $file; }, $files);
     }
 }
 
-/**
- * Isolated include with it's own variable scope
- *
- * @return void
- */
-function file() {
-    include func_get_arg(0);
-}
-
 main();

lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json

@@ -55,7 +55,7 @@
             "": "app/code/"
         },
         "files": [
-            "app/etc/NonComposerComponentRegistration.php"
+            "app/registration.php"
         ]
     },
     "autoload-dev": {