Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop

# By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11386-3: [ticket/11386] Fix missing ; [ticket/11386] Send list of migrations instead of using load_migrations
author: David King <imkingdavid@gmail.com> 2013-03-04 15:22:29 -0500
committer: David King <imkingdavid@gmail.com> 2013-03-04 15:22:29 -0500
commit: 1148f3fca51efb60e536f2fe0d51880610f0812b (patch)
tree: 1645796b4357b5a96c37654eb38d8562c664b67d /phpBB
parent: 1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (diff)
parent: c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (diff)
download: forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar
forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.gz
forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.bz2
forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.xz
forums-1148f3fca51efb60e536f2fe0d51880610f0812b.zip
6 files changed, 118 insertions, 126 deletions
diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
index 42445ef9bf..999a2d41a3 100644
--- a/phpBB/config/migrator.yml
+++ b/phpBB/config/migrator.yml
@@ -10,8 +10,6 @@ services:
             - %core.php_ext%
             - %core.table_prefix%
             - @migrator.tool_collection
-        calls:
-            - [set_extension_manager, [@ext.manager]]
 
     migrator.tool_collection:
         class: phpbb_di_service_collection
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index e200b865e8..24e80ddaf0 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -124,12 +124,11 @@ services:
             - @service_container
             - @dbal.conn
             - @config
+            - @migrator
             - %tables.ext%
             - %core.root_path%
             - .%core.php_ext%
             - @cache.driver
-        calls:
-            - [set_migrator, [@migrator]]
 
     ext.finder:
         class: phpbb_extension_finder
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 95a28618e8..9d7cede95b 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -31,9 +31,6 @@ class phpbb_db_migrator
 	/** @var phpbb_db_tools */
 	protected $db_tools;
 
-	/** @var phpbb_extension_manager */
-	protected $extension_manager;
-
 	/** @var string */
 	protected $table_prefix;
 
@@ -96,16 +93,6 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Set Extension Manager (required)
-	*
-	* Not in constructor to prevent circular reference error
-	*/
-	public function set_extension_manager(phpbb_extension_manager $extension_manager)
-	{
-		$this->extension_manager = $extension_manager;
-	}
-
-	/**
 	* Loads all migrations and their application state from the database.
 	*
 	* @return null
@@ -148,98 +135,6 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* This function adds all migrations in a specified directory to the migrations table
-	*
-	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
-	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
-	*
-	* @param string $path Path to migration data files
-	* @param bool $recursive Set to true to also load data files from subdirectories
-	* @return null
-	*/
-	public function populate_migrations_from_directory($path, $recursive = true)
-	{
-		$existing_migrations = $this->migrations;
-
-		$this->migrations = array();
-		$this->load_migrations($path, true, $recursive);
-
-		foreach ($this->migrations as $name)
-		{
-			if ($this->migration_state($name) === false)
-			{
-				$state = array(
-					'migration_depends_on'	=> $name::depends_on(),
-					'migration_schema_done' => true,
-					'migration_data_done'	=> true,
-					'migration_data_state'	=> '',
-					'migration_start_time'	=> time(),
-					'migration_end_time'	=> time(),
-				);
-				$this->set_migration_state($name, $state);
-			}
-		}
-
-		$this->migrations = $existing_migrations;
-	}
-
-	/**
-	* Load migration data files from a directory
-	*
-	* Migration data files loaded with this function MUST contain
-	* 	ONLY ONE class in them (or an exception will be thrown).
-	*
-	* @param string $path Path to migration data files
-	* @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 (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	*/
-	public function load_migrations($path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$finder = $this->extension_manager->get_finder();
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		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);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-
-	/**
 	* Runs a single update step from the next migration to be applied.
 	*
 	* The update step can either be a schema or a (partial) data update. To
@@ -761,4 +656,85 @@ class phpbb_db_migrator
 	{
 		return new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
 	}
+
+	/**
+	* This function adds all migrations sent to it to the migrations table
+	*
+	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
+	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
+	*
+	* @param array $migrations Array of migrations (names) to add to the migrations table
+	* @return null
+	*/
+	public function populate_migrations($migrations)
+	{
+		foreach ($migrations as $name)
+		{
+			if ($this->migration_state($name) === false)
+			{
+				$state = array(
+					'migration_depends_on'	=> $name::depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> time(),
+					'migration_end_time'	=> time(),
+				);
+				$this->set_migration_state($name, $state);
+			}
+		}
+	}
+
+	/**
+	* Load migration data files from a directory
+	*
+	* @param phpbb_extension_finder $finder
+	* @param string $path Path to migration data files
+	* @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 (if including multiple directories, check
+	* 	with the last call to prevent throwing errors unnecessarily).
+	* @return array Array of migration names
+	*/
+	public function load_migrations(phpbb_extension_finder $finder, $path, $check_fulfillable = true)
+	{
+		if (!is_dir($path))
+		{
+			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
+		}
+
+		$migrations = array();
+
+		$files = $finder
+			->extension_directory("/")
+			->find_from_paths(array('/' => $path));
+		foreach ($files as $file)
+		{
+			$migrations[$file['path'] . $file['filename']] = '';
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
+
+		foreach ($migrations as $migration)
+		{
+			if (!in_array($migration, $this->migrations))
+			{
+				$this->migrations[] = $migration;
+			}
+		}
+
+		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);
+				}
+			}
+		}
+
+		return $this->migrations;
+	}
 }
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 0d760681b9..44a30c6280 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -43,18 +43,20 @@ class phpbb_extension_manager
 	* @param ContainerInterface $container A container
 	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
