Changeset 114

Show
Ignore:
Timestamp:
01/19/07 00:00:38 (2 years ago)
Author:
mikey
Message:

bugfix: incorrect use of returned array from StarLoader::acquire() in init()
bugfix: use $file->getPathname() instead $file->getPath()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/star/StarClassRegistry.php

    r111 r114  
    120120             
    121121            if (true === $recursive) { 
    122                 $dirIt = new RecursiveDirectoryIterator($libPath); 
     122                $dirIt = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($libPath)); 
    123123            } else { 
    124124                $dirIt = new DirectoryIterator($libPath); 
    …… 
    137137                } 
    138138                 
    139                 $classes = array_keys($archiveData); 
    140                 self::$files[$file->getPath()]    = $classes; 
    141                 $cache['files'][$file->getPath()] = $classes; 
     139                $classes = array_keys($archiveData['index']); 
     140                self::$files[$file->getPathname()]    = $classes; 
     141                $cache['files'][$file->getPathname()] = $classes; 
    142142                 
    143                 foreach ($archiveData as $fqClassName => $storeData) { 
     143                foreach ($archiveData['index'] as $fqClassName => $storeData) { 
    144144                    self::$classes[$fqClassName]    = $file->getPathname(); 
    145145                    $cache['classes'][$fqClassName] = $file->getPathname();