[ticket/12631] Solve rebase issues

PHPBB3-12631

phpBB/phpbb/di/extension/container_configuration.php

@@ -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()

phpBB/phpbb/di/extension/core.php

@@ -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)

phpBB/phpbb/finder/factory.php

@@ -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
 	*/

tests/mock/container_builder.php

@@ -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);
 	}