Cleanup how we autoload things. Rely on composer only instead of having a fallback to our own autoloader. Remove some code that we don't need

Author: dkotter

autoload.php

@@ -77,27 +77,14 @@ function classifai_define( $name, $value ) {
 require_once __DIR__ . '/config.php';
 
 /**
- * Loads the CLASSIFAI PHP autoloader if possible.
+ * Loads the autoloader if possible.
  *
  * @return bool True or false if autoloading was successful.
  */
 function classifai_autoload() {
-	if ( classifai_can_autoload() ) {
-		require_once classifai_autoloader();
-
-		return true;
-	} else {
-		return false;
-	}
-}
+	if ( file_exists( CLASSIFAI_PLUGIN_DIR . '/vendor/autoload.php' ) ) {
+		require_once CLASSIFAI_PLUGIN_DIR . '/vendor/autoload.php';
 
-/**
- * In server mode we can autoload if autoloader file exists. For
- * test environments we prevent autoloading of the plugin to prevent
- * global pollution and for better performance.
- */
-function classifai_can_autoload() {
-	if ( file_exists( classifai_autoloader() ) ) {
 		return true;
 	} else {
 		error_log( // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
@@ -108,32 +95,19 @@ function classifai_can_autoload() {
 	}
 }
 
-/**
- * Default is Composer's autoloader
- */
-function classifai_autoloader() {
-	if ( file_exists( CLASSIFAI_PLUGIN_DIR . '/vendor/autoload.php' ) ) {
-		return CLASSIFAI_PLUGIN_DIR . '/vendor/autoload.php';
-	} else {
-		return CLASSIFAI_PLUGIN_DIR . '/autoload.php';
-	}
-}
-
 /**
  * Gets the installation message error.
  *
- * This was put in a function specifically because it's used both in WP-CLI and within an admin notice if not using
- * WP-CLI.
+ * Used both in a WP-CLI context and within an admin notice.
  *
  * @return string
  */
 function get_error_install_message() {
-	return esc_html__( 'Error: Please run $ composer install in the classifai plugin directory.', 'classifai' );
+	return esc_html__( 'Error: Please run $ composer install in the ClassifAI plugin directory.', 'classifai' );
 }
 
 /**
- * Plugin code entry point. Singleton instance is used to maintain a common single
- * instance of the plugin throughout the current request's lifecycle.
+ * Plugin code entry point.
  *
  * If autoloading failed an admin notice is shown and logged to
  * the PHP error_log.
@@ -159,7 +133,6 @@ function classifai_autorun() {
 	}
 }
 
-
 /**
  * Generate a notice if autoload fails.
  */
@@ -168,9 +141,8 @@ function classifai_autoload_notice() {
 	error_log( get_error_install_message() ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
 }
 
-
 /**
- * Register an activation hook that we can hook into.
+ * Run functionality on plugin activation.
  */
 function classifai_activation() {
 	set_transient( 'classifai_activation_notice', 'classifai', HOUR_IN_SECONDS );