Merge pull request #79 from Automattic/fix-78/properly-reference-phpc…

…sFile Fix 78/properly reference phpcs file
Automattic · Aug 14, 2017 · b5bba7a · b5bba7a
2 parents 19c6afe + e974feb
commit b5bba7a
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/WordPressVIPMinimum/Sniffs/Variables/VariableAnalysisSniff.php b/WordPressVIPMinimum/Sniffs/Variables/VariableAnalysisSniff.php
@@ -379,7 +379,7 @@ function scopeKey($currScope) {
 
     //  Warning: this is an autovivifying get
     function getScopeInfo($currScope, $autoCreate = true) {
-		require_once( __DIR__ . '/VariableAnalysisHelper.php' );
+		require_once( dirname(__FILE__) . '/VariableAnalysisHelper.php' );
         $scopeKey = $this->scopeKey($currScope);
         if (!isset($this->_scopes[$scopeKey])) {
             if (!$autoCreate) {
@@ -391,7 +391,7 @@ function getScopeInfo($currScope, $autoCreate = true) {
     }
 
     function getVariableInfo($varName, $currScope, $autoCreate = true) {
-		require_once( __DIR__ . '/VariableAnalysisHelper.php' );
+		require_once( dirname(__FILE__) . '/VariableAnalysisHelper.php' );
         $scopeInfo = $this->getScopeInfo($currScope, $autoCreate);
         if (!isset($scopeInfo->variables[$varName])) {
             if (!$autoCreate) {
@@ -1443,7 +1443,7 @@ protected function processScopeClose(
     }
 
     function filter_non_whitespace_tokens($argumentPtr) {
-        $tokens = $phpcsFile->getTokens();
+        $tokens = $this->currentFile->getTokens();
         return $tokens[$argumentPtr]['code'] !== T_WHITESPACE;
     }
 }//end class

diff --git a/WordPressVIPMinimum/Tests/Variables/VariableAnalysisUnitTest.inc b/WordPressVIPMinimum/Tests/Variables/VariableAnalysisUnitTest.inc
@@ -0,0 +1,6 @@
+<?php
+
+function foo() {
+	$a = 'Hello';
+	$c = compact( $a, $b );
+}
diff --git a/WordPressVIPMinimum/Tests/Variables/VariableAnalysisUnitTest.php b/WordPressVIPMinimum/Tests/Variables/VariableAnalysisUnitTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Unit test class for WordPressVIPMinimum Coding Standard.
+ *
+ * @package VIPCS\WordPressVIPMinimum
+ */
+
+/**
+ * Unit test class for the Variable Analysis sniff.
+ *
+ * @package VIPCS\WordPressVIPMinimum
+ */
+class WordPressVIPMinimum_Tests_Variables_VariableAnalysisUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array();
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array(
+			5 => 2,
+		);
+
+	}
+
+} // End class.