diff --git a/Storage/src/Bucket.php b/Storage/src/Bucket.php index 95428c782887..885f4702369c 100644 --- a/Storage/src/Bucket.php +++ b/Storage/src/Bucket.php @@ -821,9 +821,14 @@ public function delete(array $options = []) * current bucket's logs. * @type string $storageClass The bucket's storage class. This defines * how objects in the bucket are stored and determines the SLA and - * the cost of storage. Acceptable values include - * `"MULTI_REGIONAL"`, `"REGIONAL"`, `"NEARLINE"`, `"COLDLINE"`, - * `"STANDARD"` and `"DURABLE_REDUCED_AVAILABILITY"`. + * the cost of storage. Acceptable values include the following + * strings: `"STANDARD"`, `"NEARLINE"`, `"COLDLINE"` and + * `"ARCHIVE"`. Legacy values including `"MULTI_REGIONAL"`, + * `"REGIONAL"` and `"DURABLE_REDUCED_AVAILABILITY"` are also + * available, but should be avoided for new implementations. For + * more information, refer to the + * [Storage Classes](https://cloud.google.com/storage/docs/storage-classes) + * documentation. **Defaults to** `"STANDARD"`. * @type array $versioning The bucket's versioning configuration. * @type array $website The bucket's website configuration. * @type array $billing The bucket's billing configuration. diff --git a/Storage/src/Lifecycle.php b/Storage/src/Lifecycle.php index 083217aa2b0e..048211a27dbb 100644 --- a/Storage/src/Lifecycle.php +++ b/Storage/src/Lifecycle.php @@ -90,7 +90,8 @@ public function __construct(array $lifecycle = []) * @type string[] $matchesStorageClass Objects having any of the storage * classes specified by this condition will be matched. Values * include `"MULTI_REGIONAL"`, `"REGIONAL"`, `"NEARLINE"`, - * `"COLDLINE"`, `"STANDARD"`, and `"DURABLE_REDUCED_AVAILABILITY"`. + * `"ARCHIVE"`, `"COLDLINE"`, `"STANDARD"`, and + * `"DURABLE_REDUCED_AVAILABILITY"`. * @type int $numNewerVersions Relevant only for versioned objects. If * the value is N, this condition is satisfied when there are at * least N versions (including the live version) newer than this diff --git a/Storage/src/StorageClient.php b/Storage/src/StorageClient.php index c9548295f8c5..c190bf0a1953 100644 --- a/Storage/src/StorageClient.php +++ b/Storage/src/StorageClient.php @@ -262,10 +262,14 @@ function (array $bucket) use ($userProject) { * current bucket's logs. * @type string $storageClass The bucket's storage class. This defines * how objects in the bucket are stored and determines the SLA and - * the cost of storage. Acceptable values include - * `"MULTI_REGIONAL"`, `"REGIONAL"`, `"NEARLINE"`, `"COLDLINE"`, - * `"STANDARD"` and `"DURABLE_REDUCED_AVAILABILITY"`. - * **Defaults to** `STANDARD`. + * the cost of storage. Acceptable values include the following + * strings: `"STANDARD"`, `"NEARLINE"`, `"COLDLINE"` and + * `"ARCHIVE"`. Legacy values including `"MULTI_REGIONAL"`, + * `"REGIONAL"` and `"DURABLE_REDUCED_AVAILABILITY"` are also + * available, but should be avoided for new implementations. For + * more information, refer to the + * [Storage Classes](https://cloud.google.com/storage/docs/storage-classes) + * documentation. **Defaults to** `"STANDARD"`. * @type array $versioning The bucket's versioning configuration. * @type array $website The bucket's website configuration. * @type array $billing The bucket's billing configuration. diff --git a/Storage/tests/System/ManageBucketsTest.php b/Storage/tests/System/ManageBucketsTest.php index 6c7024817562..d2227b21e340 100644 --- a/Storage/tests/System/ManageBucketsTest.php +++ b/Storage/tests/System/ManageBucketsTest.php @@ -205,7 +205,7 @@ public function testLabels() } /** - * @group location + * @group storage-bucket-location * @dataProvider locationTypes */ public function testBucketLocationType($storageClass, $location, $expectedLocationType, $updateStorageClass) @@ -260,6 +260,11 @@ public function locationTypes() 'nam4', 'dual-region', 'STANDARD' + ], [ + 'ARCHIVE', + 'nam4', + 'dual-region', + 'STANDARD' ] ]; }