Merge branch 'mrrobot47-update/migration-trigger' into develop-v4

Author: mbtamuli

php/EE/Runner.php

@@ -795,20 +795,26 @@ private function auto_check_update() {
 	}
 
 	/**
-	 * Triggers migration if current phar version > version in ee_option table
+	 * Triggers migration if current phar version > version in ee_option table.
+	 * Also, trigger migrations if phar version >= version in ee_option table but nightly version differ.
 	 */
 	private function maybe_trigger_migration() {
+
 		$db_version      = Option::get( 'version' );
-		$current_version = preg_replace( '/-nightly.*$/', '', EE_VERSION );
+		$current_version = EE_VERSION;
 
 		if ( ! $db_version ) {
 			$this->trigger_migration( $current_version );
+
 			return;
 		}
 
-		if ( Comparator::lessThan( $current_version, $db_version ) ) {
-			EE::error( 'It seems you\'re not running latest version. Please download and run latest version of EasyEngine' );
-		} elseif ( Comparator::greaterThan( $current_version, $db_version ) ) {
+		$base_db_version      = preg_replace( '/-nightly.*$/', '', $db_version );
+		$base_current_version = preg_replace( '/-nightly.*$/', '', EE_VERSION );
+
+		if ( Comparator::lessThan( $base_current_version, $base_db_version ) ) {
+			EE::error( 'It seems you\'re not running latest version. Please download and run latest version of EasyEngine.' );
+		} elseif ( $db_version !== $current_version ) {
 			EE::log( 'Executing migrations. This might take some time.' );
 			$this->trigger_migration( $current_version );
 		}