Merge pull request #5564 from dhensby/pulls/3.1/manifest-optimisation

Efficiency improvement to class manifest
This commit is contained in:
Will Rossiter 2016-05-20 14:32:43 +12:00
commit 0a67052d6c

View File

@ -347,8 +347,7 @@ class SS_ClassManifest {
// files will have changed and TokenisedRegularExpression is quite
// slow. A combination of the file name and file contents hash are used,
// since just using the datetime lead to problems with upgrading.
$file = file_get_contents($pathname);
$key = preg_replace('/[^a-zA-Z0-9_]/', '_', $basename) . '_' . md5($file);
$key = preg_replace('/[^a-zA-Z0-9_]/', '_', $basename) . '_' . md5_file($pathname);
if ($data = $this->cache->load($key)) {
$valid = (
@ -364,7 +363,7 @@ class SS_ClassManifest {
}
if (!$classes) {
$tokens = token_get_all($file);
$tokens = token_get_all(file_get_contents($pathname));
$classes = self::get_namespaced_class_parser()->findAll($tokens);
$namespace = self::get_namespace_parser()->findAll($tokens);