mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00
Code Issues Releases Wiki Activity

[ticket/13770] Update tests

Browse Source 
PHPBB3-13770
This commit is contained in:
Tristan Darricau 2015-04-26 21:30:50 +02:00 committed by Nicofuma
parent c96e7ef171
commit 549fe66d90
6 changed files with 44 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/install/index.php
View File

@ -118,7 +118,6 @@ $phpbb_class_loader_ext->register();
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder
->with_config($phpbb_config_php_file)
->without_extensions()
->without_cache()
->without_compiled_container()

5
phpBB/phpbb/di/container_builder.php
View File

@ -142,7 +142,10 @@ class container_builder
}
// Inject the config
$this->container_extensions[] = new extension\config($this->config_php_file);
if ($this->config_php_file)
{
$this->container_extensions[] = new extension\config($this->config_php_file);
}
$this->container = $this->create_container($this->container_extensions);

89
tests/di/create_container_test.php
View File

@ -31,7 +31,8 @@ namespace
{
$this->phpbb_root_path = dirname(__FILE__) . '/';
$this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php');
$this->builder = new phpbb_mock_phpbb_di_container_builder($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php');
$this->builder = new phpbb_mock_phpbb_di_container_builder($this->phpbb_root_path . 'fixtures/', 'php');
$this->builder->with_config($this->config_php);
$this->filename = $this->phpbb_root_path . '../tmp/container.php';
if (is_file($this->filename))
@ -78,9 +79,9 @@ namespace
$this->assertTrue($container->isFrozen());
}
public function test_dump_container()
public function test_without_cache()
{
$this->builder->set_dump_container(false);
$this->builder->without_cache();
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
@ -94,9 +95,9 @@ namespace
$this->assertTrue($container->isFrozen());
}
public function test_use_extensions()
public function test_without_extensions()
{
$this->builder->set_use_extensions(false);
$this->builder->without_extensions();
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
@ -109,9 +110,9 @@ namespace
$this->assertFalse($container->hasParameter('available'));
}
public function test_compile_container()
public function test_without_compiled_container()
{
$this->builder->set_compile_container(false);
$this->builder->without_compiled_container();
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
@ -119,19 +120,9 @@ namespace
$this->assertFalse($container->isFrozen());
}
public function test_inject_config()
public function test_with_config_path()
{
$this->builder->set_inject_config(false);
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks inject_config
$this->assertFalse($container->hasParameter('dbal.dbhost'));
}
public function test_set_config_path()
{
$this->builder->set_config_path($this->phpbb_root_path . 'fixtures/other_config/');
$this->builder->with_config_path($this->phpbb_root_path . 'fixtures/other_config/');
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
@ -139,9 +130,9 @@ namespace
$this->assertFalse($container->hasParameter('core'));
}
public function test_set_custom_parameters()
public function test_with_custom_parameters()
{
$this->builder->set_custom_parameters(array('my_parameter' => true));
$this->builder->with_custom_parameters(array('my_parameter' => true));
$container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
@ -150,61 +141,21 @@ namespace
}
}
namespace phpbb\db\driver
namespace phpbb\extension
{
class container_mock extends \phpbb\db\driver\driver
class manager_mock extends \phpbb\extension\manager
{
public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
public function __construct()
{
}
public function sql_query($query = '', $cache_ttl = 0)
{
}
public function sql_fetchrow($query_id = false)
{
}
public function sql_freeresult($query_id = false)
{
}
function sql_server_info($raw = false, $use_cache = true)
{
}
function sql_affectedrows()
{
}
function sql_rowseek($rownum, &$query_id)
{
}
function sql_nextid()
{
}
function sql_escape($msg)
{
}
function sql_like_expression($expression)
{
}
function sql_not_like_expression($expression)
{
}
function sql_fetchrowset($query_id = false)
public function all_enabled($phpbb_relative = true)
{
return array(
array('ext_name' => 'vendor/enabled'),
array('ext_name' => 'vendor/enabled-2'),
array('ext_name' => 'vendor/enabled-3'),
array('ext_name' => 'vendor/enabled_4'),
'vendor/enabled' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled/',
'vendor/enabled-2' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-2/',
'vendor/enabled-3' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-3/',
'vendor/enabled_4' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/',
);
}
}

2
tests/di/fixtures/config.php
View File

@ -1,7 +1,7 @@
<?php
// phpBB 3.1.x auto-generated configuration file
// Do not change anything in this file!
$dbms = 'container_mock';
$dbms = 'mysql';
$dbhost = '127.0.0.1';
$dbport = '';
$dbname = 'phpbb';

2
tests/di/fixtures/config/production/config.yml Normal file
View File

@ -0,0 +1,2 @@
core:
require_dev_dependencies: true

17
tests/di/fixtures/config/production/container/environment.yml Normal file
View File

@ -0,0 +1,17 @@
parameters:
core: true
services:
config.php:
synthetic: true
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
dispatcher:
class: phpbb\db\driver\container_mock
ext.manager:
class: phpbb\extension\manager_mock