Skip to content

Commit

Permalink
minor #4766 Remove false test skip (SpacePossum)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.15 branch.

Discussion
----------

Remove false test skip

Commits
-------

3b36d34 Remove false test skip
  • Loading branch information
SpacePossum committed Jan 29, 2020
2 parents d204d72 + 3b36d34 commit a8385e5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function getDefinition()
/**
* {@inheritdoc}
*
* Must run before MultilineWhitespaceBeforeSemicolonsFixer, NoSpacesInsideParenthesisFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer.
* Must run before MultilineWhitespaceBeforeSemicolonsFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer, NoSpacesInsideParenthesisFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer.
*/
public function getPriority()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function getDefinition()
/**
* {@inheritdoc}
*
* Must run after FunctionToConstantFixer, NoEmptyStatementFixer, SingleImportPerStatementFixer.
* Must run after CombineConsecutiveIssetsFixer, FunctionToConstantFixer, NoEmptyStatementFixer, SingleImportPerStatementFixer.
*/
public function getPriority()
{
Expand Down
7 changes: 1 addition & 6 deletions tests/AutoReview/FixerFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public function provideFixersPriorityCases()
[$fixers['class_attributes_separation'], $fixers['indentation_type']],
[$fixers['class_keyword_remove'], $fixers['no_unused_imports']],
[$fixers['combine_consecutive_issets'], $fixers['multiline_whitespace_before_semicolons']],
[$fixers['combine_consecutive_issets'], $fixers['no_singleline_whitespace_before_semicolons']],
[$fixers['combine_consecutive_issets'], $fixers['no_spaces_inside_parenthesis']],
[$fixers['combine_consecutive_issets'], $fixers['no_trailing_whitespace']],
[$fixers['combine_consecutive_issets'], $fixers['no_whitespace_in_blank_line']],
Expand Down Expand Up @@ -399,12 +400,6 @@ public function testPriorityIntegrationTestFilesAreListedPriorityCases($fileName
static::markTestIncomplete(sprintf('Case "%s" has unexpected name, please help fixing it.', $fileName));
}

if (\in_array($fileName, [
'combine_consecutive_issets,no_singleline_whitespace_before_semicolons.test',
], true)) {
static::markTestIncomplete(sprintf('Case "%s" is not fully handled, please help fixing it.', $fileName));
}

static::assertSame(
1,
preg_match('#^([a-z][a-z0-9_]*),([a-z][a-z_]*)(?:_\d{1,3})?\.test(-(in|out)\.php)?$#', $fileName, $matches),
Expand Down

0 comments on commit a8385e5

Please sign in to comment.