Merge pull request #1090 from WordPress-Coding-Standards/hotfix/issue…

…-1087

Hotfix: temporary plaster to fix issue 1087

.github/CONTRIBUTING.md

@@ -100,6 +100,10 @@ The easiest way to do this is to add a `phpunit.xml` file to the root of your WP
 
 The WordPress Coding Standards are compatible with both PHPCS 2.x as well as 3.x. This has some implications for running the unit tests.
 
+* Make sure you have registered the directory in which you installed WPCS with PHPCS using;
+    ```sh
+    phpcs --config-set installed_path path/to/WPCS
+    ```
 * Navigate to the directory in which you installed WPCS.
 * To run the unit tests with PHPCS 3.x:
     ```sh

CHANGELOG.md

@@ -8,6 +8,11 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 
 _Nothing yet._
 
+## [0.13.1] - 2017-08-07
+
+### Fixed
+- Fatal error when using PHPCS 3.x with the `installed_paths` config variable set via the ruleset.
+
 ## [0.13.0] - 2017-08-03
 
 ### Added
@@ -458,6 +463,7 @@ See the comparison for full list.
 Initial tagged release.
 
 [Unreleased]: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/compare/master...HEAD
+[0.13.1]: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/compare/0.13.0...0.13.1
 [0.13.0]: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/compare/0.12.0...0.13.0
 [0.12.0]: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/compare/0.11.0...0.12.0
 [0.11.0]: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/compare/0.10.0...0.11.0

Test/phpcs3-bootstrap.php

@@ -51,29 +51,3 @@
 // Load our class aliases.
 include_once dirname( __DIR__ ) . $ds . 'WordPress' . $ds . 'PHPCSAliases.php';
 unset( $ds, $phpcsDir );
-
-/*
- * Register our own autoloader for the WPCS abstract classes & the helper class.
- *
- * This can be removed once the minimum required version of WPCS for the
- * PHPCS 3.x branch has gone up to 3.1.0 (unreleased as of yet).
- *
- * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/1564
- */
-spl_autoload_register( function ( $class ) {
-	// Only try & load our own classes.
-	if ( stripos( $class, 'WordPress' ) !== 0 ) {
-		return;
-	}
-
-	// PHPCS handles the Test and Sniff classes without problem.
-	if ( stripos( $class, '\Tests\\' ) !== false || stripos( $class, '\Sniffs\\' ) !== false ) {
-		return;
-	}
-
-	$file = dirname( __DIR__ ) . DIRECTORY_SEPARATOR . strtr( $class, '\\', DIRECTORY_SEPARATOR ) . '.php';
-
-	if ( file_exists( $file ) ) {
-		include_once $file;
-	}
-} );

WordPress/PHPCSAliases.php

@@ -47,4 +47,32 @@ class_alias( 'PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\OperatorSpacingS
 	}
 
 	define( 'WPCS_PHPCS_ALIASES_SET', true );
+
+	/*
+	 * Register our own autoloader for the WPCS abstract classes & the helper class.
+	 *
+	 * This can be removed once the minimum required version of WPCS for the
+	 * PHPCS 3.x branch has gone up to 3.1.0 (unreleased as of yet) or
+	 * whichever version contains the fix for upstream #1591.
+	 *
+	 * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/1564
+	 * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/1591
+	 */
+	spl_autoload_register( function ( $class ) {
+		// Only try & load our own classes.
+		if ( stripos( $class, 'WordPress' ) !== 0 ) {
+			return;
+		}
+
+		// PHPCS handles the Test and Sniff classes without problem.
+		if ( stripos( $class, '\Tests\\' ) !== false || stripos( $class, '\Sniffs\\' ) !== false ) {
+			return;
+		}
+
+		$file = dirname( __DIR__ ) . DIRECTORY_SEPARATOR . strtr( $class, '\\', DIRECTORY_SEPARATOR ) . '.php';
+
+		if ( file_exists( $file ) ) {
+			include_once $file;
+		}
+	} );
 }