+	* @param phpbb_db_migrator $migrator
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $php_ext php file extension
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
+		$this->migrator = $migrator;
 		$this->cache = $cache;
 		$this->php_ext = $php_ext;
 		$this->extension_table = $extension_table;
@@ -69,14 +71,6 @@ class phpbb_extension_manager
 	}
 
 	/**
-	* Set migrator (get around circular reference)
-	*/
-	public function set_migrator(phpbb_db_migrator $migrator)
-	{
-		$this->migrator = $migrator;
-	}
-
-	/**
 	* Loads all extension information from the database
 	*
 	* @return null
@@ -528,13 +522,27 @@ class phpbb_extension_manager
 	*/
 	protected function handle_migrations($extension_name, $mode)
 	{
-		$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
-		if (!file_exists($migrations_path) || !is_dir($migrations_path))
+		$extensions = array(
+			$extension_name => $this->phpbb_root_path . $this->get_extension_path($extension_name),
+		);
+
+		$finder = $this->get_finder();
+		$migrations = array();
+		$file_list = $finder
+			->extension_directory('/migrations')
+			->find_from_paths($extensions);
+
+		if (empty($file_list))
 		{
 			return true;
 		}
 
-		$migrations = $this->migrator->load_migrations($migrations_path);
+		foreach ($file_list as $file)
+		{
+			$migrations[$file['named_path']] = $file['ext_name'];
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
+		$this->migrator->set_migrations($migrations);
 
 		// What is a safe limit of execution time? Half the max execution time should be safe.
 		$safe_time_limit = (ini_get('max_execution_time') / 2);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6c8a95a413..3382e57e76 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -210,7 +210,13 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 }
 
 $migrator = $phpbb_container->get('migrator');
-$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/');
+$extension_manager = $phpbb_container->get('ext.manager');
+$finder = $extension_manager->get_finder();
+
+$migrations = $finder
+	->core_path('includes/db/migration/data/')
+	->get_classes();
+$migrator->set_migrations($migrations);
 
 // What is a safe limit of execution time? Half the max execution time should be safe.
 $safe_time_limit = (ini_get('max_execution_time') / 2);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f0280acc40..4cc154509c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -114,7 +114,7 @@ class install_install extends module
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
 				$this->disable_avatars_if_unwritable();
-				$this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path);
+				$this->populate_migrations($phpbb_container->get('ext.manager'), $phpbb_container->get('migrator'));
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1888,12 +1888,17 @@ class install_install extends module
 	* "installs" means it adds all migrations to the migrations table, but does not
 	* perform any of the actions in the migrations.
 	*
+	* @param phpbb_extension_manager $extension_manager
 	* @param phpbb_db_migrator $migrator
-	* @param string $phpbb_root_path
 	*/
-	function populate_migrations($migrator, $phpbb_root_path)
+	function populate_migrations($extension_manager, $migrator)
 	{
-		$migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/');
+		$finder = $extension_manager->get_finder();
+
+		$migrations = $finder
+			->core_path('includes/db/migration/data/')
+			->get_classes();
+		$migrator->populate_migrations($migrations);
 	}
 
 	/**
author	David King <imkingdavid@gmail.com>	2013-03-04 15:22:29 -0500
committer	David King <imkingdavid@gmail.com>	2013-03-04 15:22:29 -0500
commit	1148f3fca51efb60e536f2fe0d51880610f0812b (patch)
tree	1645796b4357b5a96c37654eb38d8562c664b67d /phpBB
parent	1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (diff)
parent	c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (diff)
download	forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.gz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.bz2 forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.xz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.zip