Fixed code review issues

Author: ryanmats

storage/api/src/RequesterPaysCommand.php

@@ -92,12 +92,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($destination = $input->getArgument('download-to')) {
                 download_file_requester_pays($projectId, $bucketName, $objectName, $destination);
             }
-        } else if ($input->getOption('enable')) {
+        } elseif ($input->getOption('enable')) {
             enable_requester_pays($projectId, $bucketName);
-        } else if ($input->getOption('disable')) {
+        } elseif ($input->getOption('disable')) {
             disable_requester_pays($projectId, $bucketName);
-        } else if ($input->getOption('check-status')) {
-           get_requester_pays_status($projectId, $bucketName);
+        } elseif ($input->getOption('check-status')) {
+            get_requester_pays_status($projectId, $bucketName);
         }
     }
 }

storage/api/src/functions/disable_requester_pays.php

@@ -42,7 +42,7 @@ function disable_requester_pays($projectId, $bucketName)
     $bucket = $storage->bucket($bucketName);
     $bucket->update([
         'billing' => [
-            'requesterPays' => False
+            'requesterPays' => false
         ]
     ]);
     printf('Requester pays has been disabled for %s' . PHP_EOL, $bucketName);

storage/api/src/functions/download_file_requester_pays.php

@@ -41,7 +41,8 @@ function download_file_requester_pays($projectId, $bucketName, $objectName, $des
     $storage = new StorageClient([
         'projectId' => $projectId
     ]);
-    $bucket = $storage->bucket($bucketName, true);
+    $requesterPays = true;
+    $bucket = $storage->bucket($bucketName, $requesterPays);
     $object = $bucket->object($objectName);
     $object->downloadToFile($destination);
     printf('Downloaded gs://%s/%s to %s using requester-pays requests.' . PHP_EOL,

storage/api/src/functions/enable_requester_pays.php

@@ -42,7 +42,7 @@ function enable_requester_pays($projectId, $bucketName)
     $bucket = $storage->bucket($bucketName);
     $bucket->update([
         'billing' => [
-            'requesterPays' => True
+            'requesterPays' => true
         ]
     ]);
     printf('Requester pays has been enabled for %s' . PHP_EOL, $bucketName);

storage/api/test/RequesterPaysCommandTest.php

@@ -25,7 +25,7 @@
 /**
  * Unit Tests for RequesterPaysCommand.
  */
-class BucketsCommandTest extends \PHPUnit_Framework_TestCase
+class RequesterPaysCommandTest extends \PHPUnit_Framework_TestCase
 {
     protected static $hasCredentials;
     protected $commandTester;
@@ -70,6 +70,7 @@ public function testEnableRequesterPays()
         $this->expectOutputRegex("/Requester pays has been enabled/");
     }
 
+    /** @depends testEnableRequesterPays */
     public function testDisableRequesterPays()
     {
         if (!self::$hasCredentials) {
@@ -94,6 +95,7 @@ public function testDisableRequesterPays()
         $this->expectOutputRegex("/Requester pays has been disabled/");
     }
 
+    /** depends testDisableRequesterPays */
     public function testGetRequesterPaysStatus()
     {
         if (!self::$hasCredentials) {
@@ -144,9 +146,6 @@ public function testDownloadFileRequesterPays()
             ],
             ['interactive' => false]
         );
-
-        $this->expectOutputRegex("/Downloaded/");
         $this->expectOutputRegex("/using requester-pays requests/");
     }
-
 }