Skip to content

Commit 012ce4c

Browse files
firelikecjyclaire
firelike
authored and
cjyclaire
committed
Migrating to zf3 (#45)
* Changing the new use statement for FactoryInterface to all factories * changing composer.json to require min php version of 5.6 * changing composer * renaming package name in composer.json * removing zend-version from composer.json. removing Zend\Version\Version from AwsFactory. adding "zend_framework_version" param in aws_zf2.local.php * fixing AwsFactory * refactoring AwsFactory. Adding test for the new zend_framework_version config param * changing zend-filter version * bumped the module version * changed project name in composer.json back to the original aws/aws-sdk-php-zf2 * removed php 5.5 from travis.yml since we are targeting 5.6 and above * removed custom config parameter from AwsFactory and aws_zf2 local config file. Changed the unit test accordingly. Replaced usage of zend framework version with module version constant. Bumped module version to 4.0.0.
1 parent e0f67ab commit 012ce4c

File tree

9 files changed

+52
-47
lines changed

9 files changed

+52
-47
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
65

76
sudo: false

‎Module.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
class Module implements ConfigProviderInterface
1111
{
12-
const VERSION = '2.1.0';
12+
const VERSION = '4.0.0';
1313

1414
/**
1515
* {@inheritdoc}

‎composer.json‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,43 @@
11
{
2-
"name": "aws/aws-sdk-php-zf2",
3-
"description": "Zend Framework 2 Module that allows easy integration the AWS SDK for PHP",
4-
"type": "library",
5-
"license": "Apache",
6-
"keywords": ["aws", "zf2", "amazon", "zend", "s3", "dynamodb", "ec2", "cloudfront", "sqs"],
7-
"require": {
8-
"php": ">=5.5",
9-
"aws/aws-sdk-php": "3.*",
10-
"zendframework/zend-filter": "2.*",
11-
"zendframework/zend-servicemanager": "2.7.* || 3.*",
12-
"zendframework/zend-session": "2.*",
13-
"zendframework/zend-version": "2.*",
14-
"zendframework/zend-view": "2.*"
2+
"name": "aws/aws-sdk-php-zf2",
3+
"description": "Zend Framework 2 Module that allows easy integration the AWS SDK for PHP",
4+
"type": "library",
5+
"license": "Apache",
6+
"keywords": [
7+
"aws",
8+
"zf2",
9+
"amazon",
10+
"zend",
11+
"s3",
12+
"dynamodb",
13+
"ec2",
14+
"cloudfront",
15+
"sqs"
16+
],
17+
"require": {
18+
"php": "^5.6 || ^7.0",
19+
"aws/aws-sdk-php": "3.*",
20+
"zendframework/zend-filter": "2.7.*",
21+
"zendframework/zend-servicemanager": "2.7.* || 3.*",
22+
"zendframework/zend-session": "2.7.*",
23+
"zendframework/zend-view": "^2.8"
24+
},
25+
"require-dev": {
26+
"phpunit/phpunit": "4.*",
27+
"zendframework/zend-modulemanager": "2.7.*",
28+
"squizlabs/php_codesniffer": "~2.3"
29+
},
30+
"autoload": {
31+
"psr-4": {
32+
"AwsModule\\": "src/"
1533
},
16-
"require-dev": {
17-
"phpunit/phpunit": "4.*",
18-
"zendframework/zend-modulemanager": "2.*",
19-
"squizlabs/php_codesniffer": "~2.3"
20-
},
21-
"autoload": {
22-
"psr-4": {
23-
"AwsModule\\": "src/"
24-
},
25-
"classmap": [
26-
"./Module.php"
27-
]
28-
},
29-
"autoload-dev": {
30-
"psr-4": {
31-
"AwsModule\\Tests\\": "tests/"
32-
}
34+
"classmap": [
35+
"./Module.php"
36+
]
37+
},
38+
"autoload-dev": {
39+
"psr-4": {
40+
"AwsModule\\Tests\\": "tests/"
3341
}
42+
}
3443
}

‎src/Factory/AwsFactory.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\Module;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\FactoryInterface;
8+
use Zend\ServiceManager\Factory\FactoryInterface;
99
use Zend\ServiceManager\ServiceLocatorInterface;
10-
use Zend\Version\Version;
1110

1211
/**
1312
* Factory used to instantiate an AWS client
@@ -16,18 +15,19 @@ class AwsFactory implements FactoryInterface
1615
{
1716
/**
1817
* @param ContainerInterface $container
19-
* @param string $requestedName
20-
* @param array|null $options
18+
* @param string $requestedName
19+
* @param array|null $options
2120
* @return AwsSdk
2221
*/
2322
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
2423
{
2524
// Instantiate the AWS SDK for PHP
2625
$config = $container->get('Config');
2726
$config = isset($config['aws']) ? $config['aws'] : [];
27+
2828
$config += [
2929
'ua_append' => [
30-
'ZF2/' . Version::VERSION,
30+
'ZF2/' . Module::VERSION,
3131
'ZFMOD/' . Module::VERSION,
3232
]
3333
];

‎src/Factory/CloudFrontLinkViewHelperFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\View\Helper\CloudFrontLink;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\FactoryInterface;
8+
use Zend\ServiceManager\Factory\FactoryInterface;
99
use Zend\ServiceManager\ServiceLocatorInterface;
1010

1111
/**

‎src/Factory/DynamoDbSessionSaveHandlerFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use AwsModule\Session\SaveHandler\DynamoDb as DynamoDbSaveHandler;
88
use Interop\Container\ContainerInterface;
99
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
10-
use Zend\ServiceManager\FactoryInterface;
10+
use Zend\ServiceManager\Factory\FactoryInterface;
1111
use Zend\ServiceManager\ServiceLocatorInterface;
1212

1313
/**

‎src/Factory/S3LinkViewHelperFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\View\Helper\S3Link;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\FactoryInterface;
8+
use Zend\ServiceManager\Factory\FactoryInterface;
99
use Zend\ServiceManager\ServiceLocatorInterface;
1010

1111
/**

‎src/Factory/S3RenameUploadFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\Filter\File\S3RenameUpload;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\FactoryInterface;
8+
use Zend\ServiceManager\Factory\FactoryInterface;
99
use Zend\ServiceManager\ServiceLocatorInterface;
1010

1111
/**

‎tests/Factory/AwsFactoryTest.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use Aws\Sdk as AwsSdk;
77
use AwsModule\Module;
88
use Zend\ServiceManager\ServiceLocatorInterface;
9-
use Zend\Version\Version;
109

1110
/**
1211
* AWS Module test cases
@@ -29,21 +28,19 @@ public function testProvidesVersionInformationForSdkUserAgent()
2928
$serviceLocator = $this->getMockServiceLocator();
3029
$awsFactory = new AwsFactory();
3130
$aws = $awsFactory->createService($serviceLocator);
32-
$argsProperty = (new \ReflectionClass($aws))
33-
->getProperty('args');
31+
$argsProperty = (new \ReflectionClass($aws))->getProperty('args');
3432
$argsProperty->setAccessible(true);
3533
$args = $argsProperty->getValue($aws);
3634

35+
3736
$this->assertArrayHasKey('ua_append', $args);
3837
$this->assertInternalType('array', $args['ua_append']);
3938
$this->assertNotEmpty($args['ua_append']);
4039
$this->assertNotEmpty(array_filter($args['ua_append'], function ($ua) {
4140
return false !== strpos($ua, Module::VERSION);
4241
}));
43-
$this->assertNotEmpty(array_filter($args['ua_append'], function ($ua) {
44-
return false !== strpos($ua, Version::VERSION);
45-
}));
4642
}
43+
4744
private function getMockServiceLocator()
4845
{
4946
$serviceLocator = $this->getMock(ServiceLocatorInterface::class);

0 commit comments

Comments
 (0)