mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'feature/naderman/auto-loading' into develop

Browse Source 
* feature/naderman/auto-loading:
  [feature/auto-loading] Only check subdir if there is another name part.
This commit is contained in:
Andreas Fischer
2010-08-20 22:05:05 +02:00
parent 3f0c02533a f870434222
commit df111373a6
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/class_loader.php
View File

@@ -115,7 +115,7 @@ class phpbb_class_loader
$dirs = ''; $dirs = '';
for ($i = 0; is_dir($path_prefix . $dirs . $parts[$i]) && $i < sizeof($parts); $i++) for ($i = 0, $n = sizeof($parts); $i < $n && is_dir($path_prefix . $dirs . $parts[$i]); $i++)
{ {
$dirs .= $parts[$i] . '/'; $dirs .= $parts[$i] . '/';
} }

6
tests/class_loader/class_loader_test.php
View File

@@ -23,6 +23,12 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$prefix .= 'includes/'; $prefix .= 'includes/';
$this->assertEquals(
'',
$class_loader->resolve_path('phpbb_dir'),
'Class with same name as a directory is unloadable'
);
$this->assertEquals( $this->assertEquals(
$prefix . 'class_name.php', $prefix . 'class_name.php',
$class_loader->resolve_path('phpbb_class_name'), $class_loader->resolve_path('phpbb_class_name'),

6
tests/class_loader/includes/dir.php Normal file
View File

@@ -0,0 +1,6 @@
<?php
class phpbb_dir
{
}