Skip to content

Commit 6968267

Browse files
committed
Minor cleanup from the facades pull request
1 parent cd48c7b commit 6968267

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Find the `providers` key in `app/config/app.php` and register the AWS Service Pr
4444
)
4545
```
4646

47-
Find the `aliases` key in `app/config/app.php` and add the AWS Facade alias.
47+
Find the `aliases` key in `app/config/app.php` and add the AWS facade alias.
4848

4949
```php
5050
'aliases' => array(
@@ -53,7 +53,6 @@ Find the `aliases` key in `app/config/app.php` and add the AWS Facade alias.
5353
)
5454
```
5555

56-
5756
### 2. Manual Instantiation
5857

5958
You can also register the provider and configuration options at runtime. This could be done in your global bootstrapping
@@ -80,8 +79,8 @@ $app->register(new AwsServiceProvider($app), array(
8079
));
8180
```
8281

83-
You can alternatively specify the path to an AWS config file (see [AWS SDK for PHP
84-
](http://github.com/aws/aws-sdk-php) for details about how to format this type of file).
82+
You can alternatively specify the path to an AWS config file (see [AWS SDK for PHP](http://github.com/aws/aws-sdk-php)
83+
for details about how to format this type of file).
8584

8685
```php
8786
$app->register(new AwsServiceProvider($app), array('config' => array('aws' => '/path/to/aws/config/file.php')));

src/Aws/Laravel/AwsFacade.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ class AwsFacade extends Facade
2828
*
2929
* @return string
3030
*/
31-
protected static function getFacadeAccessor() { return 'aws'; }
31+
protected static function getFacadeAccessor()
32+
{
33+
return 'aws';
34+
}
3235
}

tests/Aws/Laravel/Tests/AwsFacadeTest.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,14 @@ public function testFacadeCanBeResolvedToServiceInstance()
2929
{
3030
// Setup the Laravel app and AWS service provider
3131
$app = new Application();
32+
$app['config'] = array();
3233
$provider = new AwsServiceProvider($app);
33-
$app->register($provider, array(
34-
'config' => array(
35-
'aws' => array(
36-
'key' => 'your-aws-access-key-id',
37-
'secret' => 'your-aws-secret-access-key',
38-
),
39-
),
40-
));
34+
$app->register($provider);
4135
$provider->boot();
4236

4337
AWS::setFacadeApplication($app);
4438

4539
// Get an instance of a client (S3) to use for testing
46-
/** @var $s3 \Aws\S3\S3Client */
4740
$s3 = AWS::get('s3');
4841
$this->assertInstanceOf('Aws\S3\S3Client', $s3);
4942
}

0 commit comments

Comments
 (0)