Removing NullCredentials. Just use Credentials

radford · May 8, 2015 · 12d1058 · 12d1058
1 parent f10bb03
commit 12d1058
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 77 deletions.
diff --git a/src/ClientResolver.php b/src/ClientResolver.php
@@ -342,7 +342,7 @@ public static function _apply_credentials($value, array &$args)
                 isset($value['expires']) ? $value['expires'] : null
             );
         } elseif ($value === false) {
-            $args['credentials'] = new NullCredentials();
+            $args['credentials'] = new Credentials('', '');
             $args['config']['signature_version'] = 'anonymous';
         } else {
             throw new IAE('Credentials must be an instance of '

diff --git a/src/Credentials/NullCredentials.php b/src/Credentials/NullCredentials.php
diff --git a/tests/Api/Serializer/ComplianceTest.php b/tests/Api/Serializer/ComplianceTest.php
@@ -3,7 +3,6 @@
 
 use Aws\Api\Service;
 use Aws\AwsClient;
-use Aws\Credentials\NullCredentials;
 use Aws\Test\UsesServiceTrait;
 
 /**
@@ -72,7 +71,7 @@ public function testPassesComplianceTest(
             'api_provider' => function () use ($service) {
                 return $service->toArray();
             },
-            'credentials'  => new NullCredentials(),
+            'credentials'  => false,
             'signature'    => $this->getMock('Aws\Signature\SignatureInterface'),
             'region'       => 'us-west-2',
             'endpoint'     => $ep,

diff --git a/tests/ClientResolverTest.php b/tests/ClientResolverTest.php
@@ -196,7 +196,7 @@ public function testCanCreateNullCredentials()
             'version' => 'latest'
         ], new HandlerList());
         $this->assertInstanceOf(
-            'Aws\Credentials\NullCredentials',
+            'Aws\Credentials\Credentials',
             $conf['credentials']
         );
         $this->assertEquals('anonymous', $conf['config']['signature_version']);

diff --git a/tests/Credentials/NullCredentialsTest.php b/tests/Credentials/NullCredentialsTest.php
diff --git a/tests/S3/S3ClientTest.php b/tests/S3/S3ClientTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace Aws\Test\S3;
 
-use Aws\Credentials\NullCredentials;
 use Aws\MockHandler;
 use Aws\Result;
 use Aws\S3\S3Client;
@@ -186,7 +185,7 @@ public function testReturnsObjectUrl()
     {
         $s3 = $this->getTestClient('S3', [
             'region'      => 'us-east-1',
-            'credentials' => new NullCredentials()
+            'credentials' => false
         ]);
         $this->assertEquals('https://foo.s3.amazonaws.com/bar', $s3->getObjectUrl('foo', 'bar'));
     }
@@ -196,7 +195,7 @@ public function testReturnsObjectUrlViaPath()
         /** @var S3Client $s3 */
         $s3 = $this->getTestClient('S3', [
             'region'      => 'us-east-1',
-            'credentials' => new NullCredentials()
+            'credentials' => false
         ]);
         $this->assertEquals(
             'https://s3.amazonaws.com/foo.baz/bar',