From 050656b9f6f3eb32f5c3c8bdc8426ea4b92a217a Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sat, 18 Jan 2020 01:26:58 +0100 Subject: [PATCH] Tests: simplify the PHPCS setup method [1] - Remove the `$sniffFiles` parameter which doesn't change between calls to the method anyway and replace it with a class constant and a call to `realpath()` within the function. - Remove the `getSniffFiles()` method which is now no longer needed. - Adjust all calls to the `prepareLocalFileForSniffs()` method to remove the parameter. --- VariableAnalysis/Tests/BaseTestCase.php | 21 ++-- .../CodeAnalysis/VariableAnalysisTest.php | 108 +++++++++--------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/VariableAnalysis/Tests/BaseTestCase.php b/VariableAnalysis/Tests/BaseTestCase.php index 63d0985f..afadab20 100644 --- a/VariableAnalysis/Tests/BaseTestCase.php +++ b/VariableAnalysis/Tests/BaseTestCase.php @@ -7,12 +7,17 @@ use PHP_CodeSniffer\Config; class BaseTestCase extends TestCase { - public function prepareLocalFileForSniffs($sniffFiles, $fixtureFile) { - $config = new Config(['--standard=VariableAnalysis']); - $ruleset = new Ruleset($config); - if (! is_array($sniffFiles)) { - $sniffFiles = [$sniffFiles]; - } + const STANDARD_NAME = 'VariableAnalysis'; + const SNIFF_FILE = __DIR__ . '/../Sniffs/CodeAnalysis/VariableAnalysisSniff.php'; + + public function prepareLocalFileForSniffs($fixtureFile) { + $config = new Config(); + $config->cache = false; + $config->standards = [self::STANDARD_NAME]; + $config->ignored = []; + + $sniffFiles = [realpath(self::SNIFF_FILE)]; + $ruleset = new Ruleset($config); $ruleset->registerSniffs($sniffFiles, [], []); $ruleset->populateTokenListeners(); if (! file_exists($fixtureFile)) { @@ -35,10 +40,6 @@ public function getErrorLineNumbersFromFile(LocalFile $phpcsFile) { return $this->getLineNumbersFromMessages($phpcsFile->getErrors()); } - public function getSniffFiles() { - return [realpath(__DIR__ . '/../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php')]; - } - public function getFixture($fixtureFilename) { return realpath(__DIR__ . '/CodeAnalysis/fixtures/' . $fixtureFilename); } diff --git a/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php b/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php index a674d112..5ac9bb5f 100644 --- a/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php +++ b/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php @@ -6,7 +6,7 @@ class VariableAnalysisTest extends BaseTestCase { public function testFunctionWithoutParamsErrors() { $fixtureFile = $this->getFixture('FunctionWithoutParamFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -15,7 +15,7 @@ public function testFunctionWithoutParamsErrors() { public function testFunctionWithoutParamsWarnings() { $fixtureFile = $this->getFixture('FunctionWithoutParamFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -37,7 +37,7 @@ public function testFunctionWithoutParamsWarnings() { public function testFunctionWithUseReferenceWarnings() { $fixtureFile = $this->getFixture('FunctionWithUseReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -46,7 +46,7 @@ public function testFunctionWithUseReferenceWarnings() { public function testFunctionWithDefaultParamErrors() { $fixtureFile = $this->getFixture('FunctionWithDefaultParamFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -60,7 +60,7 @@ public function testFunctionWithDefaultParamErrors() { public function testFunctionWithDefaultParamWarnings() { $fixtureFile = $this->getFixture('FunctionWithDefaultParamFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -77,7 +77,7 @@ public function testFunctionWithDefaultParamWarnings() { public function testFunctionWithGlobalVarErrors() { $fixtureFile = $this->getFixture('FunctionWithGlobalVarFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -86,7 +86,7 @@ public function testFunctionWithGlobalVarErrors() { public function testFunctionWithGlobalVarWarnings() { $fixtureFile = $this->getFixture('FunctionWithGlobalVarFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -103,7 +103,7 @@ public function testFunctionWithGlobalVarWarnings() { public function testFunctionWithForeachErrors() { $fixtureFile = $this->getFixture('FunctionWithForeachFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -112,7 +112,7 @@ public function testFunctionWithForeachErrors() { public function testFunctionWithForeachWarnings() { $fixtureFile = $this->getFixture('FunctionWithForeachFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -134,7 +134,7 @@ public function testFunctionWithForeachWarnings() { public function testClassWithMembersErrors() { $fixtureFile = $this->getFixture('ClassWithMembersFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -143,7 +143,7 @@ public function testClassWithMembersErrors() { public function testTraitWithMembersWarnings() { $fixtureFile = $this->getFixture('TraitWithMembersFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedErrors = [ @@ -165,7 +165,7 @@ public function testTraitWithMembersWarnings() { public function testClassWithMembersWarnings() { $fixtureFile = $this->getFixture('ClassWithMembersFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -187,7 +187,7 @@ public function testClassWithMembersWarnings() { public function testFunctionsOutsideClassErrors() { $fixtureFile = $this->getFixture('FunctionsOutsideClassFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -196,7 +196,7 @@ public function testFunctionsOutsideClassErrors() { public function testFunctionsOutsideClassWarnings() { $fixtureFile = $this->getFixture('FunctionsOutsideClassFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -207,7 +207,7 @@ public function testFunctionsOutsideClassWarnings() { public function testFunctionWithClosureErrors() { $fixtureFile = $this->getFixture('FunctionWithClosureFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -224,7 +224,7 @@ public function testFunctionWithClosureErrors() { public function testFunctionWithClosureWarnings() { $fixtureFile = $this->getFixture('FunctionWithClosureFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -253,7 +253,7 @@ public function testFunctionWithClosureWarnings() { public function testFunctionWithReferenceErrors() { $fixtureFile = $this->getFixture('FunctionWithReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -262,7 +262,7 @@ public function testFunctionWithReferenceErrors() { public function testFunctionWithReferenceWarnings() { $fixtureFile = $this->getFixture('FunctionWithReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -285,7 +285,7 @@ public function testFunctionWithReferenceWarnings() { public function testFunctionWithReferenceWarningsAllowsCustomFunctions() { $fixtureFile = $this->getFixture('FunctionWithReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'sitePassByRefFunctions', @@ -311,7 +311,7 @@ public function testFunctionWithReferenceWarningsAllowsCustomFunctions() { public function testFunctionWithReferenceWarningsAllowsWordPressFunctionsIfSet() { $fixtureFile = $this->getFixture('FunctionWithReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowWordPressPassByRefFunctions', @@ -338,7 +338,7 @@ public function testFunctionWithReferenceWarningsAllowsWordPressFunctionsIfSet() public function testFunctionWithTryCatchErrors() { $fixtureFile = $this->getFixture('FunctionWithTryCatchFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -347,7 +347,7 @@ public function testFunctionWithTryCatchErrors() { public function testFunctionWithTryCatchWarnings() { $fixtureFile = $this->getFixture('FunctionWithTryCatchFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -359,7 +359,7 @@ public function testFunctionWithTryCatchWarnings() { public function testFunctionWithInlineAssignErrors() { $fixtureFile = $this->getFixture('FunctionWithInlineAssignFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -368,7 +368,7 @@ public function testFunctionWithInlineAssignErrors() { public function testFunctionWithInlineAssignWarnings() { $fixtureFile = $this->getFixture('FunctionWithInlineAssignFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -380,7 +380,7 @@ public function testFunctionWithInlineAssignWarnings() { public function testFunctionWithRedeclarationsErrors() { $fixtureFile = $this->getFixture('FunctionWithRedeclarationsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -389,7 +389,7 @@ public function testFunctionWithRedeclarationsErrors() { public function testFunctionWithRedeclarationsWarnings() { $fixtureFile = $this->getFixture('FunctionWithRedeclarationsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -412,7 +412,7 @@ public function testFunctionWithRedeclarationsWarnings() { public function testHeredocErrors() { $fixtureFile = $this->getFixture('HeredocFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -421,7 +421,7 @@ public function testHeredocErrors() { public function testHeredocWarnings() { $fixtureFile = $this->getFixture('HeredocFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -435,7 +435,7 @@ public function testHeredocWarnings() { public function testClassReferenceErrors() { $fixtureFile = $this->getFixture('ClassReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getErrorLineNumbersFromFile($phpcsFile); $expectedErrors = []; @@ -444,7 +444,7 @@ public function testClassReferenceErrors() { public function testClassReferenceWarnings() { $fixtureFile = $this->getFixture('ClassReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -462,7 +462,7 @@ public function testClassReferenceWarnings() { public function testCompactErrors() { $fixtureFile = $this->getFixture('CompactFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -476,7 +476,7 @@ public function testCompactErrors() { public function testCompactWarnings() { $fixtureFile = $this->getFixture('CompactFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -498,7 +498,7 @@ public function testCompactWarnings() { public function testTraitAllowsThis() { $fixtureFile = $this->getFixture('TraitFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = []; @@ -510,7 +510,7 @@ public function testTraitAllowsThis() { public function testAnonymousClassAllowsThis() { $fixtureFile = $this->getFixture('AnonymousClassFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = []; @@ -522,7 +522,7 @@ public function testAnonymousClassAllowsThis() { public function testVariableFunctionCallsCountAsUsage() { $fixtureFile = $this->getFixture('FunctionWithVariableCallFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -539,7 +539,7 @@ public function testVariableFunctionCallsCountAsUsage() { public function testVariableVariables() { $fixtureFile = $this->getFixture('VariableVariablesFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -563,7 +563,7 @@ public function testVariableVariables() { public function testTraitsAllowPropertyDefinitions() { $fixtureFile = $this->getFixture('TraitWithPropertiesFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = []; @@ -575,7 +575,7 @@ public function testTraitsAllowPropertyDefinitions() { public function testAnonymousClassAllowPropertyDefinitions() { $fixtureFile = $this->getFixture('AnonymousClassWithPropertiesFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -590,7 +590,7 @@ public function testAnonymousClassAllowPropertyDefinitions() { public function testUnusedParamsAreReported() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -611,7 +611,7 @@ public function testUnusedParamsAreReported() { public function testValidUnusedVariableNamesIgnoresUnusedVariables() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -636,7 +636,7 @@ public function testValidUnusedVariableNamesIgnoresUnusedVariables() { public function testAllowUnusedFunctionParametersIgnoresUnusedVariables() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -655,7 +655,7 @@ public function testAllowUnusedFunctionParametersIgnoresUnusedVariables() { public function testAllowUnusedCaughtExceptionsIgnoresUnusedVariablesIfSet() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -681,7 +681,7 @@ public function testAllowUnusedCaughtExceptionsIgnoresUnusedVariablesIfSet() { public function testAllowUnusedCaughtExceptionsDoesNotIgnoreUnusedVariablesIfFalse() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -708,7 +708,7 @@ public function testAllowUnusedCaughtExceptionsDoesNotIgnoreUnusedVariablesIfFal public function testIgnoreUnusedRegexpIgnoresUnusedVariables() { $fixtureFile = $this->getFixture('FunctionWithUnusedParamsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -733,7 +733,7 @@ public function testIgnoreUnusedRegexpIgnoresUnusedVariables() { public function testAllowDestructuringAssignment() { $fixtureFile = $this->getFixture('DestructuringFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -745,7 +745,7 @@ public function testAllowDestructuringAssignment() { public function testValidUndefinedVariableNamesIgnoresVarsInGlobalScope() { $fixtureFile = $this->getFixture('FunctionWithGlobalVarFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'validUndefinedVariableNames', @@ -764,7 +764,7 @@ public function testValidUndefinedVariableNamesIgnoresVarsInGlobalScope() { public function testValidUndefinedVariableNamesIgnoresUndefinedProperties() { $fixtureFile = $this->getFixture('ClassReferenceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'validUndefinedVariableNames', @@ -785,7 +785,7 @@ public function testValidUndefinedVariableNamesIgnoresUndefinedProperties() { public function testUnusedArgumentsBeforeUsedArgumentsAreFoundIfFalse() { $fixtureFile = $this->getFixture('UnusedAfterUsedFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedParametersBeforeUsed', @@ -804,7 +804,7 @@ public function testUnusedArgumentsBeforeUsedArgumentsAreFoundIfFalse() { public function testUnusedArgumentsBeforeUsedArgumentsAreIgnoredByDefault() { $fixtureFile = $this->getFixture('UnusedAfterUsedFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -816,7 +816,7 @@ public function testUnusedArgumentsBeforeUsedArgumentsAreIgnoredByDefault() { public function testPregReplaceIgnoresNumericVariables() { $fixtureFile = $this->getFixture('PregReplaceFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -828,7 +828,7 @@ public function testPregReplaceIgnoresNumericVariables() { public function testUnusedForeachVariablesAreIgnoredByDefault() { $fixtureFile = $this->getFixture('UnusedForeachFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [ @@ -846,7 +846,7 @@ public function testUnusedForeachVariablesAreIgnoredByDefault() { public function testUnusedForeachVariablesAreNotIgnoredIfDisabled() { $fixtureFile = $this->getFixture('UnusedForeachFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedForeachVariables', @@ -873,7 +873,7 @@ public function testUnusedForeachVariablesAreNotIgnoredIfDisabled() { public function testUnusedForeachVariablesAreIgnoredIfSet() { $fixtureFile = $this->getFixture('UnusedForeachFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->ruleset->setSniffProperty( 'VariableAnalysis\Sniffs\CodeAnalysis\VariableAnalysisSniff', 'allowUnusedForeachVariables', @@ -896,7 +896,7 @@ public function testUnusedForeachVariablesAreIgnoredIfSet() { public function testGetDefinedVarsCountsAsRead() { $fixtureFile = $this->getFixture('GetDefinedVarsFixture.php'); - $phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile); + $phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile); $phpcsFile->process(); $lines = $this->getWarningLineNumbersFromFile($phpcsFile); $expectedWarnings = [