Let all ::fromClass() factories throw RuntimeException and require class-string.

Author: donquixote

src/ClassFilesIA/ClassFilesIA.php

@@ -36,13 +36,10 @@ public static function psr4Up(string $directory, string $namespace, int $nLevels
   }
 
   /**
-   * @param string $class
+   * @param class-string $class
    * @param int $nLevelsUp
    *
    * @return \Ock\ClassFilesIterator\NamespaceDirectory
-   *
-   * @throws \ReflectionException
-   *   Class does not exist.
    */
   public static function psr4FromClass(string $class, int $nLevelsUp = 0): NamespaceDirectory {
     $result = NamespaceDirectory::createFromClass($class);
@@ -79,9 +76,6 @@ public static function multiple(array $classFilesIAs): ClassFilesIAInterface {
    * @param class-string[] $classes
    *
    * @return \Ock\ClassFilesIterator\ClassFilesIA\ClassFilesIAInterface
-   *
-   * @throws \ReflectionException
-   *   One of the classes does not exist.
    */
   public static function psr4FromClasses(array $classes): ClassFilesIAInterface {
     return self::multiple(array_map(

src/ClassFilesIA/ClassFilesIA_Psr4.php

@@ -34,7 +34,6 @@ public static function create(string $directory, string $namespace): self {
    * @param int $nLevelsUp
    *
    * @return \Ock\ClassFilesIterator\ClassFilesIA\ClassFilesIAInterface
-   * @throws \ReflectionException
    */
   public static function createFromClass(string $class, int $nLevelsUp = 0): ClassFilesIAInterface {
     $nsDir = NamespaceDirectory::createFromClass($class)

src/NamespaceDirectory.php

@@ -57,20 +57,22 @@ public static function fromClass(string $class): self {
   /**
    * Creates a namespace directory based on a class name.
    *
-   * @param class-string|string $class
+   * @param class-string $class
    *   A class in the namespace directory.
    *
    * @return self
    *   Namespace directory of this very class file.
-   *
-   * @throws \ReflectionException
-   *   Class does not exist.
    */
   public static function createFromClass(string $class): self {
-    // Accept that `new \ReflectionClass()` will throw an exception if the class
-    // does not exist.
-    // @phpstan-ignore argument.type
-    $reflClass = new \ReflectionClass($class);
+    try {
+      $reflClass = new \ReflectionClass($class);
+    }
+    // The $class parameter is annotated as class-string, but we don't want to
+    // rely on it.
+    // @phpstan-ignore catch.neverThrown
+    catch (\ReflectionException $e) {
+      throw new \RuntimeException($e->getMessage(), 0, $e);
+    }
     return self::fromReflectionClass($reflClass);
   }
 

tests/src/ClassFilesIATest.php

@@ -66,7 +66,7 @@ public function testCreateFromClass(): void {
       $f(Fig::class, -3),
     );
     // @phpstan-ignore argument.type
-    $this->callAndAssertException(\ReflectionException::class, fn () => $f(__NAMESPACE__ . '\\NonExistingClass'));
+    $this->callAndAssertException(\RuntimeException::class, fn () => $f(__NAMESPACE__ . '\\NonExistingClass'));
     $this->callAndAssertException(\RuntimeException::class, fn () => $f(Fig::class, 5));
     $this->callAndAssertException(\RuntimeException::class, fn () => $f(Fig::class, -2));
   }
@@ -101,9 +101,6 @@ public function testEmpty(): void {
     $this->assertFalse($classFilesIA->getIterator()->valid());
   }
 
-  /**
-   * @throws \ReflectionException
-   */
   public function testConcat(): void {
     $concat = new ClassFilesIA_Concat([
       ClassFilesIA::psr4FromClass(Fig::class),

tests/src/NamespaceDirectoryTest.php

@@ -62,7 +62,8 @@ public function testCreateFromClass(): void {
     );
     // Does not work with non-existing class.
     $this->callAndAssertException(
-      \ReflectionException::class,
+      \RuntimeException::class,
+      // @phpstan-ignore argument.type
       fn () => NamespaceDirectory::createFromClass(__NAMESPACE__ . '\\NonExistingClass'),
     );
     // Does not work with built-in class.