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

* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php

phpBB/phpbb/di/extension/config.php

@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\Config\FileLocator;
+
+/**
+* Container config extension
+*/
+class phpbb_di_extension_config extends Extension
+{
+	public function __construct($config_file)
+	{
+		$this->config_file = $config_file;
+	}
+
+	/**
+	* Loads a specific configuration.
+	*
+	* @param array            $config    An array of configuration values
+	* @param ContainerBuilder $container A ContainerBuilder instance
+	*
+	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	*/
+	public function load(array $config, ContainerBuilder $container)
+	{
+		require($this->config_file);
+
+		$container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/'));
+		$container->setParameter('core.table_prefix', $table_prefix);
+		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
+		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
+		$container->setParameter('dbal.dbhost', $dbhost);
+		$container->setParameter('dbal.dbuser', $dbuser);
+		$container->setParameter('dbal.dbpasswd', $dbpasswd);
+		$container->setParameter('dbal.dbname', $dbname);
+		$container->setParameter('dbal.dbport', $dbport);
+		$container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
+	}
+
+	/**
+	* Returns the recommended alias to use in XML.
+	*
+	* This alias is also the mandatory prefix to use when using YAML.
+	*
+	* @return string The alias
+	*/
+	public function getAlias()
+	{
+		return 'config';
+	}
+
+	/**
+	* Convert 3.0 ACM type to 3.1 cache driver class name
+	*
+	* @param string $acm_type ACM type
+	* @return cache driver class
+	*/
+	protected function convert_30_acm_type($acm_type)
+	{
+		if (preg_match('#^[a-z]+$#', $acm_type))
+		{
+			return 'phpbb_cache_driver_'.$acm_type;
+		}
+
+		return $acm_type;
+	}
+}

phpBB/phpbb/di/extension/core.php

@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\Config\FileLocator;
+
+/**
+* Container core extension
+*/
+class phpbb_di_extension_core extends Extension
+{
+	/**
+	* Config path
+	* @var string
+	*/
+	protected $config_path;
+
+	/**
+	* Constructor
+	*
+	* @param string $config_path Config path
+	*/
+	public function __construct($config_path)
+	{
+		$this->config_path = $config_path;
+	}
+
+	/**
+	* Loads a specific configuration.
+	*
+	* @param array            $config    An array of configuration values
+	* @param ContainerBuilder $container A ContainerBuilder instance
+	*
+	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	*/
+	public function load(array $config, ContainerBuilder $container)
+	{
+		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
+		$loader->load('services.yml');
+	}
+
+	/**
+	* Returns the recommended alias to use in XML.
+	*
+	* This alias is also the mandatory prefix to use when using YAML.
+	*
+	* @return string The alias
+	*/
+	public function getAlias()
+	{
+		return 'core';
+	}
+}

phpBB/phpbb/di/extension/ext.php

@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\Config\FileLocator;
+
+/**
+* Container ext extension
+*/
+class phpbb_di_extension_ext extends Extension
+{
+	protected $paths = array();
+
+	public function __construct($enabled_extensions)
+	{
+		foreach ($enabled_extensions as $ext => $path)
+		{
+			$this->paths[] = $path;
+		}
+	}
+
+	/**
+	* Loads a specific configuration.
+	*
+	* @param array            $config    An array of configuration values
+	* @param ContainerBuilder $container A ContainerBuilder instance
+	*
+	* @throws InvalidArgumentException When provided tag is not defined in this extension
+	*/
+	public function load(array $config, ContainerBuilder $container)
+	{
+		foreach ($this->paths as $path)
+		{
+			if (file_exists($path . '/config/services.yml'))
+			{
+				$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($path . '/config')));
+				$loader->load('services.yml');
+			}
+		}
+	}
+
+	/**
+	* Returns the recommended alias to use in XML.
+	*
+	* This alias is also the mandatory prefix to use when using YAML.
+	*
+	* @return string The alias
+	*/
+	public function getAlias()
+	{
+		return 'ext';
+	}
+}

phpBB/phpbb/di/pass/collection_pass.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+* Appends an add method call to the definition of each collection service for
+* the services tagged with the appropriate name defined in the collection's
+* service_collection tag.
+*/
+class phpbb_di_pass_collection_pass implements CompilerPassInterface
+{
+	/**
+	* Modify the container before it is passed to the rest of the code
+	*
+	* @param ContainerBuilder $container ContainerBuilder object
+	* @return null
+	*/
+	public function process(ContainerBuilder $container)
+	{
+		foreach ($container->findTaggedServiceIds('service_collection') as $id => $data)
+		{
+			$definition = $container->getDefinition($id);
+
+			foreach ($container->findTaggedServiceIds($data[0]['tag']) as $service_id => $service_data)
+			{
+				$definition->addMethodCall('add', array($service_id));
+			}
+		}
+	}
+}

phpBB/phpbb/di/pass/kernel_pass.php

@@ -0,0 +1,68 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class phpbb_di_pass_kernel_pass implements CompilerPassInterface
+{
+	/**
+	* Modify the container before it is passed to the rest of the code
+	*
+	* @param ContainerBuilder $container ContainerBuilder object
+	* @return null
+	*/
+	public function process(ContainerBuilder $container)
+	{
+		$definition = $container->getDefinition('dispatcher');
+
+		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
+		{
+			foreach ($events as $event)
+			{
+				$priority = isset($event['priority']) ? $event['priority'] : 0;
+
+				if (!isset($event['event']))
+				{
+					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id));
+				}
+
+				if (!isset($event['method']))
+				{
+					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id));
+				}
+
+				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
+			}
+		}
+
+		foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes)
+		{
+			// We must assume that the class value has been correctly filled, even if the service is created by a factory
+			$class = $container->getDefinition($id)->getClass();
+
+			$refClass = new ReflectionClass($class);
+			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
+			if (!$refClass->implementsInterface($interface))
+			{
+				throw new InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface));
+			}
+
+			$definition->addMethodCall('addSubscriberService', array($id, $class));
+		}
+	}
+}

phpBB/phpbb/di/service_collection.php

@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package phpBB3
+* @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;
+}
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+* Collection of services to be configured at container compile time.
+*
+* @package phpBB3
+*/
+class phpbb_di_service_collection extends ArrayObject
+{
+	/**
+	* Constructor
+	*
+	* @param ContainerInterface $container Container object
+	*/
+	public function __construct(ContainerInterface $container)
+	{
+		$this->container = $container;
+	}
+
+	/**
+	* Add a service to the collection
+	*
+	* @param string $name The service name
+	* @return null
+	*/
+	public function add($name)
+	{
+		$task = $this->container->get($name);
+
+		$this->offsetSet($name, $task);
+	}
+}