Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631

Conflicts:
	phpBB/common.php
	phpBB/download/file.php

phpBB/config/.htaccess

@@ -0,0 +1,4 @@
+<Files *>
+	Order Allow,Deny
+	Deny from All
+</Files>

phpBB/config/cron_tasks.yml

@@ -0,0 +1,75 @@
+services:
+    cron.task.core.prune_all_forums:
+        class: phpbb_cron_task_core_prune_all_forums
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+            - @dbal.conn
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.prune_forum:
+        class: phpbb_cron_task_core_prune_forum
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+            - @dbal.conn
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.queue:
+        class: phpbb_cron_task_core_queue
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.tidy_cache:
+        class: phpbb_cron_task_core_tidy_cache
+        arguments:
+            - @config
+            - @cache.driver
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.tidy_database:
+        class: phpbb_cron_task_core_tidy_database
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.tidy_search:
+        class: phpbb_cron_task_core_tidy_search
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.tidy_sessions:
+        class: phpbb_cron_task_core_tidy_sessions
+        arguments:
+            - @config
+            - @user
+        tags:
+            - { name: cron.task }
+
+    cron.task.core.tidy_warnings:
+        class: phpbb_cron_task_core_tidy_warnings
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+        tags:
+            - { name: cron.task }

phpBB/config/services.yml

@@ -0,0 +1,136 @@
+imports:
+    - { resource: tables.yml }
+    - { resource: cron_tasks.yml }
+
+services:
+    auth:
+        class: phpbb_auth
+
+    cache:
+        class: phpbb_cache_service
+        arguments:
+             - @cache.driver
+
+    cache.driver:
+        class: %cache.driver.class%
+
+    cache.driver.install:
+        class: phpbb_cache_driver_file
+
+    class_loader:
+        class: phpbb_class_loader
+        arguments:
+            - phpbb_
+            - %core.root_path%includes/
+            - .%core.php_ext%
+        calls:
+            - [register, []]
+            - [set_cache, [@cache.driver]]
+
+    class_loader.ext:
+        class: phpbb_class_loader
+        arguments:
+            - phpbb_ext_
+            - %core.root_path%ext/
+            - .%core.php_ext%
+        calls:
+            - [register, []]
+            - [set_cache, [@cache.driver]]
+
+    config:
+        class: phpbb_config_db
+        arguments:
+            - @dbal.conn
+            - @cache.driver
+            - %tables.config%
+
+    cron.task_provider:
+        class: phpbb_cron_task_provider
+        arguments:
+            - @container
+
+    cron.manager:
+        class: phpbb_cron_manager
+        arguments:
+            - @cron.task_provider
+            - %core.root_path%
+            - %core.php_ext%
+
+    cron.lock_db:
+        class: phpbb_lock_db
+        arguments:
+            - cron_lock
+            - @config
+            - @dbal.conn
+
+    dispatcher:
+        class: phpbb_event_dispatcher
+
+    dbal.conn:
+        class: %dbal.driver.class%
+        calls:
+            - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
+
+    event.subscriber_loader:
+        class: phpbb_event_extension_subscriber_loader
+        arguments:
+            - @dispatcher
+            - @ext.manager
+        calls:
+            - [load, []]
+
+    ext.manager:
+        class: phpbb_extension_manager
+        arguments:
+            - @dbal.conn
+            - @config
+            - %tables.ext%
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+
+    processor.config:
+        class: phpbb_di_processor_ext
+        arguments:
+            - @ext.manager
+        tags:
+            - { name: container.processor }
+
+    request:
+        class: phpbb_request
+
+    style:
+        class: phpbb_style
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+            - @user
+            - @style.resource_locator
+            - @style.path_provider_ext
+            - @template
+
+    style.resource_locator:
+        class: phpbb_style_resource_locator
+
+    style.path_provider_ext:
+        class: phpbb_style_extension_path_provider
+        arguments:
+            - @ext.manager
+            - @style.path_provider
+
+    style.path_provider:
+        class: phpbb_style_path_provider
+
+    template:
+        class: phpbb_template
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @config
+            - @user
+            - @style.resource_locator
+            - @style.path_provider_ext
+
+    user:
+        class: phpbb_user

phpBB/config/tables.yml

@@ -0,0 +1,3 @@
+parameters:
+    tables.config: %core.table_prefix%config
+    tables.ext: %core.table_prefix%ext