Skip to content

Commit 92b3778

Browse files
jeskewjeskew
committed
Move updater to build/ and fix branding on service names
1 parent 2b08b8e commit 92b3778

File tree

5 files changed

+47
-38
lines changed

5 files changed

+47
-38
lines changed

‎README.md‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,52 +42,52 @@ This bundle exposes an instance of the `Aws\Sdk` object as well as instances of
4242
<!-- BEGIN SERVICE TABLE -->
4343
Service | Instance Of
4444
--- | ---
45-
aws.auto_scaling | [Aws\AutoScaling\AutoScalingClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.AutoScaling.AutoScalingClient.html)
46-
aws.cloud_formation | [Aws\CloudFormation\CloudFormationClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudFormation.CloudFormationClient.html)
47-
aws.cloud_front | [Aws\CloudFront\CloudFrontClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudFront.CloudFrontClient.html)
48-
aws.cloud_hsm | [Aws\CloudHsm\CloudHsmClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudHsm.CloudHsmClient.html)
49-
aws.cloud_search | [Aws\CloudSearch\CloudSearchClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudSearch.CloudSearchClient.html)
50-
aws.cloud_search_domain | [Aws\CloudSearchDomain\CloudSearchDomainClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudSearchDomain.CloudSearchDomainClient.html)
51-
aws.cloud_trail | [Aws\CloudTrail\CloudTrailClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudTrail.CloudTrailClient.html)
52-
aws.cloud_watch | [Aws\CloudWatch\CloudWatchClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudWatch.CloudWatchClient.html)
53-
aws.cloud_watch_logs | [Aws\CloudWatchLogs\CloudWatchLogsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudWatchLogs.CloudWatchLogsClient.html)
54-
aws.code_deploy | [Aws\CodeDeploy\CodeDeployClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CodeDeploy.CodeDeployClient.html)
55-
aws.cognito_identity | [Aws\CognitoIdentity\CognitoIdentityClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CognitoIdentity.CognitoIdentityClient.html)
56-
aws.cognito_sync | [Aws\CognitoSync\CognitoSyncClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CognitoSync.CognitoSyncClient.html)
57-
aws.config_service | [Aws\ConfigService\ConfigServiceClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ConfigService.ConfigServiceClient.html)
58-
aws.data_pipeline | [Aws\DataPipeline\DataPipelineClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DataPipeline.DataPipelineClient.html)
59-
aws.direct_connect | [Aws\DirectConnect\DirectConnectClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DirectConnect.DirectConnectClient.html)
60-
aws.directory_service | [Aws\DirectoryService\DirectoryServiceClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DirectoryService.DirectoryServiceClient.html)
61-
aws.dynamo_db | [Aws\DynamoDb\DynamoDbClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DynamoDb.DynamoDbClient.html)
45+
aws.autoscaling | [Aws\AutoScaling\AutoScalingClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.AutoScaling.AutoScalingClient.html)
46+
aws.cloudformation | [Aws\CloudFormation\CloudFormationClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudFormation.CloudFormationClient.html)
47+
aws.cloudfront | [Aws\CloudFront\CloudFrontClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudFront.CloudFrontClient.html)
48+
aws.cloudhsm | [Aws\CloudHsm\CloudHsmClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudHsm.CloudHsmClient.html)
49+
aws.cloudsearch | [Aws\CloudSearch\CloudSearchClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudSearch.CloudSearchClient.html)
50+
aws.cloudsearchdomain | [Aws\CloudSearchDomain\CloudSearchDomainClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudSearchDomain.CloudSearchDomainClient.html)
51+
aws.cloudtrail | [Aws\CloudTrail\CloudTrailClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudTrail.CloudTrailClient.html)
52+
aws.cloudwatch | [Aws\CloudWatch\CloudWatchClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudWatch.CloudWatchClient.html)
53+
aws.cloudwatchlogs | [Aws\CloudWatchLogs\CloudWatchLogsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CloudWatchLogs.CloudWatchLogsClient.html)
54+
aws.codedeploy | [Aws\CodeDeploy\CodeDeployClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CodeDeploy.CodeDeployClient.html)
55+
aws.cognitoidentity | [Aws\CognitoIdentity\CognitoIdentityClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CognitoIdentity.CognitoIdentityClient.html)
56+
aws.cognitosync | [Aws\CognitoSync\CognitoSyncClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.CognitoSync.CognitoSyncClient.html)
57+
aws.configservice | [Aws\ConfigService\ConfigServiceClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ConfigService.ConfigServiceClient.html)
58+
aws.datapipeline | [Aws\DataPipeline\DataPipelineClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DataPipeline.DataPipelineClient.html)
59+
aws.directconnect | [Aws\DirectConnect\DirectConnectClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DirectConnect.DirectConnectClient.html)
60+
aws.directoryservice | [Aws\DirectoryService\DirectoryServiceClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DirectoryService.DirectoryServiceClient.html)
61+
aws.dynamodb | [Aws\DynamoDb\DynamoDbClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.DynamoDb.DynamoDbClient.html)
6262
aws.ec2 | [Aws\Ec2\Ec2Client](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Ec2.Ec2Client.html)
6363
aws.ecs | [Aws\Ecs\EcsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Ecs.EcsClient.html)
6464
aws.efs | [Aws\Efs\EfsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Efs.EfsClient.html)
65-
aws.elasti_cache | [Aws\ElastiCache\ElastiCacheClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElastiCache.ElastiCacheClient.html)
66-
aws.elastic_beanstalk | [Aws\ElasticBeanstalk\ElasticBeanstalkClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticBeanstalk.ElasticBeanstalkClient.html)
67-
aws.elastic_load_balancing | [Aws\ElasticLoadBalancing\ElasticLoadBalancingClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticLoadBalancing.ElasticLoadBalancingClient.html)
68-
aws.elastic_transcoder | [Aws\ElasticTranscoder\ElasticTranscoderClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticTranscoder.ElasticTranscoderClient.html)
65+
aws.elasticache | [Aws\ElastiCache\ElastiCacheClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElastiCache.ElastiCacheClient.html)
66+
aws.elasticbeanstalk | [Aws\ElasticBeanstalk\ElasticBeanstalkClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticBeanstalk.ElasticBeanstalkClient.html)
67+
aws.elasticloadbalancing | [Aws\ElasticLoadBalancing\ElasticLoadBalancingClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticLoadBalancing.ElasticLoadBalancingClient.html)
68+
aws.elastictranscoder | [Aws\ElasticTranscoder\ElasticTranscoderClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.ElasticTranscoder.ElasticTranscoderClient.html)
6969
aws.emr | [Aws\Emr\EmrClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Emr.EmrClient.html)
7070
aws.glacier | [Aws\Glacier\GlacierClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Glacier.GlacierClient.html)
7171
aws.iam | [Aws\Iam\IamClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Iam.IamClient.html)
7272
aws.kinesis | [Aws\Kinesis\KinesisClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Kinesis.KinesisClient.html)
7373
aws.kms | [Aws\Kms\KmsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Kms.KmsClient.html)
7474
aws.lambda | [Aws\Lambda\LambdaClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Lambda.LambdaClient.html)
75-
aws.machine_learning | [Aws\MachineLearning\MachineLearningClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.MachineLearning.MachineLearningClient.html)
76-
aws.ops_works | [Aws\OpsWorks\OpsWorksClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.OpsWorks.OpsWorksClient.html)
75+
aws.machinelearning | [Aws\MachineLearning\MachineLearningClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.MachineLearning.MachineLearningClient.html)
76+
aws.opsworks | [Aws\OpsWorks\OpsWorksClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.OpsWorks.OpsWorksClient.html)
7777
aws.rds | [Aws\Rds\RdsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Rds.RdsClient.html)
7878
aws.redshift | [Aws\Redshift\RedshiftClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Redshift.RedshiftClient.html)
7979
aws.route53 | [Aws\Route53\Route53Client](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Route53.Route53Client.html)
80-
aws.route53_domains | [Aws\Route53Domains\Route53DomainsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Route53Domains.Route53DomainsClient.html)
80+
aws.route53domains | [Aws\Route53Domains\Route53DomainsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Route53Domains.Route53DomainsClient.html)
8181
aws.s3 | [Aws\S3\S3Client](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.S3.S3Client.html)
8282
aws.ses | [Aws\Ses\SesClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Ses.SesClient.html)
8383
aws.sns | [Aws\Sns\SnsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Sns.SnsClient.html)
8484
aws.sqs | [Aws\Sqs\SqsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Sqs.SqsClient.html)
8585
aws.ssm | [Aws\Ssm\SsmClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Ssm.SsmClient.html)
86-
aws.storage_gateway | [Aws\StorageGateway\StorageGatewayClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.StorageGateway.StorageGatewayClient.html)
86+
aws.storagegateway | [Aws\StorageGateway\StorageGatewayClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.StorageGateway.StorageGatewayClient.html)
8787
aws.sts | [Aws\Sts\StsClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Sts.StsClient.html)
8888
aws.support | [Aws\Support\SupportClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Support.SupportClient.html)
8989
aws.swf | [Aws\Swf\SwfClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.Swf.SwfClient.html)
90-
aws.work_spaces | [Aws\WorkSpaces\WorkSpacesClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.WorkSpaces.WorkSpacesClient.html)
90+
aws.workspaces | [Aws\WorkSpaces\WorkSpacesClient](http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.WorkSpaces.WorkSpacesClient.html)
9191
<!-- END SERVICE TABLE -->
9292

