Skip to content

Commit bbed1aa

Browse files
committed
Merge branch 'mrrobot47-move-compatibility-of-args' into develop-v4
2 parents e575ef4 + 29513bd commit bbed1aa

File tree

1 file changed

+0
-48
lines changed

1 file changed

+0
-48
lines changed

php/EE/Runner.php

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -546,54 +546,6 @@ public function init_config() {
546546
unset( $assoc_args['version'] );
547547
}
548548

549-
if ( isset( $args[0] ) && 'site' === $args[0] ) {
550-
551-
$ee3_compat_array_map_to_type = [
552-
'wp' => [ 'type' => 'wp' ],
553-
'wpsubdom' => [ 'type' => 'wp', 'mu' => 'subdom' ],
554-
'wpsubdir' => [ 'type' => 'wp', 'mu' => 'subdir' ],
555-
'wpredis' => [ 'type' => 'wp', 'cache' => true ],
556-
'html' => [ 'type' => 'html' ],
557-
];
558-
559-
foreach ( $ee3_compat_array_map_to_type as $from => $to ) {
560-
if ( isset( $assoc_args[ $from ] ) ) {
561-
$assoc_args = array_merge( $assoc_args, $to );
562-
unset( $assoc_args[ $from ] );
563-
}
564-
}
565-
566-
// ee3 backward compatibility flags
567-
$wp_compat_array_map = [
568-
'user' => 'admin_user',
569-
'pass' => 'admin_pass',
570-
'email' => 'admin_email',
571-
'le' => 'letsencrypt',
572-
];
573-
574-
foreach ( $wp_compat_array_map as $from => $to ) {
575-
if ( isset( $assoc_args[ $from ] ) ) {
576-
$assoc_args[ $to ] = $assoc_args[ $from ];
577-
unset( $assoc_args[ $from ] );
578-
}
579-
}
580-
581-
// backward compatibility message
582-
$unsupported_create_old_args = array(
583-
'w3tc',
584-
'wpsc',
585-
'wpfc',
586-
'pagespeed',
587-
);
588-
589-
$old_arg = array_intersect( $unsupported_create_old_args, array_keys( $assoc_args ) );
590-
591-
$old_args = implode( ' --', $old_arg );
592-
if ( isset( $args[1] ) && 'create' === $args[1] && ! empty ( $old_arg ) ) {
593-
\EE::error( "Sorry, --$old_args flag/s is/are no longer supported in EE v4.\nPlease run `ee help " . implode( ' ', $args ) . '`.' );
594-
}
595-
}
596-
597549
list( $this->arguments, $this->assoc_args ) = [ $args, $assoc_args ];
598550

599551
$configurator->merge_array( $this->runtime_config );

0 commit comments

Comments
 (0)