aboutsummaryrefslogtreecommitdiff
path: root/tests/di
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-05 21:45:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-05 21:45:47 +0200
commit12bff3ca3122604506dd5f7f1df211eb122685b6 (patch)
tree2ef613d85cb0ff609edeb5c9cf55ca625f69f9c6 /tests/di
parentMerge branch '3.3.x' (diff)
parentMerge pull request #5583 from marc1706/ticket/15987 (diff)
downloadphpbb-12bff3ca3122604506dd5f7f1df211eb122685b6.tar.gz
phpbb-12bff3ca3122604506dd5f7f1df211eb122685b6.tar.bz2
phpbb-12bff3ca3122604506dd5f7f1df211eb122685b6.zip
Merge branch '3.3.x'
Diffstat (limited to 'tests/di')
-rw-r--r--tests/di/create_container_test.php12
-rw-r--r--tests/di/fixtures/config/production/container/environment.yml3
-rw-r--r--tests/di/fixtures/config/test/container/environment.yml3
-rw-r--r--tests/di/fixtures/ext/vendor/enabled_4/environment.yml2
4 files changed, 20 insertions, 0 deletions
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 8ecad71412..16b49d1f17 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -77,6 +77,18 @@ namespace
$this->assertTrue($container->isFrozen());
}
+ public function test_tables_mapping()
+ {
+ $this->builder->without_cache();
+ $container = $this->builder->get_container();
+ $this->assertTrue($container->hasParameter('tables'));
+ $tables = $container->getParameter('tables');
+ $this->assertGreaterThan(0, count($tables));
+ $this->assertTrue($container->hasParameter('tables.foo_bar'));
+ $this->assertTrue(isset($tables['foo_bar']));
+ $this->assertEquals($tables['acl_groups'], 'phpbb_some_other');
+ }
+
public function test_without_cache()
{
$this->builder->without_cache();
diff --git a/tests/di/fixtures/config/production/container/environment.yml b/tests/di/fixtures/config/production/container/environment.yml
index ba6b679795..2792b24162 100644
--- a/tests/di/fixtures/config/production/container/environment.yml
+++ b/tests/di/fixtures/config/production/container/environment.yml
@@ -1,5 +1,8 @@
parameters:
core: true
+ tables.acl_groups: '%core.table_prefix%acl_groups'
+ tables.acl_options: '%core.table_prefix%acl_options'
+ tables.acl_roles: '%core.table_prefix%acl_roles'
services:
config.php:
diff --git a/tests/di/fixtures/config/test/container/environment.yml b/tests/di/fixtures/config/test/container/environment.yml
index 97ebe4aee1..356eb4b008 100644
--- a/tests/di/fixtures/config/test/container/environment.yml
+++ b/tests/di/fixtures/config/test/container/environment.yml
@@ -1,5 +1,8 @@
parameters:
core: true
+ tables.acl_groups: '%core.table_prefix%acl_groups'
+ tables.acl_options: '%core.table_prefix%acl_options'
+ tables.acl_roles: '%core.table_prefix%acl_roles'
services:
config.php:
diff --git a/tests/di/fixtures/ext/vendor/enabled_4/environment.yml b/tests/di/fixtures/ext/vendor/enabled_4/environment.yml
index d0affe4fd6..d4ed5cbf24 100644
--- a/tests/di/fixtures/ext/vendor/enabled_4/environment.yml
+++ b/tests/di/fixtures/ext/vendor/enabled_4/environment.yml
@@ -1,2 +1,4 @@
parameters:
enabled_4: true
+ tables.foo_bar: '%core.table_prefix%foo_bar'
+ tables.acl_groups: '%core.table_prefix%some_other'