Merge pull request #162 from michaelw85/96_filter_multiple_values

swissspidy · web-flow · commit e3d89d9a2301 · 2025-01-07T17:12:30.000+01:00
diff --git a/features/language-core.feature b/features/language-core.feature
@@ -535,3 +535,16 @@ Feature: Manage translation files for a WordPress install
       """
       en_US
       """
+
+    @require-wp-4.0
+    Scenario: List languages by multiple statuses
+      Given a WP install
+      And an empty cache
+      And I run `wp language core install nl_NL`
+
+      When I run `wp language core list --fields=language,status --status=active,installed`
+      Then STDOUT should be a table containing rows:
+        | language  | status     |
+        | en_US     | active     |
+        | nl_NL     | installed  |
+      And STDERR should be empty
diff --git a/features/language-plugin.feature b/features/language-plugin.feature
@@ -439,3 +439,16 @@ Feature: Manage translation files for a WordPress install
       jetpack,invalid_lang,"not available"
       """
     And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: List languages by multiple statuses
+    Given a WP install
+    And an empty cache
+    And I run `wp language plugin install akismet nl_NL`
+
+    When I run `wp language plugin list --all --fields=plugin,language,status --status=active,installed`
+    Then STDOUT should be a table containing rows:
+      | plugin   | language | status    |
+      | akismet  | en_US    | active    |
+      | akismet  | nl_NL    | installed |
+    And STDERR should be empty
diff --git a/features/language-theme.feature b/features/language-theme.feature
@@ -314,3 +314,17 @@ Feature: Manage translation files for a WordPress install
       twentysixteen,de_DE,"not installed"
       """
     And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: List languages by multiple statuses
+    Given a WP install
+    And an empty cache
+    And I run `wp theme install twentyten --force`
+    And I run `wp language theme install twentyten nl_NL`
+
+    When I run `wp language theme list twentyten --fields=language,status --status=active,installed`
+    Then STDOUT should be a table containing rows:
+      | language | status    |
+      | en_US    | active    |
+      | nl_NL    | installed |
+    And STDERR should be empty
diff --git a/src/Core_Language_Command.php b/src/Core_Language_Command.php
@@ -126,7 +126,7 @@ function ( $translation ) use ( $available, $current_locale, $updates ) {
 
 		foreach ( $translations as $key => $translation ) {
 			foreach ( array_keys( $translation ) as $field ) {
-				if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {
+				if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {
 					unset( $translations[ $key ] );
 				}
 			}
diff --git a/src/Plugin_Language_Command.php b/src/Plugin_Language_Command.php
@@ -154,7 +154,7 @@ public function list_( $args, $assoc_args ) {
 
 				// Support features like --status=active.
 				foreach ( array_keys( $translation ) as $field ) {
-					if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {
+					if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {
 						continue 2;
 					}
 				}
diff --git a/src/Theme_Language_Command.php b/src/Theme_Language_Command.php
@@ -160,7 +160,7 @@ function ( $file ) {
 
 				// Support features like --status=active.
 				foreach ( array_keys( $translation ) as $field ) {
-					if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {
+					if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {
 						continue 2;
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ function ( $translation ) use ( $available, $current_locale, $updates ) {`
`126`	`126`
`127`	`127`	`foreach ( $translations as $key => $translation ) {`
`128`	`128`	`foreach ( array_keys( $translation ) as $field ) {`
`129`		`- if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {`
	`129`	`+ if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {`
`130`	`130`	`unset( $translations[ $key ] );`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function list_( $args, $assoc_args ) {`
`154`	`154`
`155`	`155`	`// Support features like --status=active.`
`156`	`156`	`foreach ( array_keys( $translation ) as $field ) {`
`157`		`- if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {`
	`157`	`+ if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {`
`158`	`158`	`continue 2;`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ function ( $file ) {`
`160`	`160`
`161`	`161`	`// Support features like --status=active.`
`162`	`162`	`foreach ( array_keys( $translation ) as $field ) {`
`163`		`- if ( isset( $assoc_args[ $field ] ) && $assoc_args[ $field ] !== $translation[ $field ] ) {`
	`163`	`+ if ( isset( $assoc_args[ $field ] ) && ! in_array( $translation[ $field ], array_map( 'trim', explode( ',', $assoc_args[ $field ] ) ), true ) ) {`
`164`	`164`	`continue 2;`
`165`	`165`	`}`
`166`	`166`	`}`