10000 [ClassLoader] Fix declared classes being computed when not needed by nicolas-grekas · Pull Request #19298 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[ClassLoader] Fix declared classes being computed when not needed #19298

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

Merged
merged 1 commit into from
Jul 10, 2016
Merged

[ClassLoader] Fix declared classes being computed when not needed #19298

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
[ClassLoader] Fix declared classes being computed when not needed
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Jul 6, 2016
commit d513eae29ec9349348255cdb8d15540766d8329b
18 changes: 12 additions & 6 deletions src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =

self::$loaded[$name] = true;

$declared = array_merge(get_declared_classes(), get_declared_interfaces());
if (function_exists('get_declared_traits')) {
$declared = array_merge($declared, get_declared_traits());
}

if ($adaptive) {
Copy link
Member Author
@nicolas-grekas nicolas-grekas Jul 6, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when $adaptive is false, which is the case in all usages in Symfony, and when the cache is warm
this $declared variable is currently computed but never used.

$declared = array_merge(get_declared_classes(), get_declared_interfaces());
if (function_exists('get_declared_traits')) {
$declared = array_merge($declared, get_declared_traits());
}

// don't include already declared classes
$classes = array_diff($classes, $declared);

Expand Down Expand Up @@ -87,11 +87,17 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
}
}

if (!$reload && is_file($cache)) {
if (!$reload && file_exists($cache)) {
require_once $cache;

return;
}
if (!$adaptive) {
$declared = array_merge(get_declared_classes(), get_declared_interfaces());
if (function_exists('get_declared_traits')) {
$declared = array_merge($declared, get_declared_traits());
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why making this change ?

Copy link
Member Author
@nicolas-grekas nicolas-grekas Jul 6, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because $declared is needed below
see a1031f6#diff-bc09f5d8b58e88e3a673386fdee7a981

}

$files = array();
$content = '';
Expand Down
0