diff --git a/src/cloud.rs b/src/cloud.rs index ada7520..afa01cf 100644 --- a/src/cloud.rs +++ b/src/cloud.rs @@ -152,44 +152,44 @@ fn test_option_parse() { ..Default::default() } ); - let mut args = vec!["7"].into_iter().peekable(); + let mut args = vec!["8"].into_iter().peekable(); assert_eq!( CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions { - php: PhpVersion::Php74, + php: PhpVersion::Php80, ..Default::default() } ); - let mut args = vec!["7", "pgsql", "rest"].into_iter().peekable(); + let mut args = vec!["8.1", "pgsql", "rest"].into_iter().peekable(); assert_eq!( CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions { - php: PhpVersion::Php74, + php: PhpVersion::Php81, db: Database::Postgres, ..Default::default() } ); - let mut args = vec!["7", "ldap", "pgsql"].into_iter().peekable(); + let mut args = vec!["8", "ldap", "pgsql"].into_iter().peekable(); assert_eq!( CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions { - php: PhpVersion::Php74, + php: PhpVersion::Php80, db: Database::Postgres, services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)], ..Default::default() } ); - let mut args = vec!["7", "pgsql", "ldap"].into_iter().peekable(); + let mut args = vec!["8", "pgsql", "ldap"].into_iter().peekable(); assert_eq!( CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions { - php: PhpVersion::Php74, + php: PhpVersion::Php80, db: Database::Postgres, services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)], ..Default::default() } ); - let mut args = vec!["7", "pgsql", "ldap", "mypreset"] + let mut args = vec!["8", "pgsql", "ldap", "mypreset"] .into_iter() .peekable(); @@ -206,7 +206,7 @@ fn test_option_parse() { assert_eq!( CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions { - php: PhpVersion::Php74, + php: PhpVersion::Php80, db: Database::Postgres, services: vec![ Service::Ldap(Ldap), diff --git a/src/php.rs b/src/php.rs index b461c72..1451108 100644 --- a/src/php.rs +++ b/src/php.rs @@ -36,7 +36,7 @@ impl FromStr for PhpVersion { fn from_str(s: &str) -> Result { match s { - "8" => Ok(PhpVersion::Php81), + "8" => Ok(PhpVersion::Php80), "8.0" => Ok(PhpVersion::Php80), "8.1" => Ok(PhpVersion::Php81), "8.2" => Ok(PhpVersion::Php82),