diff --git a/.travis.yml b/.travis.yml index 12ceee5..1e6f06e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: xenial cache: directories: @@ -11,38 +11,34 @@ matrix: - php: nightly include: - - php: 5.5.9 - env: LARAVEL="5.1.*" LUMEN="5.1.*" - - php: hhvm-3.18 - env: LARAVEL="5.1.*" LUMEN="5.1.*" - - php: 7.0 - env: LARAVEL="5.5.*" LUMEN="5.5.*" - php: 7.1 - env: LARAVEL="^5.5" LUMEN="^5.5" + env: LARAVEL="^5.6" LUMEN="^5.6" - php: 7.2 - env: LARAVEL="^5.5" LUMEN="^5.5" + env: LARAVEL="^5.6" LUMEN="^5.6" - php: 7.2 env: LARAVEL="^6.0" LUMEN="^6.0" - php: 7.2 - env: LARAVEL="^7.0" LUMEN="^7.0@dev" + env: LARAVEL="^7.0" LUMEN="^7.0" - php: 7.3 env: LARAVEL="^6.0" LUMEN="^6.0" - php: 7.3 env: LARAVEL="^7.0" LUMEN="^7.0" - php: 7.3 - env: LARAVEL="^8.0" LUMEN="^8.0@dev" + env: LARAVEL="^8.0" LUMEN="^8.0" - php: 7.4 env: LARAVEL="^6.0" LUMEN="^6.0" - php: 7.4 env: LARAVEL="^7.0" LUMEN="^7.0" - php: 7.4 - env: LARAVEL="^8.0" LUMEN="^8.0@dev" - - php: nightly - env: LARAVEL="^6.0" LUMEN="^6.0" + env: LARAVEL="^8.0" LUMEN="^8.0" + - php: 8.0 + env: LARAVEL="^8.0" LUMEN="^8.0" + - php: 8.0 + env: LARAVEL="^9.0" LUMEN="^9.0@dev" - php: nightly - env: LARAVEL="^7.0" LUMEN="^7.0" + env: LARAVEL="^8.0" LUMEN="^8.0" - php: nightly - env: LARAVEL="^8.0" LUMEN="^8.0@dev" + env: LARAVEL="^9.0" LUMEN="^9.0@dev" before_install: - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini diff --git a/README.md b/README.md index 6b08f68..7464ad4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AWS Service Provider for Laravel 5/6/7/8 +# AWS Service Provider for Laravel 5/6/7/8/9 [![@awsforphp on Twitter](http://img.shields.io/badge/twitter-%40awsforphp-blue.svg?style=flat)](https://twitter.com/awsforphp) [![Build Status](https://img.shields.io/travis/aws/aws-sdk-php-laravel.svg)](https://travis-ci.org/aws/aws-sdk-php-laravel) @@ -14,7 +14,7 @@ PHP and Laravel 5.1. **Major Versions:** -* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0|~7.0|~8.0` and `aws/aws-sdk-php:~3.0` +* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0|~7.0|~8.0|~9.0` and `aws/aws-sdk-php:~3.0` * **2.x** ([2.0 branch](https://github.com/aws/aws-sdk-php-laravel/tree/2.0)) - For `laravel/framework:5.0.*` and `aws/aws-sdk-php:~2.4` * **1.x** ([1.0 branch](https://github.com/aws/aws-sdk-php-laravel/tree/1.0)) - For `laravel/framework:4.*` and `aws/aws-sdk-php:~2.4` diff --git a/composer.json b/composer.json index 427c541..0821df2 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "name": "aws/aws-sdk-php-laravel", "homepage": "http://aws.amazon.com/sdkforphp2", - "description": "A simple Laravel 5/6/7/8 service provider for including the AWS SDK for PHP.", - "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], + "description": "A simple Laravel 5/6/7/8/9 service provider for including the AWS SDK for PHP.", + "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], "type":"library", "license":"Apache-2.0", "authors":[ @@ -12,12 +12,12 @@ } ], "require": { - "php": ">=5.5.9", + "php": ">=7.1.0", "aws/aws-sdk-php": "~3.0", - "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0" + "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0" }, "suggest": { diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index 3686345..4d0e1fc 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -3,8 +3,9 @@ use Aws\Laravel\AwsFacade as AWS; use Aws\Laravel\AwsServiceProvider; use Illuminate\Container\Container; +use PHPUnit\Framework\TestCase; -abstract class AwsServiceProviderTest extends \PHPUnit_Framework_TestCase +abstract class AwsServiceProviderTest extends TestCase { public function testFacadeCanBeResolvedToServiceInstance() @@ -52,7 +53,7 @@ public function testVersionInformationIsProvidedToSdkUserAgent() $config = $app['config']->get('aws'); $this->assertArrayHasKey('ua_append', $config); - $this->assertInternalType('array', $config['ua_append']); + $this->assertIsArray($config['ua_append']); $this->assertNotEmpty($config['ua_append']); $this->assertNotEmpty(array_filter($config['ua_append'], function ($ua) { return false !== strpos($ua, AwsServiceProvider::VERSION); diff --git a/tests/LaravelAwsServiceProviderTest.php b/tests/LaravelAwsServiceProviderTest.php index 85f24d6..dabf05e 100644 --- a/tests/LaravelAwsServiceProviderTest.php +++ b/tests/LaravelAwsServiceProviderTest.php @@ -5,7 +5,7 @@ class LaravelAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp() + public function setUp() : void { if (!class_exists(Application::class)) { $this->markTestSkipped(); diff --git a/tests/LumenAwsServiceProviderTest.php b/tests/LumenAwsServiceProviderTest.php index ff301c4..65414ac 100644 --- a/tests/LumenAwsServiceProviderTest.php +++ b/tests/LumenAwsServiceProviderTest.php @@ -6,7 +6,7 @@ class LumenAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp() + public function setUp() : void { if (!class_exists(Application::class)) { $this->markTestSkipped();