merge master

woocommerce · Feb 25, 2020 · 76a3475 · 76a3475
2 parents f06310f + 04eb262
commit 76a3475
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 181 deletions.
diff --git a/action-scheduler.php b/action-scheduler.php
@@ -40,14 +40,7 @@ function action_scheduler_register_3_dot_1_dot_1() {
 	}
 
 	function action_scheduler_initialize_3_dot_1_dot_1() {
-		$autoloader = __DIR__ . '/vendor/autoload.php';
-		if ( is_readable( $autoloader ) ) {
-			require_once( $autoloader );
-			define( 'AS_COMPOSER_AUTOLOADING', true );
-		} else {
-			define( 'AS_COMPOSER_AUTOLOADING', false );
-			require_once( 'classes/abstracts/ActionScheduler.php' );
-		}
+		require_once( 'classes/abstracts/ActionScheduler.php' );
 		ActionScheduler::init( __FILE__ );
 	}
 

diff --git a/classes/ActionScheduler_wcSystemStatus.php b/classes/ActionScheduler_wcSystemStatus.php
@@ -93,7 +93,6 @@ protected function get_action_status_date( $status, $date_type = 'oldest' ) {
 	 */
 	protected function get_template( $status_labels, $action_counts, $oldest_and_newest ) {
 		$as_version = ActionScheduler_Versions::instance()->latest_version();
-		$autoloader = AS_COMPOSER_AUTOLOADING ? __( 'Composer', 'action-scheduler' ) : __( 'Internal', 'action-scheduler' );
 		?>
 
 		<table class="wc_status_table widefat" cellspacing="0">
@@ -105,10 +104,6 @@ protected function get_template( $status_labels, $action_counts, $oldest_and_new
 					<td colspan="2" data-export-label="Version"><?php esc_html_e( 'Version:', 'action-scheduler' ); ?></td>
 					<td colspan="3"><?php echo esc_html( $as_version ); ?></td>
 				</tr>
-				<tr>
-					<td colspan="2" data-export-label="Version"><?php esc_html_e( 'Autoloader:', 'action-scheduler' ); ?></td>
-					<td colspan="3"><?php echo esc_html( $autoloader ); ?></td>
-				</tr>
 				<tr>
 					<td><strong><?php esc_html_e( 'Action Status', 'action-scheduler' ); ?></strong></td>
 					<td class="help">&nbsp;</td>

diff --git a/classes/abstracts/ActionScheduler.php b/classes/abstracts/ActionScheduler.php
@@ -130,9 +130,7 @@ public static function autoload( $class ) {
 	 */
 	public static function init( $plugin_file ) {
 		self::$plugin_file = $plugin_file;
-		if ( ! AS_COMPOSER_AUTOLOADING ) {
-			spl_autoload_register( array( __CLASS__, 'autoload' ) );
-		}
+		spl_autoload_register( array( __CLASS__, 'autoload' ) );
 
 		/**
 		 * Fires in the early stages of Action Scheduler init hook.

diff --git a/composer.json b/composer.json
@@ -32,12 +32,5 @@
       "phpcs": "Analyze code against the WordPress coding standards with PHP_CodeSniffer",
       "phpcbf": "Fix coding standards warnings/errors automatically with PHP Code Beautifier"
     }
-  },
-  "autoload": {
-    "classmap": [
-      "classes/",
-      "deprecated/",
-      "lib/"
-    ]
   }
 }