Ensure that all classes and also non-class files are correctly loaded.

sayanm085 · Oct 23, 2019 · 038315e · 038315e
1 parent 2c457d5
commit 038315e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 node_modules
 bower_components
-/vendor
+vendor
 /third-party
 release
 composer.lock

diff --git a/composer.json b/composer.json
@@ -39,11 +39,15 @@
   "scripts": {
     "post-install-cmd": [
       "php-scoper add --output-dir=./third-party --force",
-      "cd third-party && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json"
+      "cd includes && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json",
+      "cd third-party && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json",
+      "cp vendor/composer/autoload_files.php third-party/vendor/composer/autoload_files.php"
     ],
     "post-update-cmd": [
       "php-scoper add --output-dir=./third-party --force",
-      "cd third-party && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json"
+      "cd includes && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json",
+      "cd third-party && echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > composer.json && composer dump-autoload --classmap-authoritative --no-interaction && rm composer.json",
+      "cp vendor/composer/autoload_files.php third-party/vendor/composer/autoload_files.php"
     ],
     "lint": "vendor/bin/phpcs",
     "lint-fix": "vendor/bin/phpcbf"

diff --git a/includes/loader.php b/includes/loader.php
@@ -14,8 +14,28 @@
 define( 'GOOGLESITEKIT_PLUGIN_BASENAME', plugin_basename( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
 define( 'GOOGLESITEKIT_PLUGIN_DIR_PATH', plugin_dir_path( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
 
-// Autoload vendor files.
-require_once GOOGLESITEKIT_PLUGIN_DIR_PATH . 'vendor/autoload.php';
+// Autoload files.
+require_once GOOGLESITEKIT_PLUGIN_DIR_PATH . 'includes/vendor/autoload.php';
+require_once GOOGLESITEKIT_PLUGIN_DIR_PATH . 'third-party/vendor/autoload.php';
+
+/**
+ * Loads vendor files containing functions etc.
+ *
+ * This integrates with the dependency prefixing script. Its autoloader loads all classes, but not the other files.
+ *
+ * @since 1.0.0
+ * @access private
+ */
+function autoload_vendor_files() {
+	$files = require GOOGLESITEKIT_PLUGIN_DIR_PATH . 'third-party/vendor/composer/autoload_files.php';
+	foreach ( $files as $file_identifier => $file ) {
+		$file = str_replace( 'third-party/vendor', 'third-party', $file );
+		if ( file_exists( $file ) ) {
+			require_once $file;
+		}
+	}
+}
+autoload_vendor_files();
 
 // Initialize the plugin.
 Plugin::load( GOOGLESITEKIT_PLUGIN_MAIN_FILE );