Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"require": {
"php": ">=8.4",
"ext-tokenizer": "*",
"entropy/entropy": "^0.4.20",
"nette/robot-loader": "^4.1",
"entropy/entropy": "^0.4.23",
"nikic/php-parser": "^5.9",
"sebastian/lines-of-code": "^4.0",
"webmozart/assert": "^2.4"
Expand Down
18 changes: 11 additions & 7 deletions src/RobotLoader/PhpClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

namespace Rector\SwissKnife\RobotLoader;

use Nette\Loaders\RobotLoader;
use Entropy\Reflection\ClassNameResolver;
use Rector\SwissKnife\Finder\PhpFilesFinder;

final class PhpClassLoader
{
Expand All @@ -15,13 +16,16 @@ final class PhpClassLoader
*/
public function load(array $directories, array $excludedPaths): array
{
$robotLoader = new RobotLoader();
$robotLoader->addDirectory(...$directories);
$robotLoader->excludeDirectory(...$excludedPaths);
$classesToFilePaths = [];

$robotLoader->setTempDirectory(sys_get_temp_dir() . '/multiple-classes');
$robotLoader->rebuild();
foreach (PhpFilesFinder::find($directories, $excludedPaths) as $fileInfo) {
$filePath = (string) $fileInfo->getRealPath();

return $robotLoader->getIndexedClasses();
foreach (ClassNameResolver::resolveNamesFromFilePath($filePath) as $className) {
$classesToFilePaths[$className] = $filePath;
}
}

return $classesToFilePaths;
}
}
19 changes: 13 additions & 6 deletions src/Testing/Finder/TestCaseClassFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

namespace Rector\SwissKnife\Testing\Finder;

use Nette\Loaders\RobotLoader;
use Entropy\Reflection\ClassNameResolver;
use Rector\SwissKnife\Finder\PhpFilesFinder;

final class TestCaseClassFinder
{
Expand All @@ -14,13 +15,19 @@ final class TestCaseClassFinder
*/
public function findInDirectories(array $directories): array
{
$robotLoader = new RobotLoader();
$robotLoader->addDirectory(...$directories);
$robotLoader->rebuild();
$classesToFilePaths = [];

$this->includeNonAutoloadedClasses($robotLoader->getIndexedClasses());
foreach (PhpFilesFinder::find($directories) as $fileInfo) {
$filePath = (string) $fileInfo->getRealPath();

return $robotLoader->getIndexedClasses();
foreach (ClassNameResolver::resolveNamesFromFilePath($filePath) as $className) {
$classesToFilePaths[$className] = $filePath;
}
}

$this->includeNonAutoloadedClasses($classesToFilePaths);

return $classesToFilePaths;
}

/**
Expand Down
9 changes: 9 additions & 0 deletions tests/RobotLoader/Fixture/SingleClass.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Rector\SwissKnife\Tests\RobotLoader\Fixture;

final class SingleClass
{
}
13 changes: 13 additions & 0 deletions tests/RobotLoader/Fixture/two_classes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

namespace Rector\SwissKnife\Tests\RobotLoader\Fixture;

final class FirstThing
{
}

final class SecondThing
{
}
41 changes: 41 additions & 0 deletions tests/RobotLoader/PhpClassLoaderTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace Rector\SwissKnife\Tests\RobotLoader;

use PHPUnit\Framework\TestCase;
use Rector\SwissKnife\RobotLoader\PhpClassLoader;
use Rector\SwissKnife\Tests\RobotLoader\Fixture\SingleClass;

final class PhpClassLoaderTest extends TestCase
{
// intentionally not PSR-4 autoloadable, both live in the same file
private const FIRST_THING = 'Rector\SwissKnife\Tests\RobotLoader\Fixture\FirstThing';

private const SECOND_THING = 'Rector\SwissKnife\Tests\RobotLoader\Fixture\SecondThing';

public function test(): void
{
$phpClassLoader = new PhpClassLoader();
$classesToFilePaths = $phpClassLoader->load([__DIR__ . '/Fixture'], []);

$this->assertArrayHasKey(SingleClass::class, $classesToFilePaths);
$this->assertArrayHasKey(self::FIRST_THING, $classesToFilePaths);
$this->assertArrayHasKey(self::SECOND_THING, $classesToFilePaths);

$this->assertSame($classesToFilePaths[self::FIRST_THING], $classesToFilePaths[self::SECOND_THING]);
}

public function testExcludedPathIsSkipped(): void
{
$phpClassLoader = new PhpClassLoader();
$classesToFilePaths = $phpClassLoader->load(
[__DIR__ . '/Fixture'],
[__DIR__ . '/Fixture/two_classes.php']
);

$this->assertArrayHasKey(SingleClass::class, $classesToFilePaths);
$this->assertArrayNotHasKey(self::FIRST_THING, $classesToFilePaths);
}
}
Loading