Chris@0
|
1 <?php
|
Chris@0
|
2
|
Chris@0
|
3 /*
|
Chris@0
|
4 * This file is part of the Symfony package.
|
Chris@0
|
5 *
|
Chris@0
|
6 * (c) Fabien Potencier <fabien@symfony.com>
|
Chris@0
|
7 *
|
Chris@0
|
8 * For the full copyright and license information, please view the LICENSE
|
Chris@0
|
9 * file that was distributed with this source code.
|
Chris@0
|
10 */
|
Chris@0
|
11
|
Chris@0
|
12 namespace Symfony\Component\ClassLoader;
|
Chris@0
|
13
|
Chris@0
|
14 /**
|
Chris@0
|
15 * ClassCollectionLoader.
|
Chris@0
|
16 *
|
Chris@0
|
17 * @author Fabien Potencier <fabien@symfony.com>
|
Chris@0
|
18 */
|
Chris@0
|
19 class ClassCollectionLoader
|
Chris@0
|
20 {
|
Chris@0
|
21 private static $loaded;
|
Chris@0
|
22 private static $seen;
|
Chris@0
|
23 private static $useTokenizer = true;
|
Chris@0
|
24
|
Chris@0
|
25 /**
|
Chris@0
|
26 * Loads a list of classes and caches them in one big file.
|
Chris@0
|
27 *
|
Chris@0
|
28 * @param array $classes An array of classes to load
|
Chris@0
|
29 * @param string $cacheDir A cache directory
|
Chris@0
|
30 * @param string $name The cache name prefix
|
Chris@0
|
31 * @param bool $autoReload Whether to flush the cache when the cache is stale or not
|
Chris@0
|
32 * @param bool $adaptive Whether to remove already declared classes or not
|
Chris@0
|
33 * @param string $extension File extension of the resulting file
|
Chris@0
|
34 *
|
Chris@0
|
35 * @throws \InvalidArgumentException When class can't be loaded
|
Chris@0
|
36 */
|
Chris@0
|
37 public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
|
Chris@0
|
38 {
|
Chris@0
|
39 // each $name can only be loaded once per PHP process
|
Chris@0
|
40 if (isset(self::$loaded[$name])) {
|
Chris@0
|
41 return;
|
Chris@0
|
42 }
|
Chris@0
|
43
|
Chris@0
|
44 self::$loaded[$name] = true;
|
Chris@0
|
45
|
Chris@0
|
46 if ($adaptive) {
|
Chris@0
|
47 $declared = array_merge(get_declared_classes(), get_declared_interfaces(), get_declared_traits());
|
Chris@0
|
48
|
Chris@0
|
49 // don't include already declared classes
|
Chris@0
|
50 $classes = array_diff($classes, $declared);
|
Chris@0
|
51
|
Chris@0
|
52 // the cache is different depending on which classes are already declared
|
Chris@0
|
53 $name = $name.'-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
|
Chris@0
|
54 }
|
Chris@0
|
55
|
Chris@0
|
56 $classes = array_unique($classes);
|
Chris@0
|
57
|
Chris@0
|
58 // cache the core classes
|
Chris@0
|
59 if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
|
Chris@0
|
60 throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
|
Chris@0
|
61 }
|
Chris@0
|
62 $cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.DIRECTORY_SEPARATOR);
|
Chris@0
|
63 $cache = $cacheDir.'/'.$name.$extension;
|
Chris@0
|
64
|
Chris@0
|
65 // auto-reload
|
Chris@0
|
66 $reload = false;
|
Chris@0
|
67 if ($autoReload) {
|
Chris@0
|
68 $metadata = $cache.'.meta';
|
Chris@0
|
69 if (!is_file($metadata) || !is_file($cache)) {
|
Chris@0
|
70 $reload = true;
|
Chris@0
|
71 } else {
|
Chris@0
|
72 $time = filemtime($cache);
|
Chris@0
|
73 $meta = unserialize(file_get_contents($metadata));
|
Chris@0
|
74
|
Chris@0
|
75 sort($meta[1]);
|
Chris@0
|
76 sort($classes);
|
Chris@0
|
77
|
Chris@0
|
78 if ($meta[1] != $classes) {
|
Chris@0
|
79 $reload = true;
|
Chris@0
|
80 } else {
|
Chris@0
|
81 foreach ($meta[0] as $resource) {
|
Chris@0
|
82 if (!is_file($resource) || filemtime($resource) > $time) {
|
Chris@0
|
83 $reload = true;
|
Chris@0
|
84
|
Chris@0
|
85 break;
|
Chris@0
|
86 }
|
Chris@0
|
87 }
|
Chris@0
|
88 }
|
Chris@0
|
89 }
|
Chris@0
|
90 }
|
Chris@0
|
91
|
Chris@0
|
92 if (!$reload && file_exists($cache)) {
|
Chris@0
|
93 require_once $cache;
|
Chris@0
|
94
|
Chris@0
|
95 return;
|
Chris@0
|
96 }
|
Chris@0
|
97 if (!$adaptive) {
|
Chris@0
|
98 $declared = array_merge(get_declared_classes(), get_declared_interfaces(), get_declared_traits());
|
Chris@0
|
99 }
|
Chris@0
|
100
|
Chris@0
|
101 $files = self::inline($classes, $cache, $declared);
|
Chris@0
|
102
|
Chris@0
|
103 if ($autoReload) {
|
Chris@0
|
104 // save the resources
|
Chris@0
|
105 self::writeCacheFile($metadata, serialize(array(array_values($files), $classes)));
|
Chris@0
|
106 }
|
Chris@0
|
107 }
|
Chris@0
|
108
|
Chris@0
|
109 /**
|
Chris@0
|
110 * Generates a file where classes and their parents are inlined.
|
Chris@0
|
111 *
|
Chris@0
|
112 * @param array $classes An array of classes to load
|
Chris@0
|
113 * @param string $cache The file where classes are inlined
|
Chris@0
|
114 * @param array $excluded An array of classes that won't be inlined
|
Chris@0
|
115 *
|
Chris@0
|
116 * @return array The source map of inlined classes, with classes as keys and files as values
|
Chris@0
|
117 *
|
Chris@0
|
118 * @throws \RuntimeException When class can't be loaded
|
Chris@0
|
119 */
|
Chris@0
|
120 public static function inline($classes, $cache, array $excluded)
|
Chris@0
|
121 {
|
Chris@0
|
122 $declared = array();
|
Chris@0
|
123 foreach (self::getOrderedClasses($excluded) as $class) {
|
Chris@0
|
124 $declared[$class->getName()] = true;
|
Chris@0
|
125 }
|
Chris@0
|
126
|
Chris@0
|
127 // cache the core classes
|
Chris@0
|
128 $cacheDir = dirname($cache);
|
Chris@0
|
129 if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
|
Chris@0
|
130 throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
|
Chris@0
|
131 }
|
Chris@0
|
132
|
Chris@0
|
133 $spacesRegex = '(?:\s*+(?:(?:\#|//)[^\n]*+\n|/\*(?:(?<!\*/).)++)?+)*+';
|
Chris@0
|
134 $dontInlineRegex = <<<REGEX
|
Chris@0
|
135 '(?:
|
Chris@0
|
136 ^<\?php\s.declare.\(.strict_types.=.1.\).;
|
Chris@0
|
137 | \b__halt_compiler.\(.\)
|
Chris@0
|
138 | \b__(?:DIR|FILE)__\b
|
Chris@0
|
139 )'isx
|
Chris@0
|
140 REGEX;
|
Chris@0
|
141 $dontInlineRegex = str_replace('.', $spacesRegex, $dontInlineRegex);
|
Chris@0
|
142
|
Chris@0
|
143 $cacheDir = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $cacheDir));
|
Chris@0
|
144 $files = array();
|
Chris@0
|
145 $content = '';
|
Chris@0
|
146 foreach (self::getOrderedClasses($classes) as $class) {
|
Chris@0
|
147 if (isset($declared[$class->getName()])) {
|
Chris@0
|
148 continue;
|
Chris@0
|
149 }
|
Chris@0
|
150 $declared[$class->getName()] = true;
|
Chris@0
|
151
|
Chris@0
|
152 $files[$class->getName()] = $file = $class->getFileName();
|
Chris@0
|
153 $c = file_get_contents($file);
|
Chris@0
|
154
|
Chris@0
|
155 if (preg_match($dontInlineRegex, $c)) {
|
Chris@0
|
156 $file = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $file));
|
Chris@0
|
157
|
Chris@0
|
158 for ($i = 0; isset($file[$i], $cacheDir[$i]); ++$i) {
|
Chris@0
|
159 if ($file[$i] !== $cacheDir[$i]) {
|
Chris@0
|
160 break;
|
Chris@0
|
161 }
|
Chris@0
|
162 }
|
Chris@0
|
163 if (1 >= $i) {
|
Chris@0
|
164 $file = var_export(implode('/', $file), true);
|
Chris@0
|
165 } else {
|
Chris@0
|
166 $file = array_slice($file, $i);
|
Chris@0
|
167 $file = str_repeat('../', count($cacheDir) - $i).implode('/', $file);
|
Chris@0
|
168 $file = '__DIR__.'.var_export('/'.$file, true);
|
Chris@0
|
169 }
|
Chris@0
|
170
|
Chris@0
|
171 $c = "\nnamespace {require $file;}";
|
Chris@0
|
172 } else {
|
Chris@0
|
173 $c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', $c);
|
Chris@0
|
174
|
Chris@0
|
175 // fakes namespace declaration for global code
|
Chris@0
|
176 if (!$class->inNamespace()) {
|
Chris@0
|
177 $c = "\nnamespace\n{\n".$c."\n}\n";
|
Chris@0
|
178 }
|
Chris@0
|
179
|
Chris@0
|
180 $c = self::fixNamespaceDeclarations('<?php '.$c);
|
Chris@0
|
181 $c = preg_replace('/^\s*<\?php/', '', $c);
|
Chris@0
|
182 }
|
Chris@0
|
183
|
Chris@0
|
184 $content .= $c;
|
Chris@0
|
185 }
|
Chris@0
|
186 self::writeCacheFile($cache, '<?php '.$content);
|
Chris@0
|
187
|
Chris@0
|
188 return $files;
|
Chris@0
|
189 }
|
Chris@0
|
190
|
Chris@0
|
191 /**
|
Chris@0
|
192 * Adds brackets around each namespace if it's not already the case.
|
Chris@0
|
193 *
|
Chris@0
|
194 * @param string $source Namespace string
|
Chris@0
|
195 *
|
Chris@0
|
196 * @return string Namespaces with brackets
|
Chris@0
|
197 */
|
Chris@0
|
198 public static function fixNamespaceDeclarations($source)
|
Chris@0
|
199 {
|
Chris@0
|
200 if (!function_exists('token_get_all') || !self::$useTokenizer) {
|
Chris@0
|
201 if (preg_match('/(^|\s)namespace(.*?)\s*;/', $source)) {
|
Chris@0
|
202 $source = preg_replace('/(^|\s)namespace(.*?)\s*;/', "$1namespace$2\n{", $source)."}\n";
|
Chris@0
|
203 }
|
Chris@0
|
204
|
Chris@0
|
205 return $source;
|
Chris@0
|
206 }
|
Chris@0
|
207
|
Chris@0
|
208 $rawChunk = '';
|
Chris@0
|
209 $output = '';
|
Chris@0
|
210 $inNamespace = false;
|
Chris@0
|
211 $tokens = token_get_all($source);
|
Chris@0
|
212
|
Chris@0
|
213 for ($i = 0; isset($tokens[$i]); ++$i) {
|
Chris@0
|
214 $token = $tokens[$i];
|
Chris@0
|
215 if (!isset($token[1]) || 'b"' === $token) {
|
Chris@0
|
216 $rawChunk .= $token;
|
Chris@0
|
217 } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
|
Chris@0
|
218 // strip comments
|
Chris@0
|
219 continue;
|
Chris@0
|
220 } elseif (T_NAMESPACE === $token[0]) {
|
Chris@0
|
221 if ($inNamespace) {
|
Chris@0
|
222 $rawChunk .= "}\n";
|
Chris@0
|
223 }
|
Chris@0
|
224 $rawChunk .= $token[1];
|
Chris@0
|
225
|
Chris@0
|
226 // namespace name and whitespaces
|
Chris@0
|
227 while (isset($tokens[++$i][1]) && in_array($tokens[$i][0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
|
Chris@0
|
228 $rawChunk .= $tokens[$i][1];
|
Chris@0
|
229 }
|
Chris@0
|
230 if ('{' === $tokens[$i]) {
|
Chris@0
|
231 $inNamespace = false;
|
Chris@0
|
232 --$i;
|
Chris@0
|
233 } else {
|
Chris@0
|
234 $rawChunk = rtrim($rawChunk)."\n{";
|
Chris@0
|
235 $inNamespace = true;
|
Chris@0
|
236 }
|
Chris@0
|
237 } elseif (T_START_HEREDOC === $token[0]) {
|
Chris@0
|
238 $output .= self::compressCode($rawChunk).$token[1];
|
Chris@0
|
239 do {
|
Chris@0
|
240 $token = $tokens[++$i];
|
Chris@0
|
241 $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
|
Chris@0
|
242 } while ($token[0] !== T_END_HEREDOC);
|
Chris@0
|
243 $output .= "\n";
|
Chris@0
|
244 $rawChunk = '';
|
Chris@0
|
245 } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
|
Chris@0
|
246 $output .= self::compressCode($rawChunk).$token[1];
|
Chris@0
|
247 $rawChunk = '';
|
Chris@0
|
248 } else {
|
Chris@0
|
249 $rawChunk .= $token[1];
|
Chris@0
|
250 }
|
Chris@0
|
251 }
|
Chris@0
|
252
|
Chris@0
|
253 if ($inNamespace) {
|
Chris@0
|
254 $rawChunk .= "}\n";
|
Chris@0
|
255 }
|
Chris@0
|
256
|
Chris@0
|
257 $output .= self::compressCode($rawChunk);
|
Chris@0
|
258
|
Chris@0
|
259 if (PHP_VERSION_ID >= 70000) {
|
Chris@0
|
260 // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
Chris@0
|
261 unset($tokens, $rawChunk);
|
Chris@0
|
262 gc_mem_caches();
|
Chris@0
|
263 }
|
Chris@0
|
264
|
Chris@0
|
265 return $output;
|
Chris@0
|
266 }
|
Chris@0
|
267
|
Chris@0
|
268 /**
|
Chris@0
|
269 * This method is only useful for testing.
|
Chris@0
|
270 */
|
Chris@0
|
271 public static function enableTokenizer($bool)
|
Chris@0
|
272 {
|
Chris@0
|
273 self::$useTokenizer = (bool) $bool;
|
Chris@0
|
274 }
|
Chris@0
|
275
|
Chris@0
|
276 /**
|
Chris@0
|
277 * Strips leading & trailing ws, multiple EOL, multiple ws.
|
Chris@0
|
278 *
|
Chris@0
|
279 * @param string $code Original PHP code
|
Chris@0
|
280 *
|
Chris@0
|
281 * @return string compressed code
|
Chris@0
|
282 */
|
Chris@0
|
283 private static function compressCode($code)
|
Chris@0
|
284 {
|
Chris@0
|
285 return preg_replace(
|
Chris@0
|
286 array('/^\s+/m', '/\s+$/m', '/([\n\r]+ *[\n\r]+)+/', '/[ \t]+/'),
|
Chris@0
|
287 array('', '', "\n", ' '),
|
Chris@0
|
288 $code
|
Chris@0
|
289 );
|
Chris@0
|
290 }
|
Chris@0
|
291
|
Chris@0
|
292 /**
|
Chris@0
|
293 * Writes a cache file.
|
Chris@0
|
294 *
|
Chris@0
|
295 * @param string $file Filename
|
Chris@0
|
296 * @param string $content Temporary file content
|
Chris@0
|
297 *
|
Chris@0
|
298 * @throws \RuntimeException when a cache file cannot be written
|
Chris@0
|
299 */
|
Chris@0
|
300 private static function writeCacheFile($file, $content)
|
Chris@0
|
301 {
|
Chris@0
|
302 $dir = dirname($file);
|
Chris@0
|
303 if (!is_writable($dir)) {
|
Chris@0
|
304 throw new \RuntimeException(sprintf('Cache directory "%s" is not writable.', $dir));
|
Chris@0
|
305 }
|
Chris@0
|
306
|
Chris@0
|
307 $tmpFile = tempnam($dir, basename($file));
|
Chris@0
|
308
|
Chris@0
|
309 if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
|
Chris@0
|
310 @chmod($file, 0666 & ~umask());
|
Chris@0
|
311
|
Chris@0
|
312 return;
|
Chris@0
|
313 }
|
Chris@0
|
314
|
Chris@0
|
315 throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
|
Chris@0
|
316 }
|
Chris@0
|
317
|
Chris@0
|
318 /**
|
Chris@0
|
319 * Gets an ordered array of passed classes including all their dependencies.
|
Chris@0
|
320 *
|
Chris@0
|
321 * @param array $classes
|
Chris@0
|
322 *
|
Chris@0
|
323 * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
|
Chris@0
|
324 *
|
Chris@0
|
325 * @throws \InvalidArgumentException When a class can't be loaded
|
Chris@0
|
326 */
|
Chris@0
|
327 private static function getOrderedClasses(array $classes)
|
Chris@0
|
328 {
|
Chris@0
|
329 $map = array();
|
Chris@0
|
330 self::$seen = array();
|
Chris@0
|
331 foreach ($classes as $class) {
|
Chris@0
|
332 try {
|
Chris@0
|
333 $reflectionClass = new \ReflectionClass($class);
|
Chris@0
|
334 } catch (\ReflectionException $e) {
|
Chris@0
|
335 throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
|
Chris@0
|
336 }
|
Chris@0
|
337
|
Chris@0
|
338 $map = array_merge($map, self::getClassHierarchy($reflectionClass));
|
Chris@0
|
339 }
|
Chris@0
|
340
|
Chris@0
|
341 return $map;
|
Chris@0
|
342 }
|
Chris@0
|
343
|
Chris@0
|
344 private static function getClassHierarchy(\ReflectionClass $class)
|
Chris@0
|
345 {
|
Chris@0
|
346 if (isset(self::$seen[$class->getName()])) {
|
Chris@0
|
347 return array();
|
Chris@0
|
348 }
|
Chris@0
|
349
|
Chris@0
|
350 self::$seen[$class->getName()] = true;
|
Chris@0
|
351
|
Chris@0
|
352 $classes = array($class);
|
Chris@0
|
353 $parent = $class;
|
Chris@0
|
354 while (($parent = $parent->getParentClass()) && $parent->isUserDefined() && !isset(self::$seen[$parent->getName()])) {
|
Chris@0
|
355 self::$seen[$parent->getName()] = true;
|
Chris@0
|
356
|
Chris@0
|
357 array_unshift($classes, $parent);
|
Chris@0
|
358 }
|
Chris@0
|
359
|
Chris@0
|
360 $traits = array();
|
Chris@0
|
361
|
Chris@0
|
362 foreach ($classes as $c) {
|
Chris@0
|
363 foreach (self::resolveDependencies(self::computeTraitDeps($c), $c) as $trait) {
|
Chris@0
|
364 if ($trait !== $c) {
|
Chris@0
|
365 $traits[] = $trait;
|
Chris@0
|
366 }
|
Chris@0
|
367 }
|
Chris@0
|
368 }
|
Chris@0
|
369
|
Chris@0
|
370 return array_merge(self::getInterfaces($class), $traits, $classes);
|
Chris@0
|
371 }
|
Chris@0
|
372
|
Chris@0
|
373 private static function getInterfaces(\ReflectionClass $class)
|
Chris@0
|
374 {
|
Chris@0
|
375 $classes = array();
|
Chris@0
|
376
|
Chris@0
|
377 foreach ($class->getInterfaces() as $interface) {
|
Chris@0
|
378 $classes = array_merge($classes, self::getInterfaces($interface));
|
Chris@0
|
379 }
|
Chris@0
|
380
|
Chris@0
|
381 if ($class->isUserDefined() && $class->isInterface() && !isset(self::$seen[$class->getName()])) {
|
Chris@0
|
382 self::$seen[$class->getName()] = true;
|
Chris@0
|
383
|
Chris@0
|
384 $classes[] = $class;
|
Chris@0
|
385 }
|
Chris@0
|
386
|
Chris@0
|
387 return $classes;
|
Chris@0
|
388 }
|
Chris@0
|
389
|
Chris@0
|
390 private static function computeTraitDeps(\ReflectionClass $class)
|
Chris@0
|
391 {
|
Chris@0
|
392 $traits = $class->getTraits();
|
Chris@0
|
393 $deps = array($class->getName() => $traits);
|
Chris@0
|
394 while ($trait = array_pop($traits)) {
|
Chris@0
|
395 if ($trait->isUserDefined() && !isset(self::$seen[$trait->getName()])) {
|
Chris@0
|
396 self::$seen[$trait->getName()] = true;
|
Chris@0
|
397 $traitDeps = $trait->getTraits();
|
Chris@0
|
398 $deps[$trait->getName()] = $traitDeps;
|
Chris@0
|
399 $traits = array_merge($traits, $traitDeps);
|
Chris@0
|
400 }
|
Chris@0
|
401 }
|
Chris@0
|
402
|
Chris@0
|
403 return $deps;
|
Chris@0
|
404 }
|
Chris@0
|
405
|
Chris@0
|
406 /**
|
Chris@0
|
407 * Dependencies resolution.
|
Chris@0
|
408 *
|
Chris@0
|
409 * This function does not check for circular dependencies as it should never
|
Chris@0
|
410 * occur with PHP traits.
|
Chris@0
|
411 *
|
Chris@0
|
412 * @param array $tree The dependency tree
|
Chris@0
|
413 * @param \ReflectionClass $node The node
|
Chris@0
|
414 * @param \ArrayObject $resolved An array of already resolved dependencies
|
Chris@0
|
415 * @param \ArrayObject $unresolved An array of dependencies to be resolved
|
Chris@0
|
416 *
|
Chris@0
|
417 * @return \ArrayObject The dependencies for the given node
|
Chris@0
|
418 *
|
Chris@0
|
419 * @throws \RuntimeException if a circular dependency is detected
|
Chris@0
|
420 */
|
Chris@0
|
421 private static function resolveDependencies(array $tree, $node, \ArrayObject $resolved = null, \ArrayObject $unresolved = null)
|
Chris@0
|
422 {
|
Chris@0
|
423 if (null === $resolved) {
|
Chris@0
|
424 $resolved = new \ArrayObject();
|
Chris@0
|
425 }
|
Chris@0
|
426 if (null === $unresolved) {
|
Chris@0
|
427 $unresolved = new \ArrayObject();
|
Chris@0
|
428 }
|
Chris@0
|
429 $nodeName = $node->getName();
|
Chris@0
|
430
|
Chris@0
|
431 if (isset($tree[$nodeName])) {
|
Chris@0
|
432 $unresolved[$nodeName] = $node;
|
Chris@0
|
433 foreach ($tree[$nodeName] as $dependency) {
|
Chris@0
|
434 if (!$resolved->offsetExists($dependency->getName())) {
|
Chris@0
|
435 self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
|
Chris@0
|
436 }
|
Chris@0
|
437 }
|
Chris@0
|
438 $resolved[$nodeName] = $node;
|
Chris@0
|
439 unset($unresolved[$nodeName]);
|
Chris@0
|
440 }
|
Chris@0
|
441
|
Chris@0
|
442 return $resolved;
|
Chris@0
|
443 }
|
Chris@0
|
444 }
|