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

[ticket/12631] Solve rebase issues

Browse source 
PHPBB3-12631
This commit is contained in:
rubencm 2019-04-02 17:51:12 +00:00 • committed by Marc Alexander
parent d31e986815
commit 0312aaa6dc
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/di/extension/container_configuration.php
View file

@ -64,6 +64,8 @@ class container_configuration implements ConfigurationInterface
->children()
->booleanNode('force_sid')->defaultValue(false)->end()
->booleanNode('log_errors')->defaultValue(false)->end()
->end()
->end()
->arrayNode('finder')
->addDefaultsIfNotSet()
->children()

1
phpBB/phpbb/di/extension/core.php
View file

@ -117,6 +117,7 @@ class core extends Extension
foreach ($config['session'] as $name => $value)
{
$container->setParameter('session.' . $name, $value);
}
// Set the finder options
foreach ($config['finder'] as $name => $value)

2
phpBB/phpbb/finder/factory.php
View file

@ -27,7 +27,7 @@ class factory
* Creates a new finder instance with its dependencies
*
* @param \phpbb\cache\service $cache A cache instance or null
* @param bool $not_use_cache Use cache or not
* @param bool $use_cache Use cache or not
* @param string $phpbb_root_path Path to the phpbb root directory
* @param string $php_ext php file extension
*/

1
tests/mock/container_builder.php
View file

@ -23,7 +23,6 @@ class phpbb_mock_container_builder implements ContainerInterface
$this->setParameter('debug.load_time', false);
$this->setParameter('session.log_errors', false);
$this->setParameter('session.force_sid', true);
$this->setParameter('finder.not_use_cache', false);
$this->setParameter('finder.cache', false);
}