Skip to content

Commit 866f7cf

Browse files
authored
Merge pull request #701 from PHPCSStandards/feature/ruleset-tests-fixtures-reorganize
Tests/Ruleset/fixtures: move existing fixtures to subdirectory
2 parents 9f81294 + 80b5656 commit 866f7cf

31 files changed

+84
-84
lines changed

tests/Core/Ruleset/ExplainTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,17 @@ public function testExplainWithDeprecatedSniffs()
187187
$expected = PHP_EOL;
188188
$expected .= 'The ShowSniffDeprecationsTest standard contains 9 sniffs'.PHP_EOL.PHP_EOL;
189189

190-
$expected .= 'Fixtures (9 sniffs)'.PHP_EOL;
191-
$expected .= '-------------------'.PHP_EOL;
192-
$expected .= ' Fixtures.Deprecated.WithLongReplacement *'.PHP_EOL;
193-
$expected .= ' Fixtures.Deprecated.WithoutReplacement *'.PHP_EOL;
194-
$expected .= ' Fixtures.Deprecated.WithReplacement *'.PHP_EOL;
195-
$expected .= ' Fixtures.Deprecated.WithReplacementContainingLinuxNewlines *'.PHP_EOL;
196-
$expected .= ' Fixtures.Deprecated.WithReplacementContainingNewlines *'.PHP_EOL;
197-
$expected .= ' Fixtures.SetProperty.AllowedAsDeclared'.PHP_EOL;
198-
$expected .= ' Fixtures.SetProperty.AllowedViaMagicMethod'.PHP_EOL;
199-
$expected .= ' Fixtures.SetProperty.AllowedViaStdClass'.PHP_EOL;
200-
$expected .= ' Fixtures.SetProperty.NotAllowedViaAttribute'.PHP_EOL.PHP_EOL;
190+
$expected .= 'TestStandard (9 sniffs)'.PHP_EOL;
191+
$expected .= '-----------------------'.PHP_EOL;
192+
$expected .= ' TestStandard.Deprecated.WithLongReplacement *'.PHP_EOL;
193+
$expected .= ' TestStandard.Deprecated.WithoutReplacement *'.PHP_EOL;
194+
$expected .= ' TestStandard.Deprecated.WithReplacement *'.PHP_EOL;
195+
$expected .= ' TestStandard.Deprecated.WithReplacementContainingLinuxNewlines *'.PHP_EOL;
196+
$expected .= ' TestStandard.Deprecated.WithReplacementContainingNewlines *'.PHP_EOL;
197+
$expected .= ' TestStandard.SetProperty.AllowedAsDeclared'.PHP_EOL;
198+
$expected .= ' TestStandard.SetProperty.AllowedViaMagicMethod'.PHP_EOL;
199+
$expected .= ' TestStandard.SetProperty.AllowedViaStdClass'.PHP_EOL;
200+
$expected .= ' TestStandard.SetProperty.NotAllowedViaAttribute'.PHP_EOL.PHP_EOL;
201201

202202
$expected .= '* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
203203

tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithLongReplacementSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithLongReplacementSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\Deprecated;
8+
namespace Fixtures\TestStandard\Sniffs\Deprecated;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementContainingLinuxNewlinesSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingLinuxNewlinesSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\Deprecated;
8+
namespace Fixtures\TestStandard\Sniffs\Deprecated;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementContainingNewlinesSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementContainingNewlinesSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\Deprecated;
8+
namespace Fixtures\TestStandard\Sniffs\Deprecated;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithReplacementSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\Deprecated;
8+
namespace Fixtures\TestStandard\Sniffs\Deprecated;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithoutReplacementSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/Deprecated/WithoutReplacementSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\Deprecated;
8+
namespace Fixtures\TestStandard\Sniffs\Deprecated;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/EmptyDeprecationVersionSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyDeprecationVersionSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\DeprecatedInvalid;
8+
namespace Fixtures\TestStandard\Sniffs\DeprecatedInvalid;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/EmptyRemovalVersionSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/EmptyRemovalVersionSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\DeprecatedInvalid;
8+
namespace Fixtures\TestStandard\Sniffs\DeprecatedInvalid;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/InvalidDeprecationMessageSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationMessageSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\DeprecatedInvalid;
8+
namespace Fixtures\TestStandard\Sniffs\DeprecatedInvalid;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/InvalidDeprecationVersionSniff.php renamed to tests/Core/Ruleset/Fixtures/TestStandard/Sniffs/DeprecatedInvalid/InvalidDeprecationVersionSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
66
*/
77

8-
namespace Fixtures\Sniffs\DeprecatedInvalid;
8+
namespace Fixtures\TestStandard\Sniffs\DeprecatedInvalid;
99

1010
use PHP_CodeSniffer\Files\File;
1111
use PHP_CodeSniffer\Sniffs\DeprecatedSniff;

0 commit comments

Comments
 (0)