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

app/etc/registration_globlist.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * 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 [
+    '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

@@ -0,0 +1,33 @@
+<?php
+/**
+ * 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;
+
+/**
+ * Include files from a list of glob patterns
+ *
+ * @throws RuntimeException
+ * @return void
+ */
+function main()
+{
+    $globPatterns = require __DIR__ . '/etc/registration_globlist.php';
+    $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(function ($file) { require_once $file; }, $files);
+    }
+}
+
+main();

composer.json

@@ -243,7 +243,7 @@
             ]
         },
         "files": [
-            "app/etc/NonComposerComponentRegistration.php"
+            "app/registration.php"
         ],
         "exclude-from-classmap": [
             "**/dev/**",

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": {