tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Efficiency improvement to class manifest
This commit is contained in:
Will Rossiter 2016-05-20 14:32:43 +12:00
commit 0a67052d6c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/manifest/ClassManifest.php
View File

@ -249,14 +249,14 @@ class SS_ClassManifest {
/** /**
* Returns an array of module names mapped to their paths. * Returns an array of module names mapped to their paths.
* *
* "Modules" in SilverStripe are simply directories with a _config.php * "Modules" in SilverStripe are simply directories with a _config.php
* file. * file.
* *
* @return array * @return array
*/ */
public function getModules() { public function getModules() {
$modules = array(); $modules = array();
if($this->configs) { if($this->configs) {
foreach($this->configs as $configPath) { foreach($this->configs as $configPath) {
$modules[basename(dirname($configPath))] = dirname($configPath); $modules[basename(dirname($configPath))] = dirname($configPath);
@ -347,8 +347,7 @@ class SS_ClassManifest {
// files will have changed and TokenisedRegularExpression is quite // files will have changed and TokenisedRegularExpression is quite
// slow. A combination of the file name and file contents hash are used, // slow. A combination of the file name and file contents hash are used,
// since just using the datetime lead to problems with upgrading. // 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($pathname);
$key = preg_replace('/[^a-zA-Z0-9_]/', '_', $basename) . '_' . md5($file);
if ($data = $this->cache->load($key)) { if ($data = $this->cache->load($key)) {
$valid = ( $valid = (
@ -364,8 +363,8 @@ class SS_ClassManifest {
} }
if (!$classes) { if (!$classes) {
$tokens = token_get_all($file); $tokens = token_get_all(file_get_contents($pathname));
$classes = self::get_namespaced_class_parser()->findAll($tokens); $classes = self::get_namespaced_class_parser()->findAll($tokens);
$namespace = self::get_namespace_parser()->findAll($tokens); $namespace = self::get_namespace_parser()->findAll($tokens);
if($namespace) { if($namespace) {