Merge pull request #1440 from EasyEngine/update/migrations

Update migrations and img versions for PHP update

Author: mrrobot47

img-versions.json

@@ -4,10 +4,12 @@
     "easyengine/mariadb": "v4.0.0",
     "easyengine/nginx-proxy": "v4.0.3",
     "easyengine/nginx": "v4.0.3",
-    "easyengine/php": "v4.0.3",
+    "easyengine/php": "v4.1.0",
     "easyengine/php5.6": "v4.0.0",
-    "easyengine/php7.0": "v4.0.0",
-    "easyengine/php7.3": "v4.0.0",
+    "easyengine/php7.0": "v4.1.0",
+    "easyengine/php7.2": "v4.1.0",
+    "easyengine/php7.3": "v4.1.0",
+    "easyengine/php7.4": "v4.1.0",
     "easyengine/postfix": "v4.0.0",
     "easyengine/redis": "v4.0.0",
     "easyengine/newrelic-daemon": "v4.0.0"

php/EE/Migration/CustomContainerMigrations.php

@@ -207,7 +207,7 @@ private static function get_migration_path( $migration_name ) {
 	 */
 	private static function get_migration_class_name( $migration_name ) {
 		// Remove date and package name from it
-		$class_name = preg_replace( '/(^\d*)[_]([a-zA-Z-]*[_])/', '', rtrim( $migration_name, '.php' ) );
+		$class_name = preg_replace( '/(^\d*)[_]([a-zA-Z-]*[_])/', '', substr( $migration_name, 0, -4 ) );
 		// Convet snake_case to CamelCase
 		$class_name = self::camelize( $class_name );
 		// Replace dot with underscore

php/class-ee-docker.php

@@ -253,6 +253,11 @@ public static function create_volumes( $prefix, $volumes, $update_to_docker_pref
 			if ( ! empty( $volume['skip_volume'] ) && true === $volume['skip_volume'] ) {
 				continue;
 			}
+			$vol_check = EE::launch( 'docker volume inspect ' . $volume_prefix . '_' . $volume['name'] );
+			// Skip if volume already exists.
+			if ( 0 === $vol_check->return_code ) {
+				continue;
+			}
 			$path_to_symlink_not_empty = ! empty( dirname( $volume['path_to_symlink'] ) );
 			if ( $path_to_symlink_not_empty ) {
 				$fs->mkdir( dirname( $volume['path_to_symlink'] ) );