Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

On Demand Symbol Loading #115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

On Demand Symbol Loading #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
"ext-json": "*",
"ext-phar": "*",
"nikic/php-parser": "^4.0",
"symfony/console": "^3.4.17 || ^4.1.6",
"webmozart/glob": "^4.1"
"symfony/console": "^3.4.17 | ^4.1.6",
"webmozart/glob": "^4.1",
"roave/better-reflection": "^3.5"
},
"require-dev": {
"mikey179/vfsstream": "^1.6",
Expand Down
1 change: 1 addition & 0 deletions src/ComposerRequireChecker/Cli/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace ComposerRequireChecker\Cli;

use Composer\Autoload\ClassLoader;
use Symfony\Component\Console\Application as AbstractApplication;

class Application extends AbstractApplication
Expand Down
85 changes: 60 additions & 25 deletions src/ComposerRequireChecker/Cli/CheckCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@

use ComposerRequireChecker\ASTLocator\LocateASTFromFiles;
use ComposerRequireChecker\DefinedExtensionsResolver\DefinedExtensionsResolver;
use ComposerRequireChecker\DefinedSymbolsLocator\LocateDefinedSymbolsFromASTRoots;
use ComposerRequireChecker\DefinedSymbolsLocator\LocateDefinedSymbolsFromExtensions;
use ComposerRequireChecker\DependencyGuesser\DependencyGuesser;
use ComposerRequireChecker\FileLocator\LocateComposerPackageDirectDependenciesSourceFiles;
use ComposerRequireChecker\Exception\DependenciesNotInstalledException;
use ComposerRequireChecker\FileLocator\LocateComposerPackageSourceFiles;
use ComposerRequireChecker\FileLocator\LocateFilesByGlobPattern;
use ComposerRequireChecker\GeneratorUtil\ComposeGenerators;
use ComposerRequireChecker\JsonLoader;
use ComposerRequireChecker\UsedSymbolsLocator\LocateUsedSymbolsFromASTRoots;
use PhpParser\ErrorHandler\Collecting as CollectingErrorHandler;
use PhpParser\ParserFactory;
use Roave\BetterReflection\BetterReflection;
use Roave\BetterReflection\Reflector\ClassReflector;
use Roave\BetterReflection\Reflector\ConstantReflector;
use Roave\BetterReflection\Reflector\Exception\IdentifierNotFound;
use Roave\BetterReflection\Reflector\FunctionReflector;
use Roave\BetterReflection\SourceLocator\Type\Composer\Factory\Exception\MissingComposerJson;
use Roave\BetterReflection\SourceLocator\Type\Composer\Factory\MakeLocatorForComposerJsonAndInstalledJson;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
Expand Down Expand Up @@ -70,42 +76,71 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$sourcesASTs = $this->getASTFromFilesLocator($input);

$this->verbose("Collecting defined vendor symbols... ", $output);
$definedVendorSymbols = (new LocateDefinedSymbolsFromASTRoots())->__invoke($sourcesASTs(
$this->verbose("Collecting used symbols... ", $output);
$usedSymbols = (new LocateUsedSymbolsFromASTRoots())->__invoke($sourcesASTs(
(new ComposeGenerators())->__invoke(
$getAdditionalSourceFiles($options->getScanFiles(), dirname($composerJson)),
$getPackageSourceFiles($composerData, dirname($composerJson)),
(new LocateComposerPackageDirectDependenciesSourceFiles())->__invoke($composerJson)
$getAdditionalSourceFiles($options->getScanFiles(), dirname($composerJson))
)
));
$this->verbose("found " . count($definedVendorSymbols) . " symbols.", $output, true);
$this->verbose("found " . count($usedSymbols) . " symbols.", $output, true);


$this->verbose("Collecting defined extension symbols... ", $output);
$definedExtensionSymbols = (new LocateDefinedSymbolsFromExtensions())->__invoke(
(new DefinedExtensionsResolver())->__invoke($composerJson, $options->getPhpCoreExtensions())
);
$this->verbose("found " . count($definedExtensionSymbols) . " symbols.", $output, true);

$this->verbose("Collecting used symbols... ", $output);
$usedSymbols = (new LocateUsedSymbolsFromASTRoots())->__invoke($sourcesASTs(
(new ComposeGenerators())->__invoke(
$getPackageSourceFiles($composerData, dirname($composerJson)),
$getAdditionalSourceFiles($options->getScanFiles(), dirname($composerJson))
)
));
$this->verbose("found " . count($usedSymbols) . " symbols.", $output, true);

if (!count($usedSymbols)) {
throw new \LogicException('There were no symbols found, please check your configuration.');
try {
$locator = new MakeLocatorForComposerJsonAndInstalledJson();
$astLocator = (new BetterReflection())->astLocator();
$composerLocator = $locator(dirname($composerJson), $astLocator);
$classReflector = new ClassReflector($composerLocator);
$functionReflector = new FunctionReflector($composerLocator, $classReflector);
$constantReflector = new ConstantReflector($composerLocator, $classReflector);
} catch (MissingComposerJson $missingComposerJson) {
$message = 'The composer dependencies have not been installed, run composer install/update first';
throw new DependenciesNotInstalledException($message);
}

$this->verbose("Checking for unknown symbols... ", $output, true);
$unknownSymbols = array_diff(
$usedSymbols,
$definedVendorSymbols,
$definedExtensionSymbols,
$options->getSymbolWhitelist()
);
$whiteList = $options->getSymbolWhitelist();
$unknownSymbols = [];
foreach ($usedSymbols as $usedSymbol) {
if (in_array($usedSymbol, $whiteList)) {
continue;
}

if (in_array($usedSymbol, $definedExtensionSymbols)) {
continue;
}

try {
$classReflector->reflect($usedSymbol);

continue;
} catch (IdentifierNotFound $ignore) {
// void
}

try {
$functionReflector->reflect($usedSymbol);

continue;
} catch (IdentifierNotFound $ignore) {
// void
}

try {
$constantReflector->reflect($usedSymbol);

continue;
} catch (IdentifierNotFound $ignore) {
// void
}

$unknownSymbols[] = $usedSymbol;
}

if (!$unknownSymbols) {
$output->writeln("There were no unknown symbols found.");
Expand Down
65 changes: 0 additions & 65 deletions ...ComposerRequireChecker/FileLocator/LocateComposerPackageDirectDependenciesSourceFiles.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/ComposerRequireCheckerTest/Cli/CheckCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function testVerboseSelfCheckShowsCounts(): void
'verbosity' => OutputInterface::VERBOSITY_VERBOSE,
]);

$this->assertRegExp('/Collecting defined vendor symbols... found \d+ symbols./', $this->commandTester->getDisplay());
// $this->assertRegExp('/Collecting defined vendor symbols... found \d+ symbols./', $this->commandTester->getDisplay());
$this->assertRegExp('/Collecting defined extension symbols... found \d+ symbols./', $this->commandTester->getDisplay());
$this->assertRegExp('/Collecting used symbols... found \d+ symbols./', $this->commandTester->getDisplay());
}
Expand Down
Loading