Merge pull request #471 from greg0ire/drop-deprecated-method

Remove deprecated method
doctrine · Dec 19, 2022 · d02c9f3 · d02c9f3
2 parents 455db74 + 7a95b3b
commit d02c9f3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 35 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -14,3 +14,5 @@ arrays in some ways.
 you have classes inheriting from classes inside this package, you should add
 parameter and return type declarations.
 - Support for PHP < 7.2 has been removed
+- `PhpParser::parseClass()` has been removed. Use
+  `PhpParser::parseUseStatements()` instead.
diff --git a/lib/Doctrine/Common/Annotations/PhpParser.php b/lib/Doctrine/Common/Annotations/PhpParser.php
@@ -16,20 +16,6 @@
  */
 final class PhpParser
 {
-    /**
-     * Parses a class.
-     *
-     * @deprecated use parseUseStatements instead
-     *
-     * @param ReflectionClass $class A <code>ReflectionClass</code> object.
-     *
-     * @return array<string, class-string> A list with use statements in the form (Alias => FQN).
-     */
-    public function parseClass(ReflectionClass $class)
-    {
-        return $this->parseUseStatements($class);
-    }
-
     /**
      * Parse a class or function for use statements.
      *

diff --git a/tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithShortCutBench.php b/tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithShortCutBench.php
@@ -31,6 +31,6 @@ public function initialize(): void
      */
     public function bench(): void
     {
-        $this->parser->parseClass($this->class);
+        $this->parser->parseUseStatements($this->class);
     }
 }
diff --git a/tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithoutShortCutBench.php b/tests/Doctrine/Performance/Common/Annotations/PhpParserPerformanceWithoutShortCutBench.php
@@ -31,6 +31,6 @@ public function initialize(): void
      */
     public function bench(): void
     {
-        $this->parser->parseClass($this->class);
+        $this->parser->parseUseStatements($this->class);
     }
 }
diff --git a/tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php b/tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php
@@ -21,7 +21,7 @@ public function testParseClassWithMultipleClassesInFile(): void
         self::assertEquals([
             'route'  => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testParseClassWithMultipleImportsInUseStatement(): void
@@ -32,7 +32,7 @@ public function testParseClassWithMultipleImportsInUseStatement(): void
         self::assertEquals([
             'route'  => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     /**
@@ -47,13 +47,13 @@ public function testParseClassWithGroupUseStatement(): void
             'route'  => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'supersecure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testParseClassWhenNotUserDefined(): void
     {
         $parser = new PhpParser();
-        self::assertEquals([], $parser->parseClass(new ReflectionClass(stdClass::class)));
+        self::assertEquals([], $parser->parseUseStatements(new ReflectionClass(stdClass::class)));
     }
 
     public function testClassFileDoesNotExist(): void
@@ -64,7 +64,7 @@ public function testClassFileDoesNotExist(): void
              ->will($this->returnValue('/valid/class/Fake.php(35) : eval()d code'));
 
         $parser = new PhpParser();
-        self::assertEquals([], $parser->parseClass($class));
+        self::assertEquals([], $parser->parseUseStatements($class));
     }
 
     public function testParseClassWhenClassIsNotNamespaced(): void
@@ -75,7 +75,7 @@ public function testParseClassWhenClassIsNotNamespaced(): void
         self::assertEquals([
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testParseClassWhenClassIsInterface(): void
@@ -85,7 +85,7 @@ public function testParseClassWhenClassIsInterface(): void
 
         self::assertEquals([
             'secure' => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testClassWithFullyQualifiedUseStatements(): void
@@ -97,7 +97,7 @@ public function testClassWithFullyQualifiedUseStatements(): void
             'secure'   => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => '\\' . __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testNamespaceAndClassCommentedOut(): void
@@ -108,7 +108,7 @@ public function testNamespaceAndClassCommentedOut(): void
         self::assertEquals([
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testEqualNamespacesPerFileWithClassAsFirst(): void
@@ -119,7 +119,7 @@ public function testEqualNamespacesPerFileWithClassAsFirst(): void
         self::assertEquals([
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testEqualNamespacesPerFileWithClassAsLast(): void
@@ -130,7 +130,7 @@ public function testEqualNamespacesPerFileWithClassAsLast(): void
         self::assertEquals([
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testDifferentNamespacesPerFileWithClassAsFirst(): void
@@ -140,7 +140,7 @@ public function testDifferentNamespacesPerFileWithClassAsFirst(): void
 
         self::assertEquals([
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testDifferentNamespacesPerFileWithClassAsLast(): void
@@ -150,7 +150,7 @@ public function testDifferentNamespacesPerFileWithClassAsLast(): void
 
         self::assertEquals([
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testGlobalNamespacesPerFileWithClassAsFirst(): void
@@ -161,7 +161,7 @@ public function testGlobalNamespacesPerFileWithClassAsFirst(): void
         self::assertEquals([
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testGlobalNamespacesPerFileWithClassAsLast(): void
@@ -172,7 +172,7 @@ public function testGlobalNamespacesPerFileWithClassAsLast(): void
         self::assertEquals([
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testNamespaceWithClosureDeclaration(): void
@@ -184,7 +184,7 @@ public function testNamespaceWithClosureDeclaration(): void
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     public function testIfPointerResetsOnMultipleParsingTries(): void
@@ -196,13 +196,13 @@ public function testIfPointerResetsOnMultipleParsingTries(): void
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
 
         self::assertEquals([
             'secure'   => __NAMESPACE__ . '\Fixtures\Annotation\Secure',
             'route'    => __NAMESPACE__ . '\Fixtures\Annotation\Route',
             'template' => __NAMESPACE__ . '\Fixtures\Annotation\Template',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 
     /**
@@ -217,6 +217,6 @@ public function testClassWithClosure(): void
         self::assertEquals([
             'annotationtargetall'         => __NAMESPACE__ . '\Fixtures\AnnotationTargetAll',
             'annotationtargetannotation'  => __NAMESPACE__ . '\Fixtures\AnnotationTargetAnnotation',
-        ], $parser->parseClass($class));
+        ], $parser->parseUseStatements($class));
     }
 }