Autoload: bug fix

Composer project based install wasn't sufficiently supported. This small change fixes that. Fixes 184
WPTT · Oct 21, 2018 · 34b6451 · 34b6451
1 parent 50ba5f7
commit 34b6451
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/autoload.php b/autoload.php
@@ -23,12 +23,16 @@
  * Load the WPCS autoload file.
  */
 // Get the WPCS dir from an environment variable.
-$wpcsDir          = getenv( 'WPCS_DIR' );
-$composerWPCSPath = $projectRoot . 'vendor' . $ds . 'wp-coding-standards' . $ds . 'wpcs';
+$wpcsDir                 = getenv( 'WPCS_DIR' );
+$composerWPCSPath        = $projectRoot . 'vendor' . $ds . 'wp-coding-standards' . $ds . 'wpcs';
+$composerWPCSPathProject = $projectRoot . '..' . $ds . '..' . $ds . 'wp-coding-standards' . $ds . 'wpcs';
 
 if ( false === $wpcsDir && is_dir( $composerWPCSPath ) ) {
 	// WPCS installed via Composer.
 	$wpcsDir = $composerWPCSPath;
+} elseif ( false === $wpcsDir && is_dir( $composerWPCSPathProject ) ) {
+	// TRTCS + WPCS installed via Composer.
+	$wpcsDir = $composerWPCSPathProject;
 } elseif ( false !== $wpcsDir ) {
 	/*
 	 * WPCS in a custom directory [1].
@@ -66,4 +70,4 @@
 }
 
 // Clean up.
-unset( $ds, $projectRoot, $wpcsDir, $composerWPCSPath, $wpcsPath );
+unset( $ds, $projectRoot, $wpcsDir, $composerWPCSPath, $composerWPCSPathProject, $wpcsPath );