8 files changed, 48 insertions, 79 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 902c6ae84c..c0ce3f1fba 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -105,7 +105,7 @@ class oauth extends \phpbb\auth\provider\base
 	protected $phpbb_root_path;
 
 	/**
-	* PHP extenstion
+	* PHP file extension
 	*
 	* @var string
 	*/
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index 68638a9515..86545c237d 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -117,17 +117,9 @@ class migrate extends \phpbb\console\command\command
 		$migrations = $this->extension_manager
 			->get_finder()
 			->core_path('phpbb/db/migration/data/')
-			->extension_directory('/migration')
-			->get_classes();
-
-		// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
-		$migrations_deprecated = $this->extension_manager
-			->get_finder()
 			->extension_directory('/migrations')
 			->get_classes();
 
-		$migrations = array_merge($migrations, $migrations_deprecated);
-
 		$this->migrator->set_migrations($migrations);
 	}
 
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index e2932086db..fc19b855c0 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -140,8 +140,15 @@ class helper
 		// If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it.
 		$base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url);
 
-		// We need to update the base url to move to the directory of the app.php file.
-		$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
+		// We need to update the base url to move to the directory of the app.php file
+		if (empty($this->config['enable_mod_rewrite']))
+		{
+			$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
+		}
+		else
+		{
+			$base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path);
+		}
 
 		$base_url = $this->filesystem->clean_path($base_url);
 
diff --git a/phpBB/phpbb/db/migration/data/v310/rc4.php b/phpBB/phpbb/db/migration/data/v310/rc4.php
new file mode 100644
index 0000000000..47de8291c1
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/rc4.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class rc4 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\rc3',
+			'\phpbb\db\migration\data\v310\notifications_use_full_name',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.0-RC4')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 43393a8935..44bea3c5d2 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -129,28 +129,11 @@ class migrator
 	* Sets the list of available migration class names to the given array.
 	*
 	* @param array $class_names An array of migration class names
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors.
 	* @return null
-	* @throws \phpbb\db\migration\exception
 	*/
-	public function set_migrations($class_names, $check_fulfillable = true)
+	public function set_migrations($class_names)
 	{
 		$this->migrations = $class_names;
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
 	}
 
 	/**
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 553b723cc8..638c13e86d 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -15,6 +15,7 @@ namespace phpbb\di;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass;
 
 class container_builder
 {
@@ -160,11 +161,13 @@ class container_builder
 
 			if ($this->use_custom_pass)
 			{
+				// Symfony Kernel Listeners
 				$this->container->addCompilerPass(new \phpbb\di\pass\collection_pass());
+				$this->container->addCompilerPass(new RegisterListenersPass('dispatcher', 'event.listener_listener', 'event.listener'));
 
 				if ($this->use_kernel_pass)
 				{
-					$this->container->addCompilerPass(new \phpbb\di\pass\kernel_pass());
+					$this->container->addCompilerPass(new RegisterListenersPass('dispatcher'));
 				}
 			}
 
diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php
deleted file mode 100644
index fc01961e9f..0000000000
--- a/phpBB/phpbb/event/extension_subscriber_loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\event;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class extension_subscriber_loader
-{
-	private $dispatcher;
-	private $listener_collection;
-
-	public function __construct(EventDispatcherInterface $dispatcher, \phpbb\di\service_collection $listener_collection)
-	{
-		$this->dispatcher = $dispatcher;
-		$this->listener_collection = $listener_collection;
-	}
-
-	public function load()
-	{
-		if (!empty($this->listener_collection))
-		{
-			foreach ($this->listener_collection as $listener)
-			{
-				$this->dispatcher->addSubscriber($listener);
-			}
-		}
-	}
-}
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index b74026e6ab..5bb530bad4 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -132,19 +132,10 @@ class base implements \phpbb\extension\extension_interface
 
 		// Only have the finder search in this extension path directory
 		$migrations = $this->extension_finder
-			->extension_directory('/migration')
-			->find_from_extension($this->extension_name, $this->extension_path);
-
-		$migrations = $this->extension_finder->get_classes_from_files($migrations);
-
-		// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
-		$migrations_deprecated = $this->extension_finder
 			->extension_directory('/migrations')
 			->find_from_extension($this->extension_name, $this->extension_path);
 
-		$migrations_deprecated = $this->extension_finder->get_classes_from_files($migrations_deprecated);
-
-		$migrations = array_merge($migrations, $migrations_deprecated);
+		$migrations = $this->extension_finder->get_classes_from_files($migrations);
 
 		return $migrations;
 	}