Skip to content

Commit 281fc7d

Browse files
jrfnljrfnl
committed
Implement use of the new AbstractMethodUnitTest::getTargetToken() method
1 parent abad7a0 commit 281fc7d

File tree

5 files changed

+101
-155
lines changed

5 files changed

+101
-155
lines changed

‎tests/Core/File/FindExtendedClassNameTest.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,8 @@ class FindExtendedClassNameTest extends AbstractMethodUnitTest
2828
*/
2929
public function testFindExtendedClassName($identifier, $expected)
3030
{
31-
$start = (self::$phpcsFile->numTokens - 1);
32-
$delim = self::$phpcsFile->findPrevious(
33-
T_COMMENT,
34-
$start,
35-
null,
36-
false,
37-
$identifier
38-
);
39-
$OOToken = self::$phpcsFile->findNext([T_CLASS, T_ANON_CLASS, T_INTERFACE], ($delim + 1));
40-
41-
$result = self::$phpcsFile->findExtendedClassName($OOToken);
31+
$OOToken = $this->getTargetToken($identifier, [T_CLASS, T_ANON_CLASS, T_INTERFACE]);
32+
$result = self::$phpcsFile->findExtendedClassName($OOToken);
4233
$this->assertSame($expected, $result);
4334

4435
}//end testFindExtendedClassName()

‎tests/Core/File/FindImplementedInterfaceNamesTest.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,8 @@ class FindImplementedInterfaceNamesTest extends AbstractMethodUnitTest
2727
*/
2828
public function testFindImplementedInterfaceNames($identifier, $expected)
2929
{
30-
$start = (self::$phpcsFile->numTokens - 1);
31-
$delim = self::$phpcsFile->findPrevious(
32-
T_COMMENT,
33-
$start,
34-
null,
35-
false,
36-
$identifier
37-
);
38-
$OOToken = self::$phpcsFile->findNext([T_CLASS, T_ANON_CLASS, T_INTERFACE], ($delim + 1));
39-
40-
$result = self::$phpcsFile->findImplementedInterfaceNames($OOToken);
30+
$OOToken = $this->getTargetToken($identifier, [T_CLASS, T_ANON_CLASS, T_INTERFACE]);
31+
$result = self::$phpcsFile->findImplementedInterfaceNames($OOToken);
4132
$this->assertSame($expected, $result);
4233

4334
}//end testFindImplementedInterfaceNames()

‎tests/Core/File/GetMemberPropertiesTest.php

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,8 @@ class GetMemberPropertiesTest extends AbstractMethodUnitTest
2727
*/
2828
public function testGetMemberProperties($identifier, $expected)
2929
{
30-
$start = (self::$phpcsFile->numTokens - 1);
31-
$delim = self::$phpcsFile->findPrevious(
32-
T_COMMENT,
33-
$start,
34-
null,
35-
false,
36-
$identifier
37-
);
38-
$variable = self::$phpcsFile->findNext(T_VARIABLE, ($delim + 1));
39-
40-
$result = self::$phpcsFile->getMemberProperties($variable);
30+
$variable = $this->getTargetToken($identifier, T_VARIABLE);
31+
$result = self::$phpcsFile->getMemberProperties($variable);
4132
unset($result['type_token']);
4233
unset($result['type_end_token']);
4334
$this->assertSame($expected, $result);
@@ -488,17 +479,8 @@ public function dataGetMemberProperties()
488479
*/
489480
public function testNotClassPropertyException($identifier)
490481
{
491-
$start = (self::$phpcsFile->numTokens - 1);
492-
$delim = self::$phpcsFile->findPrevious(
493-
T_COMMENT,
494-
$start,
495-
null,
496-
false,
497-
$identifier
498-
);
499-
$variable = self::$phpcsFile->findNext(T_VARIABLE, ($delim + 1));
500-
501-
$result = self::$phpcsFile->getMemberProperties($variable);
482+
$variable = $this->getTargetToken($identifier, T_VARIABLE);
483+
$result = self::$phpcsFile->getMemberProperties($variable);
502484

503485
}//end testNotClassPropertyException()
504486

@@ -534,16 +516,7 @@ public function dataNotClassProperty()
534516
*/
535517
public function testNotAVariableException()
536518
{
537-
$start = (self::$phpcsFile->numTokens - 1);
538-
$delim = self::$phpcsFile->findPrevious(
539-
T_COMMENT,
540-
$start,
541-
null,
542-
false,
543-
'/* testNotAVariable */'
544-
);
545-
$next = self::$phpcsFile->findNext(T_WHITESPACE, ($delim + 1), null, true);
546-
519+
$next = $this->getTargetToken('/* testNotAVariable */', T_RETURN);
547520
$result = self::$phpcsFile->getMemberProperties($next);
548521

549522
}//end testNotAVariableException()

‎tests/Core/File/IsReferenceTest.inc

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,137 +2,137 @@
22

33
namespace PHP_CodeSniffer\Tests\Core\File;
44

5-
/* bitwiseAndA */
5+
/* testBitwiseAndA */
66
error_reporting( E_NOTICE & E_STRICT );
77

8-
/* bitwiseAndB */
8+
/* testBitwiseAndB */
99
$a = [ $something & $somethingElse ];
1010

11-
/* bitwiseAndC */
11+
/* testBitwiseAndC */
1212
$a = [ $first, $something & self::$somethingElse ];
1313

14-
/* bitwiseAndD */
14+
/* testBitwiseAndD */
1515
$a = array $first, $something & $somethingElse );
1616

17-
/* bitwiseAndE */
17+
/* testBitwiseAndE */
1818
$a = [ 'a' => $first, 'b' => $something & $somethingElse ];
1919

