Skip to content

Commit d02c9f3

Browse files
greg0iregreg0ire
authored
Merge pull request #471 from greg0ire/drop-deprecated-method
Remove deprecated method
2 parents 455db74 + 7a95b3b commit d02c9f3

File tree

5 files changed

+23
-35
lines changed

5 files changed

+23
-35
lines changed

‎UPGRADE.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ arrays in some ways.
1414
you have classes inheriting from classes inside this package, you should add
1515
parameter and return type declarations.
1616
- Support for PHP < 7.2 has been removed
17+
- `PhpParser::parseClass()` has been removed. Use
18+
`PhpParser::parseUseStatements()` instead.

‎lib/Doctrine/Common/Annotations/PhpParser.php

-14
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,6 @@
1616
*/
1717
final class PhpParser
1818
{
19-
/**
20-
* Parses a class.
21-
*
22-
* @deprecated use parseUseStatements instead
23-
*
24-
* @param ReflectionClass $class A <code>ReflectionClass</code> object.
25-
*
26-
* @return array<string, class-string> A list with use statements in the form (Alias => FQN).
27-
*/
28-
public function parseClass(ReflectionClass $class)
29-
{
30-
return $this->parseUseStatements($class);
31-
}
32-
3319
/**
3420
* Parse a class or function for use statements.
3521
*

‎tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithShortCutBench.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public function initialize(): void
3131
*/
3232
public function bench(): void
3333
{
34-
$this->parser->parseClass($this->class);
34+
$this->parser->parseUseStatements($this->class);
3535
}
3636
}

‎tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithoutShortCutBench.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public function initialize(): void
3131
*/
3232
public function bench(): void
3333
{
34-
$this->parser->parseClass($this->class);
34+
$this->parser->parseUseStatements($this->class);
3535
}
3636
}

‎tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php

+19-19
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function testParseClassWithMultipleClassesInFile(): void
2121
self::assertEquals([
2222
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
2323
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
24-
], $parser->parseClass($class));
24+
], $parser->parseUseStatements($class));
2525
}
2626

2727
public function testParseClassWithMultipleImportsInUseStatement(): void
@@ -32,7 +32,7 @@ public function testParseClassWithMultipleImportsInUseStatement(): void
3232
self::assertEquals([
3333
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
3434
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
35-
], $parser->parseClass($class));
35+
], $parser->parseUseStatements($class));
3636
}
3737

