Add less than support

Author: michaelw85

tests/tests/TestBehatTags.php

@@ -200,17 +200,19 @@ public function test_behat_tags_db_version(): void {
 		$behat_tags = dirname( dirname( __DIR__ ) ) . '/utils/behat-tags.php';
 		require $behat_tags;
 		// @phpstan-ignore-next-line
-		$minimum_db_version = get_db_version() . '.1';
+		$db_version         = get_db_version();
+		$minimum_db_version = $db_version . '.1';
 
 		$contents  = '';
 		$expecteds = array();
 
 		switch ( $db_type ) {
 			case 'mariadb':
-				$contents    = "@require-mariadb-$minimum_db_version";
+				$contents    = "@require-mariadb-$minimum_db_version @less-than-mariadb-$db_version";
 				$expecteds[] = '~@require-mysql';
 				$expecteds[] = '~@require-sqlite';
 				$expecteds[] = "~@require-mariadb-$minimum_db_version";
+				$expecteds[] = "~@require-mariadb-$db_version";
 				break;
 			case 'sqlite':
 				$expecteds[] = '~@require-mariadb';
@@ -219,10 +221,11 @@ public function test_behat_tags_db_version(): void {
 				break;
 			case 'mysql':
 			default:
-				$contents    = "@require-mysql-$minimum_db_version";
+				$contents    = "@require-mysql-$minimum_db_version @less-than-mysql-$db_version";
 				$expecteds[] = '~@require-mariadb';
 				$expecteds[] = '~@require-sqlite';
 				$expecteds[] = "~@require-mysql-$minimum_db_version";
+				$expecteds[] = "~@require-mysql-$db_version";
 				break;
 		}
 

utils/behat-tags.php

@@ -84,9 +84,16 @@ function get_db_version() {
 	$skip_tags[] = '@broken-trunk';
 }
 
+$db_version = get_db_version();
+
 switch ( getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
 	case 'mariadb':
-		$skip_tags = array_merge( $skip_tags, [ '@require-mysql', '@require-sqlite' ], version_tags( 'require-mariadb', get_db_version(), '<', $features_folder ) );
+		$skip_tags = array_merge(
+			$skip_tags,
+			[ '@require-mysql', '@require-sqlite' ],
+			version_tags( 'require-mariadb', $db_version, '<', $features_folder ),
+			version_tags( 'less-than-mariadb', $db_version, '>=', $features_folder )
+		);
 		break;
 	case 'sqlite':
 		$skip_tags[] = '@require-mariadb';
@@ -95,7 +102,12 @@ function get_db_version() {
 		break;
 	case 'mysql':
 	default:
-		$skip_tags = array_merge( $skip_tags, [ '@require-mariadb', '@require-sqlite' ], version_tags( 'require-mysql', get_db_version(), '<', $features_folder ) );
+		$skip_tags = array_merge(
+			$skip_tags,
+			[ '@require-mariadb', '@require-sqlite' ],
+			version_tags( 'require-mysql', $db_version, '<', $features_folder ),
+			version_tags( 'less-than-mysql', $db_version, '>=', $features_folder )
+		);
 		break;
 }