Skip to content

Commit a35a07e

Browse files
jrfnljrfnl
committed
Remove work-arounds which were in place for PHPCS < 3.8.0
1 parent a735113 commit a35a07e

9 files changed

+7
-89
lines changed

‎PHPCSUtils/Tokens/Collections.php‎

Lines changed: 7 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -596,13 +596,7 @@ private static function triggerDeprecation($method, $version, $replacement)
596596
*/
597597
public static function arrayOpenTokensBC()
598598
{
599-
$tokens = self::$arrayOpenTokensBC;
600-
601-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
602-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
603-
}
604-
605-
return $tokens;
599+
return self::$arrayOpenTokensBC;
606600
}
607601

608602
/**
@@ -623,14 +617,7 @@ public static function arrayOpenTokensBC()
623617
*/
624618
public static function arrayTokensBC()
625619
{
626-
$tokens = self::$arrayTokens;
627-
628-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
629-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
630-
$tokens[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
631-
}
632-
633-
return $tokens;
620+
return self::$arrayTokens;
634621
}
635622

636623
/**
@@ -673,13 +660,7 @@ public static function functionCallTokens()
673660
*/
674661
public static function listOpenTokensBC()
675662
{
676-
$tokens = self::$listOpenTokensBC;
677-
678-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
679-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
680-
}
681-
682-
return $tokens;
663+
return self::$listOpenTokensBC;
683664
}
684665

685666
/**
@@ -698,14 +679,7 @@ public static function listOpenTokensBC()
698679
*/
699680
public static function listTokensBC()
700681
{
701-
$tokens = self::$listTokens;
702-
703-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
704-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
705-
$tokens[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
706-
}
707-
708-
return $tokens;
682+
return self::$listTokens;
709683
}
710684

711685
/**
@@ -815,13 +789,7 @@ public static function returnTypeTokens()
815789
*/
816790
public static function shortArrayListOpenTokensBC()
817791
{
818-
$tokens = self::$shortArrayListOpenTokensBC;
819-
820-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
821-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
822-
}
823-
824-
return $tokens;
792+
return self::$shortArrayListOpenTokensBC;
825793
}
826794

827795
/**
@@ -840,14 +808,7 @@ public static function shortArrayListOpenTokensBC()
840808
*/
841809
public static function shortArrayTokensBC()
842810
{
843-
$tokens = self::$shortArrayTokens;
844-
845-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
846-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
847-
$tokens[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
848-
}
849-
850-
return $tokens;
811+
return self::$shortArrayTokens;
851812
}
852813

853814
/**
@@ -866,13 +827,6 @@ public static function shortArrayTokensBC()
866827
*/
867828
public static function shortListTokensBC()
868829
{
869-
$tokens = self::$shortListTokens;
870-
871-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
872-
$tokens[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
873-
$tokens[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
874-
}
875-
876-
return $tokens;
830+
return self::$shortListTokens;
877831
}
878832
}

‎Tests/Tokens/Collections/ArrayOpenTokensBCTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ public function testArrayOpenTokensBC()
3838
\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
3939
];
4040

41-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
42-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
43-
}
44-
4541
$this->assertSame($expected, Collections::arrayOpenTokensBC());
4642
}
4743
}

‎Tests/Tokens/Collections/ArrayTokensBCTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ public function testArrayTokensBC()
3939
\T_CLOSE_SHORT_ARRAY => \T_CLOSE_SHORT_ARRAY,
4040
];
4141

42-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
43-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
44-
$expected[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
45-
}
46-
4742
$this->assertSame($expected, Collections::arrayTokensBC());
4843
}
4944
}

‎Tests/Tokens/Collections/ListOpenTokensBCTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ public function testListOpenTokensBC()
3838
\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
3939
];
4040

41-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
42-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
43-
}
44-
4541
$this->assertSame($expected, Collections::listOpenTokensBC());
4642
}
4743
}

‎Tests/Tokens/Collections/ListTokensBCTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ public function testListTokensBC()
3939
\T_CLOSE_SHORT_ARRAY => \T_CLOSE_SHORT_ARRAY,
4040
];
4141

42-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
43-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
44-
$expected[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
45-
}
46-
4742
$this->assertSame($expected, Collections::listTokensBC());
4843
}
4944
}

‎Tests/Tokens/Collections/ParameterPassingTokensTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ public function testParameterPassingTokens()
4949
\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
5050
];
5151

52-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
53-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
54-
}
55-
5652
$this->assertSame($expected, Collections::parameterPassingTokens());
5753
}
5854
}

‎Tests/Tokens/Collections/ShortArrayListOpenTokensBCTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ public function testShortArrayListOpenTokensBC()
3737
\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
3838
];
3939

40-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
41-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
42-
}
43-
4440
$this->assertSame($expected, Collections::shortArrayListOpenTokensBC());
4541
}
4642
}

‎Tests/Tokens/Collections/ShortArrayTokensBCTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public function testShortArrayTokensBC()
3838
\T_CLOSE_SHORT_ARRAY => \T_CLOSE_SHORT_ARRAY,
3939
];
4040

41-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
42-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
43-
$expected[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
44-
}
45-
4641
$this->assertSame($expected, Collections::shortArrayTokensBC());
4742
}
4843
}

‎Tests/Tokens/Collections/ShortListTokensBCTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public function testShortListTokensBC()
3838
\T_CLOSE_SHORT_ARRAY => \T_CLOSE_SHORT_ARRAY,
3939
];
4040

41-
if (\version_compare(Helper::getVersion(), '3.7.1', '<=')) {
42-
$expected[\T_OPEN_SQUARE_BRACKET] = \T_OPEN_SQUARE_BRACKET;
43-
$expected[\T_CLOSE_SQUARE_BRACKET] = \T_CLOSE_SQUARE_BRACKET;
44-
}
45-
4641
$this->assertSame($expected, Collections::shortListTokensBC());
4742
}
4843
}

0 commit comments

Comments
 (0)