3838
/**
@@ -47,13 +47,13 @@ public function testParseClassWithGroupUseStatement(): void
4747
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
4848
'supersecure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
4949
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
50-
], $parser->parseClass($class));
50+
], $parser->parseUseStatements($class));
5151
}
5252

5353
public function testParseClassWhenNotUserDefined(): void
5454
{
5555
$parser = new PhpParser();
56-
self::assertEquals([], $parser->parseClass(new ReflectionClass(stdClass::class)));
56+
self::assertEquals([], $parser->parseUseStatements(new ReflectionClass(stdClass::class)));
5757
}
5858

5959
public function testClassFileDoesNotExist(): void
@@ -64,7 +64,7 @@ public function testClassFileDoesNotExist(): void
6464
->will($this->returnValue('/valid/class/Fake.php(35) : eval()d code'));
6565

6666
$parser = new PhpParser();
67-
self::assertEquals([], $parser->parseClass($class));
67+
self::assertEquals([], $parser->parseUseStatements($class));
6868
}
6969

7070
public function testParseClassWhenClassIsNotNamespaced(): void
@@ -75,7 +75,7 @@ public function testParseClassWhenClassIsNotNamespaced(): void
7575
self::assertEquals([
7676
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
7777
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
78-
], $parser->parseClass($class));
78+
], $parser->parseUseStatements($class));
7979
}
8080

8181
public function testParseClassWhenClassIsInterface(): void
@@ -85,7 +85,7 @@ public function testParseClassWhenClassIsInterface(): void
8585

8686
self::assertEquals([
8787
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
88-
], $parser->parseClass($class));
88+
], $parser->parseUseStatements($class));
8989
}
9090

9191
public function testClassWithFullyQualifiedUseStatements(): void
@@ -97,7 +97,7 @@ public function testClassWithFullyQualifiedUseStatements(): void
9797
'secure' => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Secure',
9898
'route' => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Route',
9999
'template' => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Template',
100-
], $parser->parseClass($class));
100+
], $parser->parseUseStatements($class));
101101
}
102102

103103
public function testNamespaceAndClassCommentedOut(): void
@@ -108,7 +108,7 @@ public function testNamespaceAndClassCommentedOut(): void
108108
self::assertEquals([
109109
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
110110
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
111-
], $parser->parseClass($class));
111+
], $parser->parseUseStatements($class));
112112
}
113113

114114
public function testEqualNamespacesPerFileWithClassAsFirst(): void
@@ -119,7 +119,7 @@ public function testEqualNamespacesPerFileWithClassAsFirst(): void
119119
self::assertEquals([
120120
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
121121
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
122-
], $parser->parseClass($class));
122+
], $parser->parseUseStatements($class));
123123
}
124124

125125
public function testEqualNamespacesPerFileWithClassAsLast(): void
@@ -130,7 +130,7 @@ public function testEqualNamespacesPerFileWithClassAsLast(): void
130130
self::assertEquals([
131131
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
132132
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
133-
], $parser->parseClass($class));
133+
], $parser->parseUseStatements($class));
134134
}
135135

136136
public function testDifferentNamespacesPerFileWithClassAsFirst(): void
@@ -140,7 +140,7 @@ public function testDifferentNamespacesPerFileWithClassAsFirst(): void
140140

141141
self::assertEquals([
142142
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
143-
], $parser->parseClass($class));
143+
], $parser->parseUseStatements($class));
144144
}
145145

146146
public function testDifferentNamespacesPerFileWithClassAsLast(): void
@@ -150,7 +150,7 @@ public function testDifferentNamespacesPerFileWithClassAsLast(): void
150150

151151
self::assertEquals([
152152
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
153-
], $parser->parseClass($class));
153+
], $parser->parseUseStatements($class));
154154
}
155155

156156
public function testGlobalNamespacesPerFileWithClassAsFirst(): void
@@ -161,7 +161,7 @@ public function testGlobalNamespacesPerFileWithClassAsFirst(): void
161161
self::assertEquals([
162162
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
163163
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
164-
], $parser->parseClass($class));
164+
], $parser->parseUseStatements($class));
165165
}
166166

167167
public function testGlobalNamespacesPerFileWithClassAsLast(): void
@@ -172,7 +172,7 @@ public function testGlobalNamespacesPerFileWithClassAsLast(): void
172172
self::assertEquals([
173173
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
174174
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
175-
], $parser->parseClass($class));
175+
], $parser->parseUseStatements($class));
176176
}
177177

178178
public function testNamespaceWithClosureDeclaration(): void
@@ -184,7 +184,7 @@ public function testNamespaceWithClosureDeclaration(): void
184184
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
185185
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
186186
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
187-
], $parser->parseClass($class));
187+
], $parser->parseUseStatements($class));
188188
}
189189

190190
public function testIfPointerResetsOnMultipleParsingTries(): void
@@ -196,13 +196,13 @@ public function testIfPointerResetsOnMultipleParsingTries(): void
196196
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
197197
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
198198
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
199-
], $parser->parseClass($class));
199+
], $parser->parseUseStatements($class));
200200

201201
self::assertEquals([
202202
'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
203203
'route' => __NAMESPACE__ . '\Fixtures\Annotation\Route',
204204
'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
205-
], $parser->parseClass($class));
205+
], $parser->parseUseStatements($class));
206206
}
207207

208208
/**
@@ -217,6 +217,6 @@ public function testClassWithClosure(): void
217217
self::assertEquals([
218218
'annotationtargetall' => __NAMESPACE__ . '\Fixtures\AnnotationTargetAll',
219219
'annotationtargetannotation' => __NAMESPACE__ . '\Fixtures\AnnotationTargetAnnotation',
220-
], $parser->parseClass($class));
220+
], $parser->parseUseStatements($class));
221221
}
222222
}

0 commit comments

Comments
 (0)