Page MenuHomePhabricator
Files F13967762

D9834.id23613.diff
No OneTemporary
Actions

D9834.id23613.diff
View Options

diff --git a/src/__tests__/PhutilInfrastructureTestCase.php b/src/__tests__/PhutilInfrastructureTestCase.php
--- a/src/__tests__/PhutilInfrastructureTestCase.php
+++ b/src/__tests__/PhutilInfrastructureTestCase.php
@@ -25,7 +25,7 @@
->buildMap();
$bootloader = PhutilBootloader::getInstance();
- $old_library_map = $bootloader->getLibraryMap('phutil');
+ $old_library_map = $bootloader->getLibraryMapWithoutExtensions('phutil');
unset($old_library_map[PhutilLibraryMapBuilder::LIBRARY_MAP_VERSION_KEY]);
$this->assertEqual(
diff --git a/src/moduleutils/PhutilBootloader.php b/src/moduleutils/PhutilBootloader.php
--- a/src/moduleutils/PhutilBootloader.php
+++ b/src/moduleutils/PhutilBootloader.php
@@ -9,6 +9,7 @@
private $registeredLibraries = array();
private $libraryMaps = array();
+ private $extensionMaps = array();
private $currentLibrary = null;
private $classTree = array();
@@ -138,6 +139,28 @@
throw new Exception("Unsupported library version '{$version}'!");
}
}
+
+ $map = $this->libraryMaps[$name];
+
+ // If there's an extension map for this library, merge the maps.
+ if (isset($this->extensionMaps[$name])) {
+ $emap = $this->extensionMaps[$name];
+ foreach (array('function', 'class', 'xmap') as $dict_key) {
+ if (!isset($emap[$dict_key])) {
+ continue;
+ }
+ $map[$dict_key] += $emap[$dict_key];
+ }
+ }
+
+ return $map;
+ }
+
+ public function getLibraryMapWithoutExtensions($name) {
+ // This just does all the checks to make sure the library is valid, then
+ // we throw away the result.
+ $this->getLibraryMap($name);
+
return $this->libraryMaps[$name];
}
@@ -212,13 +235,13 @@
foreach ($add_functions as $func => $ignored) {
$rfunc = new ReflectionFunction($func);
$fpath = Filesystem::resolvePath($rfunc->getFileName(), $root);
- $this->libraryMaps[$library]['function'][$func] = $fpath;
+ $this->extensionMaps[$library]['function'][$func] = $fpath;
}
foreach ($add_classes + $add_interfaces as $class => $ignored) {
$rclass = new ReflectionClass($class);
$cpath = Filesystem::resolvePath($rclass->getFileName(), $root);
- $this->libraryMaps[$library]['class'][$class] = $cpath;
+ $this->extensionMaps[$library]['class'][$class] = $cpath;
$xmap = $rclass->getInterfaceNames();
$parent = $rclass->getParentClass();
@@ -235,7 +258,7 @@
$xmap = head($xmap);
}
- $this->libraryMaps[$library]['xmap'][$class] = $xmap;
+ $this->extensionMaps[$library]['xmap'][$class] = $xmap;
}
}
}

File Metadata

Mime Type
text/plain
Expires
Oct 17 2024, 3:46 PM (4 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6709674
Default Alt Text
D9834.id23613.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility