Renaming event based to event-based

billyjacobson · billyjacobson · commit 8b8ae45e22c7 · 2018-10-05T11:12:13.000-04:00
diff --git a/storage/README.md b/storage/README.md
@@ -35,7 +35,7 @@ This simple command-line application demonstrates how to invoke Google Cloud Sto
     bucket-acl          Manage the ACL for Cloud Storage buckets.
     bucket-default-acl  Manage the default ACL for Cloud Storage buckets.
     bucket-labels       Manage Cloud Storage bucket labels
-    bucket-lock         Manage Cloud Storage bucket retention policies
+    bucket-lock         Manage Cloud Storage retention policies and holds
     buckets             Manage Cloud Storage buckets
     encryption          Upload and download Cloud Storage objects with encryption
     object-acl          Manage the ACL for Cloud Storage objects
diff --git a/storage/src/disable_default_event_based_hold.php b/storage/src/disable_default_event_based_hold.php
@@ -27,7 +27,7 @@
 use Google\Cloud\Storage\StorageClient;
 
 /**
- * Disables a default event based hold for a bucket.
+ * Disables a default event-based hold for a bucket.
  *
  * @param string $bucketName the name of your Cloud Storage bucket.
  *
@@ -38,6 +38,6 @@ function disable_default_event_based_hold($bucketName)
     $storage = new StorageClient();
     $bucket = $storage->bucket($bucketName);
     $bucket->update(['defaultEventBasedHold' => false]);
-    printf('Default event based hold was disabled for %s' . PHP_EOL, $bucketName);
+    printf('Default event-based hold was disabled for %s' . PHP_EOL, $bucketName);
 }
 # [END storage_disable_default_event_based_hold]
diff --git a/storage/src/enable_default_event_based_hold.php b/storage/src/enable_default_event_based_hold.php
@@ -27,7 +27,7 @@
 use Google\Cloud\Storage\StorageClient;
 
 /**
- * Enables a default event based hold for a bucket.
+ * Enables a default event-based hold for a bucket.
  *
  * @param string $bucketName the name of your Cloud Storage bucket.
  *
@@ -38,6 +38,6 @@ function enable_default_event_based_hold($bucketName)
     $storage = new StorageClient();
     $bucket = $storage->bucket($bucketName);
     $bucket->update(['defaultEventBasedHold' => true]);
-    printf('Default event based hold was enabled for %s' . PHP_EOL, $bucketName);
+    printf('Default event-based hold was enabled for %s' . PHP_EOL, $bucketName);
 }
 # [END storage_enable_default_event_based_hold]
diff --git a/storage/src/get_default_event_based_hold.php b/storage/src/get_default_event_based_hold.php
@@ -27,7 +27,7 @@
 use Google\Cloud\Storage\StorageClient;
 
 /**
- * Enables a default event based hold for a bucket.
+ * Enables a default event-based hold for a bucket.
  *
  * @param string $bucketName the name of your Cloud Storage bucket.
  *
diff --git a/storage/src/object_metadata.php b/storage/src/object_metadata.php
@@ -53,7 +53,7 @@ function object_metadata($bucketName, $objectName)
     printf('MD5 Hash: %s' . PHP_EOL, $info['md5Hash']);
     printf('Content-type: %s' . PHP_EOL, $info['contentType']);
     printf("Temporary hold: " . ($info['temporaryHold'] ? "enabled" : "disabled") . PHP_EOL);
-    printf("Event based hold: " . ($info['eventBasedHold'] ? "enabled" : "disabled") . PHP_EOL);
+    printf("Event-based hold: " . ($info['eventBasedHold'] ? "enabled" : "disabled") . PHP_EOL);
     if ($info['retentionExpirationTime']) {
         printf("retentionExpirationTime: " . $info['retentionExpirationTime'] . PHP_EOL);
     }
diff --git a/storage/src/release_event_based_hold.php b/storage/src/release_event_based_hold.php
@@ -27,7 +27,7 @@
 use Google\Cloud\Storage\StorageClient;
 
 /**
- * Releases an event based hold for an object.
+ * Releases an event-based hold for an object.
  *
  * @param string $bucketName the name of your Cloud Storage bucket.
  * @param string $objectName the name of your Cloud Storage object.
@@ -40,6 +40,6 @@ function release_event_based_hold($bucketName, $objectName)
     $bucket = $storage->bucket($bucketName);
     $object = $bucket->object($objectName);
     $object->update(['eventBasedHold' => false]);
-    printf('Event based hold was released for %s' . PHP_EOL, $objectName);
+    printf('Event-based hold was released for %s' . PHP_EOL, $objectName);
 }
 # [END storage_release_event_based_hold]
diff --git a/storage/src/set_event_based_hold.php b/storage/src/set_event_based_hold.php
@@ -27,7 +27,7 @@
 use Google\Cloud\Storage\StorageClient;
 
 /**
- * Sets an event based hold for an object.
+ * Sets an event-based hold for an object.
  *
  * @param string $bucketName the name of your Cloud Storage bucket.
  * @param string $objectName the name of your Cloud Storage object.
@@ -40,6 +40,6 @@ function set_event_based_hold($bucketName, $objectName)
     $bucket = $storage->bucket($bucketName);
     $object = $bucket->object($objectName);
     $object->update(['eventBasedHold' => true]);
-    printf('Event based hold was set for %s' . PHP_EOL, $objectName);
+    printf('Event-based hold was set for %s' . PHP_EOL, $objectName);
 }
 # [END storage_set_event_based_hold]
diff --git a/storage/storage.php b/storage/storage.php
@@ -165,11 +165,11 @@
     ->addOption('remove-retention-policy', null, InputOption::VALUE_NONE, 'Remove the retention policy')
     ->addOption('lock-retention-policy', null, InputOption::VALUE_NONE, 'Lock the retention policy')
     ->addOption('get-retention-policy', null, InputOption::VALUE_NONE, 'Gets the retention policy')
-    ->addOption('set-event-based-hold', null, InputOption::VALUE_NONE, 'Set an event based hold')
-    ->addOption('release-event-based-hold', null, InputOption::VALUE_NONE, 'Release an event based hold')
-    ->addOption('enable-default-event-based-hold', null, InputOption::VALUE_NONE, 'Enable default event based hold')
-    ->addOption('disable-default-event-based-hold', null, InputOption::VALUE_NONE, 'Disable default event based hold')
-    ->addOption('get-default-event-based-hold', null, InputOption::VALUE_NONE, 'Gets default event based hold')
+    ->addOption('set-event-based-hold', null, InputOption::VALUE_NONE, 'Set an event-based hold')
+    ->addOption('release-event-based-hold', null, InputOption::VALUE_NONE, 'Release an event-based hold')
+    ->addOption('enable-default-event-based-hold', null, InputOption::VALUE_NONE, 'Enable default event-based hold')
+    ->addOption('disable-default-event-based-hold', null, InputOption::VALUE_NONE, 'Disable default event-based hold')
+    ->addOption('get-default-event-based-hold', null, InputOption::VALUE_NONE, 'Gets default event-based hold')
     ->addOption('set-temporary-hold', null, InputOption::VALUE_NONE, 'Set a temporary hold')
     ->addOption('release-temporary-hold', null, InputOption::VALUE_NONE, 'Release a temporary hold')
     ->setCode(function ($input, $output) {
diff --git a/storage/test/BucketLockCommandTest.php b/storage/test/BucketLockCommandTest.php
@@ -208,10 +208,10 @@ public function testEnableDisableGetDefaultEventBasedHold()
         );
 
         $outputString = <<<EOF
-Default event based hold was enabled for {$this->bucket->name()}
+Default event-based hold was enabled for {$this->bucket->name()}
 Default event-based hold is enabled for {$this->bucket->name()}
-Event based hold was released for {$this->object->name()}
-Default event based hold was disabled for {$this->bucket->name()}
+Event-based hold was released for {$this->object->name()}
+Default event-based hold was disabled for {$this->bucket->name()}
 Default event-based hold is not enabled for {$this->bucket->name()}
 
 EOF;
@@ -246,8 +246,8 @@ public function testEnableDisableEventBasedHold()
         $this->assertFalse($this->object->info()['eventBasedHold']);
 
         $outputString = <<<EOF
-Event based hold was set for {$this->object->name()}
-Event based hold was released for {$this->object->name()}
+Event-based hold was set for {$this->object->name()}
+Event-based hold was released for {$this->object->name()}
 
 EOF;
         $this->expectOutputString($outputString);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`use Google\Cloud\Storage\StorageClient;`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * Disables a default event based hold for a bucket.`
	`30`	`+ * Disables a default event-based hold for a bucket.`
`31`	`31`	`*`
`32`	`32`	`* @param string $bucketName the name of your Cloud Storage bucket.`
`33`	`33`	`*`
`@@ -38,6 +38,6 @@ function disable_default_event_based_hold($bucketName)`
`38`	`38`	`$storage = new StorageClient();`
`39`	`39`	`$bucket = $storage->bucket($bucketName);`
`40`	`40`	`$bucket->update(['defaultEventBasedHold' => false]);`
`41`		`- printf('Default event based hold was disabled for %s' . PHP_EOL, $bucketName);`
	`41`	`+ printf('Default event-based hold was disabled for %s' . PHP_EOL, $bucketName);`
`42`	`42`	`}`
`43`	`43`	`# [END storage_disable_default_event_based_hold]`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ function object_metadata($bucketName, $objectName)`
`53`	`53`	`printf('MD5 Hash: %s' . PHP_EOL, $info['md5Hash']);`
`54`	`54`	`printf('Content-type: %s' . PHP_EOL, $info['contentType']);`
`55`	`55`	`printf("Temporary hold: " . ($info['temporaryHold'] ? "enabled" : "disabled") . PHP_EOL);`
`56`		`- printf("Event based hold: " . ($info['eventBasedHold'] ? "enabled" : "disabled") . PHP_EOL);`
	`56`	`+ printf("Event-based hold: " . ($info['eventBasedHold'] ? "enabled" : "disabled") . PHP_EOL);`
`57`	`57`	`if ($info['retentionExpirationTime']) {`
`58`	`58`	`printf("retentionExpirationTime: " . $info['retentionExpirationTime'] . PHP_EOL);`
`59`	`59`	`}`