Fix not found in array errors for tests

Author: billyjacobson

storage/src/get_retention_policy.php

@@ -39,11 +39,12 @@ function get_retention_policy($bucketName)
 
     printf('Retention Policy for ' . $bucketName . PHP_EOL);
     printf('Retention Period: ' . $bucket->info()['retentionPolicy']['retentionPeriod'] . PHP_EOL);
-    if ($bucket->info()['retentionPolicy']['isLocked']) {
+    if (array_key_exists('isLocked', $bucket->info()['retentionPolicy']) &&
+        $bucket->info()['retentionPolicy']['isLocked']) {
         printf('Retention Policy is locked' . PHP_EOL);
     }
     if ($bucket->info()['retentionPolicy']['effectiveTime']) {
-        printf('Effective Time: ' .  $bucket->info()['retentionPolicy']['effectiveTime'] . PHP_EOL);
+        printf('Effective Time: ' . $bucket->info()['retentionPolicy']['effectiveTime'] . PHP_EOL);
     }
 }
 # [END storage_get_retention_policy]

storage/src/remove_retention_policy.php

@@ -37,7 +37,8 @@ function remove_retention_policy($bucketName)
     $bucket = $storage->bucket($bucketName);
     $bucket->reload();
 
-    if ($bucket->info()['retentionPolicy']['isLocked']) {
+    if (array_key_exists('isLocked', $bucket->info()['retentionPolicy']) &&
+        $bucket->info()['retentionPolicy']['isLocked']) {
         printf('Unable to remove retention period as retention policy is locked.' . PHP_EOL);
         return;
     }

storage/test/BucketLockCommandTest.php

@@ -82,7 +82,8 @@ public function testRetentionPolicyNoLock()
         $this->bucket->reload();
         $effectiveTime = $this->bucket->info()['retentionPolicy']['effectiveTime'];
 
-        $this->assertNull($this->bucket->info()['retentionPolicy']['isLocked']);
+        $this->assertFalse(array_key_exists('isLocked',
+            $this->bucket->info()['retentionPolicy']));
         $this->assertNotNull($effectiveTime);
         $this->assertEquals($this->bucket->info()['retentionPolicy']['retentionPeriod'], $retentionPeriod);
 
@@ -106,7 +107,7 @@ public function testRetentionPolicyNoLock()
         );
         $this->bucket->reload();
 
-        $this->assertNull($this->bucket->info()['retentionPolicy']);
+        $this->assertFalse(array_key_exists('retentionPolicy', $this->bucket->info()));
 
         $outputString = <<<EOF
 Bucket {$this->bucket->name()} retention period set for $retentionPeriod seconds
@@ -133,7 +134,8 @@ public function testRetentionPolicyLock()
         );
         $this->bucket->reload();
 
-        $this->assertNull($this->bucket->info()['retentionPolicy']['isLocked']);
+        $this->assertFalse(array_key_exists('isLocked',
+            $this->bucket->info()['retentionPolicy']));
 
         $this->commandTester->execute(
             [
@@ -221,7 +223,8 @@ public function testEnableDisableGetDefaultEventBasedHold()
     public function testEnableDisableEventBasedHold()
     {
         $this->uploadObject();
-        $this->assertNull($this->object->info()['eventBasedHold']);
+
+        $this->assertFalse(array_key_exists('eventBasedHold', $this->object->info()));
 
         $this->commandTester->execute(
             [
@@ -256,7 +259,7 @@ public function testEnableDisableEventBasedHold()
     public function testEnableDisableTemporaryHold()
     {
         $this->uploadObject();
-        $this->assertNull($this->object->info()['temporaryHold']);
+        $this->assertFalse(array_key_exists('temporaryHold', $this->object->info()));
 
         $this->commandTester->execute(
             [