makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/extension-manager] Support extensions in subdirectories of ext/

Browse source 
PHPBB3-10323
This commit is contained in:
Nils Adermann 2011-10-14 01:30:50 +02:00
parent f53892c838
commit 4fb9f2101d
6 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/extension/manager.php
View file

@ -94,7 +94,9 @@ class phpbb_extension_manager
*/ */
public function get_extension_path($name, $phpbb_relative = false) public function get_extension_path($name, $phpbb_relative = false)
{ {
return (($phpbb_relative) ? $this->phpbb_root_path : '') . 'ext/' . basename($name) . '/'; $name = str_replace('.', '', $name);
return (($phpbb_relative) ? $this->phpbb_root_path : '') . 'ext/' . $name . '/';
} }
/** /**
@ -106,7 +108,7 @@ class phpbb_extension_manager
*/ */
public function get_extension($name) public function get_extension($name)
{ {
$extension_class_name = 'phpbb_ext_' . $name . '_ext'; $extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext';
if (class_exists($extension_class_name)) if (class_exists($extension_class_name))
{ {
@ -292,13 +294,17 @@ class phpbb_extension_manager
{ {
$available = array(); $available = array();
$iterator = new DirectoryIterator($this->phpbb_root_path . 'ext/'); $iterator = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'));
foreach ($iterator as $file_info) foreach ($iterator as $file_info)
{ {
$path = $this->phpbb_root_path . 'ext/' . $file_info->getBasename() . '/'; if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx)
if (!$file_info->isDot() && $file_info->isDir() && file_exists($path))
{ {
$available[$file_info->getBasename()] = $path; $ext_name = $iterator->getInnerIterator()->getSubPath();
$ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name);
$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
} }
} }
ksort($available); ksort($available);

5
tests/extension/ext/moo/feature_class.php
View file

@ -1,5 +0,0 @@
<?php
class phpbb_ext_moo_feature_class
{
}

2
tests/extension/ext/moo/ext.php → tests/extension/ext/vendor/moo/ext.php vendored
View file

@ -1,6 +1,6 @@
<?php <?php
class phpbb_ext_moo_ext extends phpbb_extension_base class phpbb_ext_vendor_moo_ext extends phpbb_extension_base
{ {
static public $purged; static public $purged;

5
tests/extension/ext/vendor/moo/feature_class.php vendored Normal file
View file

@ -0,0 +1,5 @@
<?php
class phpbb_ext_vendor_moo_feature_class
{
}

2
tests/extension/fixtures/extensions.xml
View file

@ -8,7 +8,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>moo</value> <value>vendor/moo</value>
<value>0</value> <value>0</value>
</row> </row>
</table> </table>

18
tests/extension/manager_test.php
View file

@ -9,7 +9,7 @@
require_once dirname(__FILE__) . '/../mock/cache.php'; require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/ext/bar/ext.php'; require_once dirname(__FILE__) . '/ext/bar/ext.php';
require_once dirname(__FILE__) . '/ext/moo/ext.php'; require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php';
class phpbb_extension_manager_test extends phpbb_database_test_case class phpbb_extension_manager_test extends phpbb_database_test_case
{ {
@ -36,7 +36,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
public function test_available() public function test_available()
{ {
$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_available())); $this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available()));
} }
public function test_enabled() public function test_enabled()
@ -46,7 +46,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
public function test_configured() public function test_configured()
{ {
$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
} }
public function test_enable() public function test_enable()
@ -56,7 +56,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
$this->extension_manager->enable('bar'); $this->extension_manager->enable('bar');
$this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled()));
$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
$this->assertEquals(4, phpbb_ext_bar_ext::$state); $this->assertEquals(4, phpbb_ext_bar_ext::$state);
} }
@ -66,20 +66,20 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
$this->extension_manager->disable('foo'); $this->extension_manager->disable('foo');
$this->assertEquals(array(), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array(), array_keys($this->extension_manager->all_enabled()));
$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
} }
public function test_purge() public function test_purge()
{ {
phpbb_ext_moo_ext::$purged = false; phpbb_ext_vendor_moo_ext::$purged = false;
$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
$this->extension_manager->purge('moo'); $this->extension_manager->purge('vendor/moo');
$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured()));
$this->assertTrue(phpbb_ext_moo_ext::$purged); $this->assertTrue(phpbb_ext_vendor_moo_ext::$purged);
} }
public function test_enabled_no_cache() public function test_enabled_no_cache()