20-
/* bitwiseAndF */
20+
/* testBitwiseAndF */
2121
$a = array( 'a' => $first, 'b' => $something & \MyClass::$somethingElse );
2222

23-
/* bitwiseAndG */
23+
/* testBitwiseAndG */
2424
$a = $something & $somethingElse;
2525

26-
/* bitwiseAndH */
26+
/* testBitwiseAndH */
2727
function myFunction($a = 10 & 20) {}
2828

29-
/* bitwiseAndI */
29+
/* testBitwiseAndI */
3030
$closure = function ($a = MY_CONSTANT & parent::OTHER_CONSTANT) {};
3131

32-
/* functionReturnByReference */
32+
/* testFunctionReturnByReference */
3333
function &myFunction() {}
3434

35-
/* functionPassByReferenceA */
35+
/* testFunctionPassByReferenceA */
3636
function myFunction( &$a ) {}
3737

38-
/* functionPassByReferenceB */
38+
/* testFunctionPassByReferenceB */
3939
function myFunction( $a, &$b ) {}
4040

41-
/* functionPassByReferenceC */
41+
/* testFunctionPassByReferenceC */
4242
$closure = function ( &$a ) {};
4343

44-
/* functionPassByReferenceD */
44+
/* testFunctionPassByReferenceD */
4545
$closure = function ( $a, &$b ) {};
4646

47-
/* functionPassByReferenceE */
47+
/* testFunctionPassByReferenceE */
4848
function myFunction(array &$one) {}
4949

50-
/* functionPassByReferenceF */
50+
/* testFunctionPassByReferenceF */
5151
$closure = function (\MyClass &$one) {};
5252

53-
/* functionPassByReferenceG */
53+
/* testFunctionPassByReferenceG */
5454
$closure = function myFunc($param, &...$moreParams) {};
5555

56-
/* foreachValueByReference */
56+
/* testForeachValueByReference */
5757
foreach( $array as $key => &$value ) {}
5858

59-
/* foreachKeyByReference */
59+
/* testForeachKeyByReference */
6060
foreach( $array as &$key => $value ) {}
6161

62-
/* arrayValueByReferenceA */
62+
/* testArrayValueByReferenceA */
6363
$a = [ 'a' => &$something ];
6464

65-
/* arrayValueByReferenceB */
65+
/* testArrayValueByReferenceB */
6666
$a = [ 'a' => $something, 'b' => &$somethingElse ];
6767

68-
/* arrayValueByReferenceC */
68+
/* testArrayValueByReferenceC */
6969
$a = [ &$something ];
7070

71-
/* arrayValueByReferenceD */
71+
/* testArrayValueByReferenceD */
7272
$a = [ $something, &$somethingElse ];
7373

74-
/* arrayValueByReferenceE */
74+
/* testArrayValueByReferenceE */
7575
$a = array( 'a' => &$something );
7676

77-
/* arrayValueByReferenceF */
77+
/* testArrayValueByReferenceF */
7878
$a = array( 'a' => $something, 'b' => &$somethingElse );
7979

80-
/* arrayValueByReferenceG */
80+
/* testArrayValueByReferenceG */
8181
$a = array( &$something );
8282

83-
/* arrayValueByReferenceH */
83+
/* testArrayValueByReferenceH */
8484
$a = array( $something, &$somethingElse );
8585

86-
/* assignByReferenceA */
86+
/* testAssignByReferenceA */
8787
$b = &$something;
8888

89-
/* assignByReferenceB */
89+
/* testAssignByReferenceB */
9090
$b =& $something;
9191

92-
/* assignByReferenceC */
92+
/* testAssignByReferenceC */
9393
$b .= &$something;
9494

95-
/* assignByReferenceD */
95+
/* testAssignByReferenceD */
9696
$myValue = &$obj->getValue();
9797

98-
/* assignByReferenceE */
98+
/* testAssignByReferenceE */
9999
$collection = &collector();
100100

101-
/* passByReferenceA */
101+
/* testPassByReferenceA */
102102
functionCall(&$something, $somethingElse);
103103

104-
/* passByReferenceB */
104+
/* testPassByReferenceB */
105105
functionCall($something, &$somethingElse);
106106

107-
/* passByReferenceC */
107+
/* testPassByReferenceC */
108108
functionCall($something, &$this->somethingElse);
109109

110-
/* passByReferenceD */
110+
/* testPassByReferenceD */
111111
functionCall($something, &self::$somethingElse);
112112

113-
/* passByReferenceE */
113+
/* testPassByReferenceE */
114114
functionCall($something, &parent::$somethingElse);
115115

116-
/* passByReferenceF */
116+
/* testPassByReferenceF */
117117
functionCall($something, &static::$somethingElse);
118118

119-
/* passByReferenceG */
119+
/* testPassByReferenceG */
120120
functionCall($something, &SomeClass::$somethingElse);
121121

122-
/* passByReferenceH */
122+
/* testPassByReferenceH */
123123
functionCall(&\SomeClass::$somethingElse);
124124

125-
/* passByReferenceI */
125+
/* testPassByReferenceI */
126126
functionCall($something, &\SomeNS\SomeClass::$somethingElse);
127127

128-
/* passByReferenceJ */
128+
/* testPassByReferenceJ */
129129
functionCall($something, &namespace\SomeClass::$somethingElse);
130130

131-
/* newByReferenceA */
131+
/* testNewByReferenceA */
132132
$foobar2 = &new Foobar();
133133

134-
/* newByReferenceB */
134+
/* testNewByReferenceB */
135135
functionCall( $something , &new Foobar() );
136136

137-
/* useByReference */
137+
/* testUseByReference */
138138
$closure = function() use (&$var){};

0 commit comments

Comments
 (0)