9393
## Links

tests/ReadMeUpdater.php renamed to build/ReadMeUpdater.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Aws\Symfony;
44

5+
use Composer\Script\Event;
56
use Symfony\Component\DependencyInjection\Container;
67

78
class ReadMeUpdater
@@ -12,10 +13,21 @@ class ReadMeUpdater
1213
const DOCS_URL_TEMPLATE = 'http://docs.aws.amazon.com/aws-sdk-php/v3/api/class-'
1314
. self::SERVICE_CLASS_DELIMITER . '.html';
1415

15-
public static function updateReadMe()
16+
protected $projectRoot;
17+
18+
public static function updateReadMe(Event $e)
19+
{
20+
$vendorDir = $e->getComposer()->getConfig()->get('vendor-dir');
21+
$projectRoot = dirname($vendorDir);
22+
23+
require "$vendorDir/autoload.php";
24+
25+
(new static($projectRoot))->doUpdateReadMe();
26+
}
27+
28+
public function __construct($projectRoot = '..')
1629
{
17-
require __DIR__ . '/../vendor/autoload.php';
18-
(new static)->doUpdateReadMe();
30+
$this->projectRoot = $projectRoot;
1931
}
2032

2133

@@ -41,7 +53,7 @@ protected function getReadMeWithoutServicesTable()
4153

