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

Merge remote-tracking branch 'upstream/develop' into ticket/11015

Browse Source 
* upstream/develop: (31 commits)
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11152] Basic tests for the container functions
  [ticket/11152] Compile the install container
  [ticket/11152] Throw error if services.yml is missing
  [ticket/11152] Remove old container processor calls
  [ticket/11152] Use realpath in container extensions consistently
  [ticket/11152] Rename collection to collection_pass
  [ticket/11152] Remove @api docblocks
  [ticket/11152] Create separate function for debug-dependent container
  [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
  [ticket/11152] Convert cron_task_collection to generic di_service_collection
  [ticket/11152] Use relative root path in container, one dumped container per path
  [ticket/11152] Move container functions to a separate function file
  [feature/compiled-dic] Rename $phpEx to $php_ext in new code
  [feature/compiled-dic] Use an absolute path for core.root_path parameter
  [feature/compiled-dic] Update the composer.lock file
  [feature/compiled-dic] Purge cache to make ext services available right away
  [feature/compiled-dic] Fix root path when container is created after install
  [feature/compiled-dic] Remove old test
  ...
This commit is contained in:
Igor Wiedler
2012-11-12 10:46:21 +01:00
parent 9bc9ac281a 5a5e507a14
commit bf641a7f31
27 changed files with 1463 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
phpBB/includes/extension/controller.php
View File

@@ -1,84 +0,0 @@
<?php
/**
*
* @package extension
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Abstract class extended by extension front controller classes
*
* @package extension
*/
abstract class phpbb_extension_controller implements phpbb_extension_controller_interface
{
/**
* Request class object
* @var phpbb_request
*/
protected $request;
/**
* DBAL class object
* @var dbal
*/
protected $db;
/**
* User class object
* @var phpbb_user
*/
protected $user;
/**
* Template class object
* @var phpbb_template
*/
protected $template;
/**
* Config object
* @var phpbb_config
*/
protected $config;
/**
* PHP Extension
* @var string
*/
protected $php_ext;
/**
* Relative path to board root
* @var string
*/
protected $phpbb_root_path;
/**
* Constructor method that provides the common phpBB objects as inherited class
* properties for automatic availability in extension controllers
*/
public function __construct()
{
global $request, $db, $user, $template, $config;
global $phpEx, $phpbb_root_path;
$this->request = $request;
$this->db = $db;
$this->user = $user;
$this->template = $template;
$this->config = $config;
$this->php_ext = $phpEx;
$this->phpbb_root_path = $phpbb_root_path;
}
}

31
phpBB/includes/extension/controller_interface.php
View File

@@ -1,31 +0,0 @@
<?php
/**
*
* @package extension
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* The interface that extension classes have to implement to run front pages
*
* @package extension
*/
interface phpbb_extension_controller_interface
{
/**
* Handle the request to display a page from an extension
*
* @return null
*/
public function handle();
}

10
phpBB/includes/extension/manager.php
View File

@@ -195,7 +195,7 @@ class phpbb_extension_manager
if ($this->cache)
{
$this->cache->destroy($this->cache_name);
$this->cache->purge();
}
return !$active;
@@ -252,7 +252,7 @@ class phpbb_extension_manager
if ($this->cache)
{
$this->cache->destroy($this->cache_name);
$this->cache->purge();
}
return true;
@@ -272,7 +272,7 @@ class phpbb_extension_manager
if ($this->cache)
{
$this->cache->destroy($this->cache_name);
$this->cache->purge();
}
return false;
@@ -335,7 +335,7 @@ class phpbb_extension_manager
if ($this->cache)
{
$this->cache->destroy($this->cache_name);
$this->cache->purge();
}
return true;
@@ -349,7 +349,7 @@ class phpbb_extension_manager
if ($this->cache)
{
$this->cache->destroy($this->cache_name);
$this->cache->purge();
}
return false;