Merge pull request #31 from humanmade/update-phpcs

Update phpcs to v3

Author: rmccue

HM/Sniffs/Classes/OnlyClassInFileSniff.php

@@ -2,14 +2,13 @@
 
 namespace HM\Sniffs\Classes;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
-use PHP_CodeSniffer_Tokens;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Sniff to check classes are by themselves.
  */
-class OnlyClassInFileSniff implements PHP_CodeSniffer_Sniff {
+class OnlyClassInFileSniff implements Sniff {
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -28,7 +27,7 @@ public function register() {
 	 *
 	 * @return void
 	 */
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$error = 'Files should only contain a single class, and no other declarations. First class was defined on line %s, and a %s was found on line %s.';
 
 		$tokens = $phpcsFile->getTokens();

HM/Sniffs/Debug/ESLintSniff.php

@@ -2,14 +2,14 @@
 
 namespace HM\Sniffs\Debug;
 
-use PHP_CodeSniffer;
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Run ESLint on the file.
  */
-class ESLintSniff implements PHP_CodeSniffer_Sniff {
+class ESLintSniff implements Sniff {
 	/**
 	 * Path to default configuration.
 	 */
@@ -41,16 +41,16 @@ public function register() {
 	/**
 	 * Processes the tokens that this sniff is interested in.
 	 *
-	 * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
-	 * @param int                  $stackPtr  The position in the stack where
+	 * @param File $phpcsFile The file where the token was found.
+	 * @param int  $stackPtr  The position in the stack where
 	 *                                        the token was found.
 	 *
 	 * @return void
 	 * @throws PHP_CodeSniffer_Exception If jslint.js could not be run
 	 */
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$filename = $phpcsFile->getFilename();
-		$eslint_path = PHP_CodeSniffer::getConfigData( 'eslint_path' );
+		$eslint_path = Config::getConfigData( 'eslint_path' );
 		if ( $eslint_path === null ) {
 			return;
 		}

HM/Sniffs/Files/ClassFileNameSniff.php

@@ -1,13 +1,13 @@
 <?php
 namespace HM\Sniffs\Files;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Filenames with classes must start with class- and be the class name.
  */
-class ClassFileNameSniff implements PHP_CodeSniffer_Sniff {
+class ClassFileNameSniff implements Sniff {
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -20,13 +20,13 @@ public function register() {
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-	 * @param int                  $stackPtr  The position of the current token in the
-	 *                                        stack passed in $tokens.
+	 * @param File $phpcsFile The file being scanned.
+	 * @param int  $stackPtr  The position of the current token in the
+	 *                        stack passed in $tokens.
 	 *
 	 * @return int
 	 */
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 		$namespace_ptr = $phpcsFile->findNext(T_NAMESPACE, 0);
 		if ( ! $namespace_ptr ) {

HM/Sniffs/Files/FunctionFileNameSniff.php

@@ -1,18 +1,18 @@
 <?php
 namespace HM\Sniffs\Files;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Sniff to check for namespaced functions are in `namespace.php`.
  */
-class FunctionFileNameSniff implements PHP_CodeSniffer_Sniff {
+class FunctionFileNameSniff implements Sniff {
 	public function register() {
 		return array( T_FUNCTION );
 	}
 
-	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 		if ( $tokens[ $stackPtr ]['level'] !== 0 ) {
 			// Ignore methods.

HM/Sniffs/Files/NamespaceDirectoryNameSniff.php

@@ -1,13 +1,13 @@
 <?php
 namespace HM\Sniffs\Files;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Namespaced things must be in directories matching the namespace.
  */
-class NamespaceDirectoryNameSniff implements PHP_CodeSniffer_Sniff {
+class NamespaceDirectoryNameSniff implements Sniff {
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -20,13 +20,13 @@ public function register() {
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-	 * @param int                  $stackPtr  The position of the current token in the
-	 *                                        stack passed in $tokens.
+	 * @param File $phpcsFile The file being scanned.
+	 * @param int  $stackPtr  The position of the current token in the
+	 *                        stack passed in $tokens.
 	 *
 	 * @return int
 	 */
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 		$namespace = '';
 

HM/Sniffs/Functions/NamespacedFunctionsSniff.php

@@ -1,18 +1,18 @@
 <?php
 namespace HM\Sniffs\Functions;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Sniff to check for namespaces for functions.
  */
-class NamespacedFunctionsSniff implements PHP_CodeSniffer_Sniff {
+class NamespacedFunctionsSniff implements Sniff {
 	public function register() {
 		return array( T_FUNCTION );
 	}
 
-	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 		if (isset($tokens[$stackPtr]['scope_closer']) === false) {
 			return;

HM/Sniffs/Layout/OrderSniff.php

@@ -1,18 +1,18 @@
 <?php
 namespace HM\Sniffs\Layout;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Sniff to check order of declarations (namespace, use, const, code).
  */
-class OrderSniff implements PHP_CodeSniffer_Sniff {
+class OrderSniff implements Sniff {
 	public function register() {
 		return array( T_OPEN_TAG );
 	}
 
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
 		// Things we can look for:

HM/Sniffs/Namespaces/NoLeadingSlashOnUseSniff.php

@@ -1,18 +1,18 @@
 <?php
 namespace HM\Sniffs\Namespaces;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Sniff to check `use` class isn't prefixed with `\`
  */
-class NoLeadingSlashOnUseSniff implements PHP_CodeSniffer_Sniff {
+class NoLeadingSlashOnUseSniff implements Sniff {
 	public function register() {
 		return array( T_USE );
 	}
 
-	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
+	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 		$look_for = [ T_STRING, T_NS_SEPARATOR ];
 		$next = $phpcsFile->findNext( $look_for, $stackPtr );

composer.json

@@ -5,6 +5,7 @@
 	"license": "GPL-2.0",
 	"require": {
 		"wp-coding-standards/wpcs": "^0.13.1",
-		"fig-r/psr2r-sniffer": "^0.4.1"
+		"fig-r/psr2r-sniffer": "dev-master",
+		"squizlabs/php_codesniffer": "^3.1"
 	}
 }