4254
protected function getReadMePath()
4355
{
44-
return dirname(__DIR__) . '/README.md';
56+
return $this->projectRoot . '/README.md';
4557
}
4658

4759
protected function getServicesTable()
@@ -78,7 +90,7 @@ protected function getContainer()
7890
static $container = null;
7991

8092
if (empty($container)) {
81-
require_once __DIR__ . '/fixtures/AppKernel.php';
93+
require_once $this->projectRoot . '/tests/fixtures/AppKernel.php';
8294
$kernel = new \AppKernel('test', true);
8395
$kernel->boot();
8496
$container = $kernel->getContainer();

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"aws/aws-sdk-php": "^3.0.5",
1414
"symfony/config": "~2.3",
1515
"symfony/dependency-injection": "~2.3",
16-
"symfony/http-kernel": "~2.3",
17-
"doctrine/inflector": "~1.0"
16+
"symfony/http-kernel": "~2.3"
1817
},
1918
"require-dev": {
2019
"phpunit/phpunit": "~4.7",
@@ -29,7 +28,7 @@
2928
},
3029
"autoload-dev": {
3130
"psr-4": {
32-
"Aws\\Symfony\\": "tests/"
31+
"Aws\\Symfony\\": ["build/", "tests/"]
3332
}
3433
},
3534
"scripts": {

‎src/DependencyInjection/AwsExtension.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Aws\Symfony\DependencyInjection;
44

55
use Aws\AwsClient;
6-
use Doctrine\Common\Inflector\Inflector;
76
use Symfony\Component\Config\FileLocator;
87
use Symfony\Component\DependencyInjection\ContainerBuilder;
98
use Symfony\Component\DependencyInjection\Definition;
@@ -30,7 +29,7 @@ public function load(array $configs, ContainerBuilder $container)
3029

3130
foreach ($configuration->getAwsServices() as $awsService) {
3231
$container->setDefinition(
33-
'aws.' . Inflector::tableize($awsService),
32+
'aws.' . strtolower($awsService),
3433
$this->createServiceDefinition($awsService)
3534
);
3635
}

‎tests/DependencyInjection/AwsExtensionTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use AppKernel;
66
use Aws\AwsClient;
77
use Aws\Sdk;
8-
use Doctrine\Common\Inflector\Inflector;
98
use ReflectionClass;
109
use Symfony\Component\DependencyInjection\ContainerInterface;
1110

@@ -86,7 +85,7 @@ public function serviceProvider()
8685
$clientClass = "Aws\\{$serviceNamespace}\\{$serviceNamespace}Client";
8786
$services []= [
8887
$serviceNamespace,
89-
'aws.' . Inflector::tableize($serviceNamespace),
88+
'aws.' . strtolower($serviceNamespace),
9089
class_exists($clientClass) ? $clientClass : AwsClient::class,
9190
];
9291
}

0 commit comments

Comments
 (0)