Merge pull request #107 from petitphp/fix/expiration-arg

Author: swissspidy

features/cache-patch.feature

@@ -8,6 +8,7 @@ Feature: Patch command available for the object cache
       $set_foo = function(){
         wp_cache_set( 'my_key', ['foo' => 'bar'] );
         wp_cache_set( 'other_key', ['fuz' => 'biz'] );
+        wp_cache_set( 'my_key_in_group', ['fuz' => 'biz'], 'my_group' );
 
         $complex_key = (object) [
             'foo' => (object) [
@@ -34,12 +35,24 @@ Feature: Patch command available for the object cache
       Success: Updated cache key 'complex_key'.
       """
 
+    When I try `wp cache patch insert my_key_in_group foo bar --group=my_group`
+    Then STDOUT should be:
+      """
+      Success: Updated cache key 'my_key_in_group'.
+      """
+
     When I try `wp cache patch insert unknown_key foo bar`
     Then STDERR should be:
       """
       Error: Cannot create key "foo" on data type boolean
       """
 
+    When I try `wp cache patch insert other_key foo bar --group=unknown_group`
+    Then STDERR should be:
+      """
+      Error: Cannot create key "foo" on data type boolean
+      """
+
     When I run `wp cache patch update my_key foo test`
     Then STDOUT should be:
       """
@@ -58,6 +71,12 @@ Feature: Patch command available for the object cache
       Success: Updated cache key 'complex_key'.
       """
 
+    When I try `wp cache patch update my_key_in_group fuz baz --group=my_group`
+    Then STDOUT should be:
+      """
+      Success: Updated cache key 'my_key_in_group'.
+      """
+
     When I try `wp cache patch update unknown_key foo test`
     Then STDERR should be:
       """
@@ -70,12 +89,24 @@ Feature: Patch command available for the object cache
       Error: No data exists for key "bar"
       """
 
+    When I try `wp cache patch update my_key foo baz --expiration=60`
+    Then STDOUT should be:
+      """
+      Success: Updated cache key 'my_key'.
+      """
+
     When I run `wp cache patch delete my_key foo`
     Then STDOUT should be:
       """
       Success: Updated cache key 'my_key'.
       """
 
+    When I try `wp cache patch delete my_key_in_group fuz --group=my_group`
+    Then STDOUT should be:
+      """
+      Success: Updated cache key 'my_key_in_group'.
+      """
+
     When I try `wp cache patch delete unknown_key foo`
     Then STDERR should be:
       """
@@ -87,3 +118,9 @@ Feature: Patch command available for the object cache
       """
       Error: No data exists for key "bar"
       """
+
+    When I try `wp cache patch delete my_key foo --group=my_group`
+    Then STDERR should be:
+      """
+      Error: No data exists for key "foo"
+      """

features/cache-pluck.feature

@@ -26,6 +26,18 @@ Feature: Pluck command available for the object cache
       baz
       """
 
+    When I run `wp cache pluck my_key_2 foo bar --format=json`
+    Then STDOUT should be:
+      """
+      "baz"
+      """
+
+    When I run `wp cache pluck my_key_2 foo --format=json`
+    Then STDOUT should be:
+      """
+      {"bar":"baz"}
+      """
+
     When I run `wp cache pluck my_key_3 foo --group=my_custom_group`
     Then STDOUT should be:
       """

features/transient-patch.feature

@@ -53,6 +53,18 @@ Feature: Patch command available for the transient cache
       {"foo":{"bar":"baz","fuz":"biz"}}
       """
 
+    When I run `wp transient patch insert my_key fiz bar --expiration=300`
+    Then STDOUT should be:
+      """
+      Success: Updated transient 'my_key'.
+      """
+
+    When I run `wp transient get my_key --format=json`
+    Then STDOUT should be:
+      """
+      {"foo":"bar","fuz":"baz","fiz":"bar"}
+      """
+
     When I try `wp transient patch insert unknown_key foo bar`
     Then STDERR should be:
       """

features/transient-pluck.feature

@@ -17,6 +17,18 @@ Feature: Pluck command available for the transient cache
       baz
       """
 
+    When I run `wp transient pluck my_key_2 foo bar --format=json`
+    Then STDOUT should be:
+      """
+      "baz"
+      """
+
+    When I run `wp transient pluck my_key_2 foo --format=json`
+    Then STDOUT should be:
+      """
+      {"bar":"baz"}
+      """
+
     When I try `wp transient pluck unknown_key foo`
     Then STDERR should be:
       """

src/Cache_Command.php

@@ -529,10 +529,10 @@ function ( $key ) {
 	 * ---
 	 *
 	 * [--expiration=<expiration>]
-	 *  : Define how long to keep the value, in seconds. `0` means as long as possible.
-	 *  ---
-	 *  default: 0
-	 *  ---
+	 * : Define how long to keep the value, in seconds. `0` means as long as possible.
+	 * ---
+	 * default: 0
+	 * ---
 	 *
 	 * [--format=<format>]
 	 * : The serialization format for the value.
@@ -551,7 +551,7 @@ public function patch( $args, $assoc_args ) {
 
 		$group = Utils\get_flag_value( $assoc_args, 'group' );
 
-		$expiration = Utils\get_flag_value( $assoc_args, 'expiration' );
+		$expiration = (int) Utils\get_flag_value( $assoc_args, 'expiration' );
 
 		$key_path = array_map(
 			function ( $key ) {
@@ -604,7 +604,7 @@ function ( $key ) {
 		if ( $patched_value === $old_value ) {
 			WP_CLI::success( "Value passed for cache key '$key' is unchanged." );
 		} else {
-			$success = wp_cache_set( $key, $patched_value, $group, (int) $expiration );
+			$success = wp_cache_set( $key, $patched_value, $group, $expiration );
 			if ( $success ) {
 				WP_CLI::success( "Updated cache key '$key'." );
 			} else {

src/Transient_Command.php

@@ -516,6 +516,9 @@ function ( $key ) {
 	 *
 	 * [--expiration=<expiration>]
 	 * : Time until expiration, in seconds.
+	 * ---
+	 * default: 0
+	 * ---
 	 *
 	 * [--network]
 	 * : Get the value of a network|site transient. On single site, this is