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

Merge pull request #4592 from javiexin/ticket/14938

Browse Source 
[ticket/14938] Inconsistency in ext_mgr all_available vs is_available
This commit is contained in:
Marc Alexander 2017-04-16 14:36:07 +02:00
commit 1cbc6dedab
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/extension/manager.php
View File

@ -149,10 +149,10 @@ class manager
* Instantiates the metadata manager for the extension with the given name
*
* @param string $name The extension name
* @param \phpbb\template\template $template The template manager
* @param \phpbb\template\template $template The template manager or null
* @return \phpbb\extension\metadata_manager Instance of the metadata manager
*/
public function create_extension_metadata_manager($name, \phpbb\template\template $template)
public function create_extension_metadata_manager($name, \phpbb\template\template $template = null)
{
return new \phpbb\extension\metadata_manager($name, $this->config, $this, $template, $this->user, $this->phpbb_root_path);
}
@ -433,25 +433,11 @@ class manager
if ($file_info->isFile() && $file_info->getFilename() == 'composer.json')
{
$ext_name = $iterator->getInnerIterator()->getSubPath();
$composer_file = $iterator->getPath() . '/composer.json';
// Ignore the extension if there is no composer.json.
if (!is_readable($composer_file) || !($ext_info = file_get_contents($composer_file)))
{
continue;
}
$ext_info = json_decode($ext_info, true);
$ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name);
// Ignore the extension if directory depth is not correct or if the directory structure
// does not match the name value specified in composer.json.
if (substr_count($ext_name, '/') !== 1 || !isset($ext_info['name']) || $ext_name != $ext_info['name'])
if ($this->is_available($ext_name))
{
continue;
$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
}
$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
}
}
ksort($available);
@ -524,7 +510,15 @@ class manager
*/
public function is_available($name)
{
return file_exists($this->get_extension_path($name, true));
$md_manager = $this->create_extension_metadata_manager($name);
try
{
return $md_manager->get_metadata('all') && $md_manager->validate_enable();
}
catch (\phpbb\extension\exception $e)
{
return false;
}
}
/**

6
phpBB/phpbb/extension/metadata_manager.php
View File

@ -66,17 +66,18 @@ class metadata_manager
*/
protected $metadata_file;
// @codingStandardsIgnoreStart
/**
* Creates the metadata manager
*
* @param string $ext_name Name (including vendor) of the extension
* @param \phpbb\config\config $config phpBB Config instance
* @param \phpbb\extension\manager $extension_manager An instance of the phpBB extension manager
* @param \phpbb\template\template $template phpBB Template instance
* @param \phpbb\template\template $template phpBB Template instance or null
* @param \phpbb\user $user User instance
* @param string $phpbb_root_path Path to the phpbb includes directory.
*/
public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path)
public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template = null, \phpbb\user $user, $phpbb_root_path)
{
$this->config = $config;
$this->extension_manager = $extension_manager;
@ -88,6 +89,7 @@ class metadata_manager
$this->metadata = array();
$this->metadata_file = '';
}
// @codingStandardsIgnoreEnd
/**
* Processes and gets the metadata requested

2
tests/mock/extension_manager.php
View File

@ -20,5 +20,7 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager
$this->extensions = $extensions;
$this->filesystem = new \phpbb\filesystem();
$this->container = $container;
$this->config = new \phpbb\config\config(array());
$this->user = new \phpbb\user('\phpbb\datetime');
}
}