Skip to content

Commit 2967717

Browse files
almost-onlinealmost-online
authored
Migrate to the Laminas project (#65)
1 parent 84c57ad commit 2967717

14 files changed

+66
-65
lines changed

‎Module.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AwsModule;
44

5-
use Zend\ModuleManager\Feature\ConfigProviderInterface;
5+
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
66

77
/**
88
* Zend Framework 2 module that allows easy consumption of the AWS SDK for PHP

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ the DynamoDB session save handler might be used like this:
215215

216216
```php
217217
use AwsModule\Session\SaveHandler\DynamoDb as DynamoDbSaveHandler;
218-
use Zend\Session\SessionManager;
218+
use Laminas\Session\SessionManager;
219219

220220
// Assume we are in a context where $serviceLocator is a ZF2 service locator.
221221

@@ -267,4 +267,4 @@ The following are some ZF2 modules that use the AWS SDK for PHP by including thi
267267
* [AWS SDK for PHP website](http://aws.amazon.com/sdkforphp/)
268268
* [AWS on Packagist](https://packagist.org/packages/aws)
269269
* [License](http://aws.amazon.com/apache2.0/)
270-
* [ZF2 website](http://framework.zend.com)
270+
* [Laminas (ZF2) website](https://getlaminas.org/)

‎composer.json‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
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-2.0",
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.9.0",
21-
"zendframework/zend-servicemanager": "^2.7.0 || ^3.0",
22-
"zendframework/zend-session": "^2.7.0",
23-
"zendframework/zend-view": "^2.8"
24-
},
25-
"require-dev": {
26-
"phpunit/phpunit": "5.*",
27-
"zendframework/zend-modulemanager": "2.7.*",
28-
"squizlabs/php_codesniffer": "~2.3"
29-
},
30-
"autoload": {
31-
"psr-4": {
32-
"AwsModule\\": "src/"
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-2.0",
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+
"laminas/laminas-filter": "^2.9.0",
21+
"laminas/laminas-servicemanager": "^2.7.0 || ^3.0",
22+
"laminas/laminas-session": "^2.7.0",
23+
"laminas/laminas-view": "^2.8",
24+
"laminas/laminas-dependency-plugin": "^1.0"
3325
},
34-
"classmap": [
35-
"./Module.php"
36-
]
37-
},
38-
"autoload-dev": {
39-
"psr-4": {
40-
"AwsModule\\Tests\\": "tests/"
41-
}
42-
},
43-
"extra": {
44-
"zf": {
45-
"module": "AwsModule"
26+
"require-dev": {
27+
"phpunit/phpunit": "5.*",
28+
"laminas/laminas-modulemanager": "2.7.*",
29+
"squizlabs/php_codesniffer": "~2.3"
30+
},
31+
"autoload": {
32+
"psr-4": {
33+
"AwsModule\\": "src/"
34+
},
35+
"classmap": [
36+
"./Module.php"
37+
]
38+
},
39+
"autoload-dev": {
40+
"psr-4": {
41+
"AwsModule\\Tests\\": "tests/"
42+
}
43+
},
44+
"extra": {
45+
"zf": {
46+
"module": "AwsModule"
47+
}
4648
}
47-
}
4849
}

‎src/Factory/AwsFactory.php‎

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

1111
/**
1212
* Factory used to instantiate an AWS client

‎src/Factory/CloudFrontLinkViewHelperFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\View\Helper\CloudFrontLink;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\Factory\FactoryInterface;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
8+
use Laminas\ServiceManager\Factory\FactoryInterface;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010

1111
/**
1212
* Factory used to instantiate a CloudFront link view helper

‎src/Factory/DynamoDbSessionSaveHandlerFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Aws\DynamoDb\SessionHandler;
77
use AwsModule\Session\SaveHandler\DynamoDb as DynamoDbSaveHandler;
88
use Interop\Container\ContainerInterface;
9-
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
10-
use Zend\ServiceManager\Factory\FactoryInterface;
11-
use Zend\ServiceManager\ServiceLocatorInterface;
9+
use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
10+
use Laminas\ServiceManager\Factory\FactoryInterface;
11+
use Laminas\ServiceManager\ServiceLocatorInterface;
1212

1313
/**
1414
* Factory used to instantiate a DynamoDB-backed session save handler

‎src/Factory/S3LinkViewHelperFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\View\Helper\S3Link;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\Factory\FactoryInterface;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
8+
use Laminas\ServiceManager\Factory\FactoryInterface;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010

1111
/**
1212
* Factory used to instantiate a S3 link view helper

‎src/Factory/S3RenameUploadFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Aws\Sdk as AwsSdk;
66
use AwsModule\Filter\File\S3RenameUpload;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\Factory\FactoryInterface;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
8+
use Laminas\ServiceManager\Factory\FactoryInterface;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010

1111
/**
1212
* Factory used to instantiate a S3RenameUpload file filter

‎src/Filter/File/S3RenameUpload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Aws\S3\S3Client;
66
use AwsModule\Filter\Exception\MissingBucketException;
7-
use Zend\Filter\File\RenameUpload;
7+
use Laminas\Filter\File\RenameUpload;
88

99
/**
1010
* File filter that allow to directly upload to Amazon S3, and optionally rename the file

‎src/Session/SaveHandler/DynamoDb.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace AwsModule\Session\SaveHandler;
44

55
use Aws\Dynamodb\SessionHandler;
6-
use Zend\Session\SaveHandler\SaveHandlerInterface;
6+
use Laminas\Session\SaveHandler\SaveHandlerInterface;
77

88
/**
99
* DynamoDB session save handler

0 commit comments

Comments
 (0)