Skip to content

Commit 9118e24

Browse files
committed
Collapse ClassFilesIA::psr4FromKnownClass() into ::psr4FromClass().
1 parent 524fd29 commit 9118e24

File tree

2 files changed

+15
-33
lines changed

2 files changed

+15
-33
lines changed

src/ClassFilesIA/ClassFilesIA.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,6 @@ public static function psr4FromClass(string $class, int $nLevelsUp = 0): Namespa
4949
return $result;
5050
}
5151

52-
/**
53-
* @param class-string $class
54-
* @param int $nLevelsUp
55-
*
56-
* @return \Ock\ClassFilesIterator\NamespaceDirectory
57-
*/
58-
public static function psr4FromKnownClass(string $class, int $nLevelsUp = 0): NamespaceDirectory {
59-
$result = NamespaceDirectory::fromClass($class);
60-
if ($nLevelsUp !== 0) {
61-
$result = $result->requireParentN($nLevelsUp);
62-
}
63-
return $result;
64-
}
65-
6652
/**
6753
* @param \Ock\ClassFilesIterator\ClassFilesIA\ClassFilesIAInterface[] $classFilesIAs
6854
*

tests/src/ClassFilesIATest.php

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -146,25 +146,21 @@ public function testFactoryPsr4Up(): void {
146146
}
147147

148148
public function testFactoryPsr4FromClass(): void {
149-
foreach ([
150-
ClassFilesIA::psr4FromClass(...),
151-
ClassFilesIA::psr4FromKnownClass(...),
152-
] as $f) {
153-
$fn = fn (int ...$args) => $f(Fig::class, ...$args);
154-
$this->assertEquals($default = NamespaceDirectory::create(
155-
__DIR__ . '/Fixtures/Acme/Plant/Tree',
156-
__NAMESPACE__ . '\Fixtures\Acme\Plant\Tree',
157-
), $fn());
158-
$this->assertEquals($default, $fn(0));
159-
$this->assertEquals(NamespaceDirectory::create(
160-
__DIR__ . '/Fixtures/Acme/Plant',
161-
__NAMESPACE__ . '\Fixtures\Acme\Plant',
162-
), $fn(1));
163-
$this->assertEquals(NamespaceDirectory::create(
164-
__DIR__,
165-
__NAMESPACE__,
166-
), $fn(-3));
167-
}
149+
$f = ClassFilesIA::psr4FromClass(...);
150+
$fn = fn (int ...$args) => $f(Fig::class, ...$args);
151+
$this->assertEquals($default = NamespaceDirectory::create(
152+
__DIR__ . '/Fixtures/Acme/Plant/Tree',
153+
__NAMESPACE__ . '\Fixtures\Acme\Plant\Tree',
154+
), $fn());
155+
$this->assertEquals($default, $fn(0));
156+
$this->assertEquals(NamespaceDirectory::create(
157+
__DIR__ . '/Fixtures/Acme/Plant',
158+
__NAMESPACE__ . '\Fixtures\Acme\Plant',
159+
), $fn(1));
160+
$this->assertEquals(NamespaceDirectory::create(
161+
__DIR__,
162+
__NAMESPACE__,
163+
), $fn(-3));
168164
}
169165

170166
public function testFactoryMultiple(): void {

0 commit comments

Comments
 (0)