From 26288e584d65df75c681570f6ab88976a39fdba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sun, 23 Jun 2024 20:35:54 +0200
Subject: [PATCH] Remove StaticReflectionService

Additionally, implementations of ReflectionService may no longer return
null for calls to getClass().
---
 UPGRADE.md                                    | 10 +++
 src/Persistence/Mapping/ReflectionService.php |  4 +-
 .../Mapping/StaticReflectionService.php       | 67 -------------------
 .../Mapping/StaticReflectionServiceTest.php   | 51 --------------
 4 files changed, 12 insertions(+), 120 deletions(-)
 delete mode 100644 src/Persistence/Mapping/StaticReflectionService.php
 delete mode 100644 tests/Persistence/Mapping/StaticReflectionServiceTest.php

diff --git a/UPGRADE.md b/UPGRADE.md
index 8e2430a3..5bf1ef0a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -8,6 +8,16 @@ awareness about deprecated code.
 
 # Upgrade to 4.0
 
+## BC Break: Removed `StaticReflectionService`
+
+The class `Doctrine\Persistence\Mapping\StaticReflectionService` is removed
+without replacement.
+
+## BC Break: Narrowed `ReflectionService::getClass()` return type
+
+The return type of `ReflectionService::getClass()` has been narrowed so that
+`null` is no longer a valid return value.
+
 ## BC Break: Added `ObjectManager::isUninitializedObject()`
 
 Classes implementing `Doctrine\Persistence\ObjectManager` must implement this
diff --git a/src/Persistence/Mapping/ReflectionService.php b/src/Persistence/Mapping/ReflectionService.php
index 03c5c875..95572141 100644
--- a/src/Persistence/Mapping/ReflectionService.php
+++ b/src/Persistence/Mapping/ReflectionService.php
@@ -42,11 +42,11 @@ public function getClassNamespace(string $class): string;
      *
      * @psalm-param class-string<T> $class
      *
-     * @psalm-return ReflectionClass<T>|null
+     * @psalm-return ReflectionClass<T>
      *
      * @template T of object
      */
-    public function getClass(string $class): ReflectionClass|null;
+    public function getClass(string $class): ReflectionClass;
 
     /**
      * Returns an accessible property (setAccessible(true)) or null.
diff --git a/src/Persistence/Mapping/StaticReflectionService.php b/src/Persistence/Mapping/StaticReflectionService.php
deleted file mode 100644
index 979a83e1..00000000
--- a/src/Persistence/Mapping/StaticReflectionService.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Persistence\Mapping;
-
-use ReflectionClass;
-use ReflectionProperty;
-
-use function str_contains;
-use function strpos;
-use function strrev;
-use function strrpos;
-use function substr;
-
-/**
- * PHP Runtime Reflection Service.
- *
- * @deprecated No replacement planned
- */
-class StaticReflectionService implements ReflectionService
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getParentClasses(string $class): array
-    {
-        return [];
-    }
-
-    public function getClassShortName(string $class): string
-    {
-        $nsSeparatorLastPosition = strrpos($class, '\\');
-
-        if ($nsSeparatorLastPosition !== false) {
-            $class = substr($class, $nsSeparatorLastPosition + 1);
-        }
-
-        return $class;
-    }
-
-    public function getClassNamespace(string $class): string
-    {
-        $namespace = '';
-
-        if (str_contains($class, '\\')) {
-            $namespace = strrev(substr(strrev($class), (int) strpos(strrev($class), '\\') + 1));
-        }
-
-        return $namespace;
-    }
-
-    public function getClass(string $class): ReflectionClass|null
-    {
-        return null;
-    }
-
-    public function getAccessibleProperty(string $class, string $property): ReflectionProperty|null
-    {
-        return null;
-    }
-
-    public function hasPublicMethod(string $class, string $method): bool
-    {
-        return true;
-    }
-}
diff --git a/tests/Persistence/Mapping/StaticReflectionServiceTest.php b/tests/Persistence/Mapping/StaticReflectionServiceTest.php
deleted file mode 100644
index 9ad9e30b..00000000
--- a/tests/Persistence/Mapping/StaticReflectionServiceTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\Persistence\Mapping;
-
-use Doctrine\Persistence\Mapping\StaticReflectionService;
-use PHPUnit\Framework\TestCase;
-use stdClass;
-
-use function count;
-
-/** @group DCOM-93 */
-class StaticReflectionServiceTest extends TestCase
-{
-    private StaticReflectionService $reflectionService;
-
-    protected function setUp(): void
-    {
-        $this->reflectionService = new StaticReflectionService();
-    }
-
-    public function testShortname(): void
-    {
-        self::assertSame('StaticReflectionServiceTest', $this->reflectionService->getClassShortName(self::class));
-    }
-
-    public function testClassNamespaceName(): void
-    {
-        self::assertSame('', $this->reflectionService->getClassNamespace(stdClass::class));
-        self::assertSame(__NAMESPACE__, $this->reflectionService->getClassNamespace(self::class));
-    }
-
-    public function testGetParentClasses(): void
-    {
-        $classes = $this->reflectionService->getParentClasses(self::class);
-        self::assertTrue(count($classes) === 0, 'The test class ' . self::class . ' should have no parents according to static reflection.');
-    }
-
-    public function testGetMethods(): void
-    {
-        self::assertTrue($this->reflectionService->hasPublicMethod(self::class, 'testGetMethods'));
-        self::assertTrue($this->reflectionService->hasPublicMethod(self::class, 'testGetMethods2'));
-    }
-
-    public function testGetAccessibleProperty(): void
-    {
-        $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'reflectionService');
-        self::assertNull($reflProp);
-    }
-}