Skip to content

Commit f0a92ac

Browse files
committed
Merge pull request #9 from aws/fix/allow-symfony-3
Add support for Symfony 3
2 parents 90317d2 + a0feab1 commit f0a92ac

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "aws/aws-sdk-php-symfony",
33
"description": "A Symfony bundle for v3 of the AWS SDK for PHP",
4-
"keywords": [ "aws", "amazon", "symfony", "symfony2", "sdk"],
4+
"keywords": [ "aws", "amazon", "symfony", "symfony2", "symfony3", "sdk"],
55
"minimum-stability": "stable",
66
"license": "Apache-2.0",
77
"authors": [
@@ -13,14 +13,14 @@
1313
"require": {
1414
"php": ">=5.5",
1515
"aws/aws-sdk-php": "^3.2.6",
16-
"symfony/config": "~2.3",
17-
"symfony/dependency-injection": "~2.3",
18-
"symfony/http-kernel": "~2.3"
16+
"symfony/config": "~2.3|~3.0",
17+
"symfony/dependency-injection": "~2.3|~3.0",
18+
"symfony/http-kernel": "~2.3|~3.0"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~4.7",
22-
"symfony/framework-bundle": "~2.3",
23-
"symfony/yaml": "~2.3"
22+
"symfony/framework-bundle": "~2.3|~3.0",
23+
"symfony/yaml": "~2.3|~3.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

tests/fixtures/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'credentials' => new Reference('a_service'), // '@a_service' would also work in a PHP config
2424
],
2525
'CloudSearchDomain' => [
26-
'endpoint' => 'http://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com',
26+
'endpoint' => 'https://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com',
2727
],
2828
]);
2929

tests/fixtures/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
secret="@@not-a-real-secret"
1212
/> <!-- secret will be escaped as '@not-a-real-secret '-->
1313
<aws:CloudSearchDomain
14-
endpoint="http://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com"
14+
endpoint="https://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com"
1515
/>
1616
<aws:DynamoDb region="us-west-2"/>
1717
<aws:S3 version="2006-03-01"/>

tests/fixtures/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ aws:
66
region: us-east-1
77
credentials:
88
key: not-a-real-key
9-
secret: @@not-a-real-secret # this will be escaped as '@not-a-real-secret'
9+
secret: "@@not-a-real-secret" # this will be escaped as '@not-a-real-secret'
1010
DynamoDb:
1111
region: us-west-2
1212
S3:
1313
version: '2006-03-01'
1414
Sqs:
15-
credentials: @a_service
15+
credentials: "@a_service"
1616
CloudSearchDomain:
17-
endpoint: http://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com
17+
endpoint: https://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com
1818

1919
services:
2020
a_service:
2121
class: Aws\Credentials\Credentials
2222
arguments:
2323
- a-different-fake-key
24-
- a-different-fake-secret
24+
- a-different-fake-secret

0 commit comments

Comments
 (0)