[ticket/14742] Make $last_run_migration protected

Elsensee · Elsensee · commit b00a39b9adec · 2016-08-11T17:59:51.000+02:00
PHPBB3-14742
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
@@ -211,13 +211,6 @@ function phpbb_end_update($cache, $config)
 		phpbb_end_update($cache, $config);
 	}
 
-	$state = array_merge(array(
-			'migration_schema_done' => false,
-			'migration_data_done'	=> false,
-		),
-		$migrator->last_run_migration['state']
-	);
-
 	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
@@ -80,7 +80,7 @@ class migrator
 	*
 	* @var array
 	*/
-	public $last_run_migration = false;
+	protected $last_run_migration = false;
 
 	/**
 	 * The output handler. A null handler is configured by default.
@@ -160,6 +160,19 @@ public function load_migration_state()
 		$this->db->sql_return_on_error(false);
 	}
 
+	/**
+	 * Get an array with information about the last migration run.
+	 *
+	 * The array contains 'name', 'class' and 'state'. 'effectively_installed' is set
+	 * and set to true if the last migration was effectively_installed.
+	 *
+	 * @return array
+	 */
+	public function get_last_run_migration()
+	{
+		return $this->last_run_migration;
+	}
+
 	/**
 	* Sets the list of available migration class names to the given array.
 	*

Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,6 @@ function phpbb_end_update($cache, $config)`
`211`	`211`	`phpbb_end_update($cache, $config);`
`212`	`212`	`}`
`213`	`213`
`214`		`- $state = array_merge(array(`
`215`		`- 'migration_schema_done' => false,`
`216`		`- 'migration_data_done' => false,`
`217`		`- ),`
`218`		`- $migrator->last_run_migration['state']`
`219`		`- );`
`220`		`-`
`221`	`214`	`// Are we approaching the time limit? If so we want to pause the update and continue after refreshing`
`222`	`215`	`if ((time() - $update_start_time) >= $safe_time_limit)`
`223`	`216`	`{`