ENGCOM-5159: Change the "main" function in NonComposerComponentRegistration.php to closure to avoid naming conflicts. #21831

sidolov · web-flow · commit 62a42eb5cfcc · 2019-08-07T15:56:41.000-05:00
diff --git a/app/etc/NonComposerComponentRegistration.php b/app/etc/NonComposerComponentRegistration.php
@@ -15,7 +15,7 @@
  * @throws RuntimeException
  * @return void
  */
-function main()
+$main = function ()
 {
     $globPatterns = require __DIR__ . '/registration_globlist.php';
     $baseDir = dirname(dirname(__DIR__)) . '/';
@@ -28,6 +28,6 @@ function main()
         }
         array_map(function ($file) { require_once $file; }, $files);
     }
-}
+};
 
-main();
+$main();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* @throws RuntimeException`
`16`	`16`	`* @return void`
`17`	`17`	`*/`
`18`		`-function main()`
	`18`	`+$main = function ()`
`19`	`19`	`{`
`20`	`20`	`$globPatterns = require __DIR__ . '/registration_globlist.php';`
`21`	`21`	`$baseDir = dirname(dirname(__DIR__)) . '/';`
`@@ -28,6 +28,6 @@ function main()`
`28`	`28`	`}`
`29`	`29`	`array_map(function ($file) { require_once $file; }, $files);`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+};`
`32`	`32`
`33`		`-main();`
	`33`	`+$main();`