php-scoper & PSR-0 fixes

skaut · May 14, 2021 · 61d7997 · 61d7997
1 parent 46c5129
commit 61d7997
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -58,8 +58,8 @@ gulp.task(
 					)
 					.pipe(
 						replace(
-							"'Google\\\\' => \n",
-							"'Sgdg\\\\Vendor\\\\Google\\\\' => \n"
+							/'(.*)\\\\' => \n/g,
+							"'Sgdg\\\\Vendor\\\\$1\\\\' => \n"
 						)
 					)
 			).pipe( gulp.dest( 'dist/bundled/vendor/composer/' ) );

diff --git a/scoper.inc.php b/scoper.inc.php
@@ -47,6 +47,9 @@
 		static function ( $file_path, $prefix, $contents ) {
 			$regex_prefix = mb_ereg_replace( '\\\\', '\\\\\\\\', $prefix );
 			$replace_prefix = mb_ereg_replace( '\\\\', '\\\\', $prefix );
+			if ( mb_ereg_match( preg_quote( __DIR__, '/' ) . '\\/vendor\\/composer\\/ClassLoader.php', $file_path ) ) {
+				$contents = mb_ereg_replace( "// PSR-0 lookup\n", "// PSR-0 lookup\n        \$scoperPrefix = 'Sgdg\\\\Vendor\\\\';\n        if (substr(\$class, 0, strlen(\$scoperPrefix)) == \$scoperPrefix) {\n            \$class = substr(\$class, strlen(\$scoperPrefix));\n            \$first = \$class[0];\n        }\n", $contents );
+			}
 			if ( mb_ereg_match( preg_quote( __DIR__, '/' ) . '\\/vendor\\/composer\\/autoload_real.php', $file_path ) ) {
 				$contents = mb_ereg_replace( "if \\('Composer\\\\\\\\Autoload\\\\\\\\ClassLoader' === \\\$class\\)", "if ('{$replace_prefix}\\\\Composer\\\\Autoload\\\\ClassLoader' === \$class)", $contents );
 				$contents = mb_ereg_replace( "\\\\spl_autoload_unregister\\(array\\('ComposerAutoloaderInit", "\\spl_autoload_unregister(array('{$replace_prefix}\\\\ComposerAutoloaderInit", $contents );