Merge pull request #2000 from skaut/autoload-leak-fix

Fixed leaking classes in autoloader

Author: marekdedic

composer.json

@@ -36,7 +36,8 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "classmap-authoritative": true
     },
     "require": {
         "php": "^5.6 || ^7.0 || ^8.0",

gulpfile.js

@@ -1,12 +1,13 @@
 /* eslint-env node */
 
+import { Transform } from 'node:stream';
+
 import gulp from 'gulp';
 import cleanCSS from 'gulp-clean-css';
 import inject from 'gulp-inject-string';
 import rename from 'gulp-rename';
 import replace from 'gulp-replace';
 import shell from 'gulp-shell';
-import merge from 'merge-stream';
 import named from 'vinyl-named';
 import webpack from 'webpack-stream';
 
@@ -32,39 +33,63 @@ gulp.task('build:css', gulp.parallel('build:css:admin', 'build:css:frontend'));
 
 gulp.task(
 	'build:deps:composer:scoper',
-	shell.task('vendor/bin/php-scoper add-prefix --force')
+	gulp.series(shell.task('vendor/bin/php-scoper add-prefix --force'), () =>
+		gulp
+			.src(['dist/vendor/scoper-autoload.php'])
+			.pipe(
+				replace(
+					"$GLOBALS['__composer_autoload_files']",
+					"$GLOBALS['__composer_autoload_files_Sgdg_Vendor']"
+				)
+			)
+			.pipe(gulp.dest('dist/vendor/'))
+	)
 );
 
 gulp.task(
 	'build:deps:composer:autoloader',
 	gulp.series(
-		shell.task(
-			'composer dump-autoload --no-dev' +
-				(process.env.NODE_ENV === 'production' ? ' -o' : '')
-		),
+		shell.task('composer dump-autoload --no-dev'),
 		() =>
-			merge(
-				gulp.src([
-					'vendor/composer/autoload_classmap.php',
-					'vendor/composer/autoload_files.php',
-					'vendor/composer/autoload_namespaces.php',
-					'vendor/composer/autoload_psr4.php',
-				]),
-				gulp
-					.src(['vendor/composer/autoload_static.php'])
-					.pipe(
-						replace(
-							'namespace Composer\\Autoload;',
-							'namespace Sgdg\\Vendor\\Composer\\Autoload;'
-						)
-					)
-					.pipe(
-						replace(
-							/'(.*)\\\\' => \n/g,
-							"'Sgdg\\\\Vendor\\\\$1\\\\' => \n"
-						)
-					)
-			).pipe(gulp.dest('dist/vendor/composer/')),
+			gulp
+				.src(['vendor/composer/autoload_static.php'])
+				.pipe(
+					new Transform({
+						objectMode: true,
+						transform: (chunk, encoding, callback) => {
+							let contents = String(chunk.contents).split('\n');
+							let mode = 'none';
+							contents = contents.map((line) => {
+								if (/^\s*\);$/g.exec(line)) {
+									mode = 'none';
+								} else if (
+									/^\s*public static \$classMap = array \($/.exec(
+										line
+									)
+								) {
+									mode = 'classMap';
+								} else if (mode === 'classMap') {
+									line = line.replace(
+										/^(\s*)'([^']*)' =>/,
+										"$1'Sgdg\\\\Vendor\\\\$2' =>"
+									);
+								} else {
+									line = line.replace(
+										'namespace Composer\\Autoload;',
+										'namespace Sgdg\\Vendor\\Composer\\Autoload;'
+									);
+								}
+								return line;
+							});
+							chunk.contents = Buffer.from(
+								contents.join('\n'),
+								encoding
+							);
+							callback(null, chunk);
+						},
+					})
+				)
+				.pipe(gulp.dest('dist/vendor/composer/')),
 		shell.task('composer dump-autoload')
 	)
 );

package-lock.json

@@ -74,7 +74,6 @@
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.1.4",
     "gulp-shell": "^0.8.0",
-    "merge-stream": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",

package.json

@@ -78,6 +78,7 @@ function dependency_finder() {
 		static function ( $file_path, $prefix, $contents ) {
 			$regex_prefix   = mb_ereg_replace( '\\\\', '\\\\\\\\', $prefix );
 			$replace_prefix = mb_ereg_replace( '\\\\', '\\\\', $prefix );
+			$underscore_prefix = mb_ereg_replace( '\\\\', '_', $prefix );
 
 			if ( __DIR__ . '/vendor/composer/autoload_real.php' === $file_path ) {
 				$contents = safe_replace(
@@ -90,6 +91,11 @@ static function ( $file_path, $prefix, $contents ) {
 					"\\spl_autoload_unregister(array('{$replace_prefix}\\\\ComposerAutoloaderInit",
 					$contents
 				);
+				$contents = safe_replace(
+					"\\\$GLOBALS\['__composer_autoload_files'\]",
+					"\$GLOBALS['__composer_autoload_files_{$underscore_prefix}']",
+					$contents
+				);
 			}
 
 			if ( __DIR__ . '/vendor/guzzlehttp/guzzle/src/functions.php' === $file_path ) {