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

[ticket/15087] Optimize creation of metadata objects by caching

Browse source 
Code for [ticket/15080] Save unneeded file loads for extension
metadata for phpbb 3.2.

PHPBB3-15087
This commit is contained in:
javiexin 2017-02-12 14:39:26 +01:00
parent 5266821e1b
commit d3a687df27
1 changed files with 16 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
phpBB/phpbb/extension/metadata_manager.php
View file

@ -81,13 +81,11 @@ class metadata_manager
*/
public function get_metadata($element = 'all')
{
$this->set_metadata_file();
// Fetch the metadata
$this->fetch_metadata();
// Clean the metadata
$this->clean_metadata_array();
// Fetch and clean the metadata if not done yet
if ($this->metadata === array())
{
$this->fetch_metadata_from_file();
}
switch ($element)
{
@ -121,37 +119,20 @@ class metadata_manager
}
/**
* Sets the filepath of the metadata file
* Sets the path of the metadata file, gets its contents and cleans loaded file
*
* @throws \phpbb\extension\exception
*/
private function set_metadata_file()
private function fetch_metadata_from_file()
{
$ext_filepath = $this->extension_manager->get_extension_path($this->ext_name);
$metadata_filepath = $this->phpbb_root_path . $ext_filepath . 'composer.json';
$this->metadata_file = $metadata_filepath;
$this->metadata_file = $this->phpbb_root_path . $ext_filepath . 'composer.json';
if (!file_exists($this->metadata_file))
{
throw new \phpbb\extension\exception('FILE_NOT_FOUND', array($this->metadata_file));
}
}
/**
* Gets the contents of the composer.json file
*
* @return bool True if success, throws an exception on failure
* @throws \phpbb\extension\exception
*/
private function fetch_metadata()
{
if (!file_exists($this->metadata_file))
{
throw new \phpbb\extension\exception('FILE_NOT_FOUND', array($this->metadata_file));
}
else
{
if (!($file_contents = file_get_contents($this->metadata_file)))
{
throw new \phpbb\extension\exception('FILE_CONTENT_ERR', array($this->metadata_file));
@ -164,9 +145,6 @@ class metadata_manager
array_walk_recursive($metadata, array($this, 'sanitize_json'));
$this->metadata = $metadata;
return true;
}
}
/**
@ -180,16 +158,6 @@ class metadata_manager
$value = htmlspecialchars($value);
}
/**
* This array handles the cleaning of the array
*
* @return array Contains the cleaned metadata array
*/
private function clean_metadata_array()
{
return $this->metadata;
}
/**
* Validate fields
*