From 29543d6f0a082fb523508e1405bd0d7f69c06e17 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Fri, 4 Mar 2022 12:38:18 -0800 Subject: [PATCH 01/40] add lumen 9 support --- .github/workflows/tests.yml | 57 +++++++++++++++++++++++++++++++++++++ README.md | 4 +-- composer.json | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..a2732bc --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,57 @@ +name: PHP Composer + +#whenever master has a PR or is pushed to +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + run: + runs-on: ubuntu-18.04 + strategy: + #for each of the following versions of PHP, with and without --prefer-lowest + matrix: + php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'] + composer-options: ['--no-interaction --prefer-dist', ' --no-interaction --prefer-dist --prefer-lowest'] + #set the name for each job + name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} + #set up environment variables used by unit tests + env: + AWS_ACCESS_KEY_ID: foo + AWS_SECRET_ACCESS_KEY: bar + AWS_CSM_ENABLED: false + steps: + #sets up the correct version of PHP with necessary config options + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + ini-values: memory_limit=4G, phar.readonly=false + + #checkout the codebase from github + - name: Checkout codebase + uses: actions/checkout@v3 + + #require laravel + - name: require laravel + run: composer require laravel/framework ${{ matrix.composer-options }} + + #run tests + - name: Run test suite + run: vendor/bin/phpunit + + #remove laravel + - name: Remove laravel + run: | + composer remove laravel/framework + rm composer.lock + + #require lumen + - name: require laravel + run: composer require laravel/lumen-framework ${{ matrix.composer-options }} + + #run tests + - name: Run test suite + run: vendor/bin/phpunit diff --git a/README.md b/README.md index 6b08f68..150a268 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..57dd4cf 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require": { "php": ">=5.5.9", "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", From f77f8782b461791d3f283b77c67cbb5dbd07d17e Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Fri, 4 Mar 2022 12:46:06 -0800 Subject: [PATCH 02/40] update tests --- .github/workflows/tests.yml | 6 +++--- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a2732bc..734e146 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: #for each of the following versions of PHP, with and without --prefer-lowest matrix: php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'] - composer-options: ['--no-interaction --prefer-dist', ' --no-interaction --prefer-dist --prefer-lowest'] + composer-options: ['', '--prefer-lowest'] #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} #set up environment variables used by unit tests @@ -36,7 +36,7 @@ jobs: #require laravel - name: require laravel - run: composer require laravel/framework ${{ matrix.composer-options }} + run: composer require laravel/framework --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} #run tests - name: Run test suite @@ -50,7 +50,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework ${{ matrix.composer-options }} + run: composer require laravel/lumen-framework--no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} #run tests - name: Run test suite diff --git a/composer.json b/composer.json index 57dd4cf..9a79269 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":[ From 80ef01d4b7a1a20c4244c8d6b0488f5b8c5de842 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 14:43:39 -0500 Subject: [PATCH 03/40] Update tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 734e146..af520e2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'] + php-versions: ['5.5'] composer-options: ['', '--prefer-lowest'] #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} @@ -36,7 +36,7 @@ jobs: #require laravel - name: require laravel - run: composer require laravel/framework --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} + run: composer require laravel/framework:5.1.* --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} #run tests - name: Run test suite @@ -50,7 +50,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework--no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} + run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} #run tests - name: Run test suite From e0cc9ba2ca0f176ecccc0785de89201d1f8bc5f7 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 14:47:22 -0500 Subject: [PATCH 04/40] Update tests.yml --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index af520e2..e371237 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,6 +33,12 @@ jobs: #checkout the codebase from github - name: Checkout codebase uses: actions/checkout@v3 + + #remove laravel + - name: Remove laravel + run: | + composer remove laravel/framework + rm composer.lock #require laravel - name: require laravel From 1e05101dd3786a037dda6f1c5c8fa6b7e804de8b Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 14:49:19 -0500 Subject: [PATCH 05/40] Update tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e371237..282b9f7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: #checkout the codebase from github - name: Checkout codebase uses: actions/checkout@v3 - + #remove laravel - name: Remove laravel run: | @@ -42,7 +42,7 @@ jobs: #require laravel - name: require laravel - run: composer require laravel/framework:5.1.* --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} + run: composer require laravel/framework:5.1.* --no-interaction --prefer-dist ${{ matrix.composer-options }} #run tests - name: Run test suite @@ -56,7 +56,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist --ignore-platform-reqs ${{ matrix.composer-options }} + run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist ${{ matrix.composer-options }} #run tests - name: Run test suite From 16a954670d353966610646db0e663814d921c176 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 14:55:34 -0500 Subject: [PATCH 06/40] Update tests.yml --- .github/workflows/tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 282b9f7..0b59bbc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,8 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5'] + php-versions: ['5.5', '7.0'] + laravel-versions: ['5.1.*', '5.5.*'] composer-options: ['', '--prefer-lowest'] #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} @@ -34,6 +35,10 @@ jobs: - name: Checkout codebase uses: actions/checkout@v3 + #find composer + - name: Find Composer + run: which composer + #remove laravel - name: Remove laravel run: | @@ -42,7 +47,7 @@ jobs: #require laravel - name: require laravel - run: composer require laravel/framework:5.1.* --no-interaction --prefer-dist ${{ matrix.composer-options }} + run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist ${{ matrix.composer-options }} #run tests - name: Run test suite From af80723c09741623c37aa876a20c39365afa8100 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:01:51 -0500 Subject: [PATCH 07/40] Update tests.yml --- .github/workflows/tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0b59bbc..c24ba22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,9 +13,12 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '7.0'] - laravel-versions: ['5.1.*', '5.5.*'] composer-options: ['', '--prefer-lowest'] + include: + - php-version: '5.5' + laravel-version: '5.1.*' + - php-version: '7.0' + laravel-version: '5.5.*' #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} #set up environment variables used by unit tests From c87c9d3e321b019363dcc884b5e6ee4636fe5303 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:03:36 -0500 Subject: [PATCH 08/40] Update tests.yml --- .github/workflows/tests.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c24ba22..d798aa0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,12 +13,14 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: + php-versions: [''] + laravel-versions: [''] composer-options: ['', '--prefer-lowest'] include: - - php-version: '5.5' - laravel-version: '5.1.*' - - php-version: '7.0' - laravel-version: '5.5.*' + - php-versions: '5.5' + laravel-versions: '5.1.*' + - php-versions: '7.0' + laravel-versions: '5.5.*' #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} #set up environment variables used by unit tests From 50564cf6002b6c9b4ea7c508180a12e244aaee9d Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:04:28 -0500 Subject: [PATCH 09/40] Update tests.yml --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d798aa0..ba0f1ac 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: [''] - laravel-versions: [''] + php-versions: ['5.5', '7.0'] composer-options: ['', '--prefer-lowest'] include: - php-versions: '5.5' From d6871badd5d25d6f7917b83ffeaea0c95c9f129d Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:07:08 -0500 Subject: [PATCH 10/40] Update tests.yml --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ba0f1ac..5186ea6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,13 +13,15 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '7.0'] + php-versions: ['5.5', '7.0', '7.1'] composer-options: ['', '--prefer-lowest'] include: - php-versions: '5.5' laravel-versions: '5.1.*' - php-versions: '7.0' laravel-versions: '5.5.*' + - php-versions: '7.0' + laravel-versions: '^5.5' #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} #set up environment variables used by unit tests From ab99bbb5d1cdf9ae75c6e74cba9af6da437d82b0 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:09:15 -0500 Subject: [PATCH 11/40] Update tests.yml --- .github/workflows/tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5186ea6..3e4aeb7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,15 +13,18 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '7.0', '7.1'] + php-versions: ['5.5', '5.6', '7.0', '7.1'] composer-options: ['', '--prefer-lowest'] include: - php-versions: '5.5' laravel-versions: '5.1.*' + - php-versions: '5.6' + laravel-versions: '5.1.*' - php-versions: '7.0' laravel-versions: '5.5.*' - - php-versions: '7.0' + - php-versions: '7.1' laravel-versions: '^5.5' + #set the name for each job name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} #set up environment variables used by unit tests @@ -41,10 +44,6 @@ jobs: - name: Checkout codebase uses: actions/checkout@v3 - #find composer - - name: Find Composer - run: which composer - #remove laravel - name: Remove laravel run: | From 3c232b7dea271470792d35265d8259cf7999def9 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:13:04 -0500 Subject: [PATCH 12/40] Update tests.yml --- .github/workflows/tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e4aeb7..055f549 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,6 @@ jobs: #for each of the following versions of PHP, with and without --prefer-lowest matrix: php-versions: ['5.5', '5.6', '7.0', '7.1'] - composer-options: ['', '--prefer-lowest'] include: - php-versions: '5.5' laravel-versions: '5.1.*' @@ -26,7 +25,7 @@ jobs: laravel-versions: '^5.5' #set the name for each job - name: PHP ${{ matrix.php-versions }} ${{ matrix.composer-options }} + name: PHP ${{ matrix.php-versions }} #set up environment variables used by unit tests env: AWS_ACCESS_KEY_ID: foo @@ -52,7 +51,7 @@ jobs: #require laravel - name: require laravel - run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist ${{ matrix.composer-options }} + run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist #run tests - name: Run test suite @@ -66,7 +65,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist ${{ matrix.composer-options }} + run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist #run tests - name: Run test suite From cabd021d6100f54bf6ae5c875ae4278d6472cd87 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:14:41 -0500 Subject: [PATCH 13/40] Update tests.yml --- .github/workflows/tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 055f549..a71d73f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1'] + php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2'] include: - php-versions: '5.5' laravel-versions: '5.1.*' @@ -23,6 +23,8 @@ jobs: laravel-versions: '5.5.*' - php-versions: '7.1' laravel-versions: '^5.5' + - php-versions: '7.2' + laravel-versions: ['^5.5', '6.0', '7.0'] #set the name for each job name: PHP ${{ matrix.php-versions }} @@ -65,7 +67,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist + run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist #run tests - name: Run test suite From a3d0c3d95c037a8169326c46c02a40b03263abc4 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:16:11 -0500 Subject: [PATCH 14/40] Update tests.yml --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a71d73f..f22ce12 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,9 @@ jobs: - php-versions: '7.1' laravel-versions: '^5.5' - php-versions: '7.2' - laravel-versions: ['^5.5', '6.0', '7.0'] + laravel-versions: '^5.5' + - php-versions: '7.2' + laravel-versions: '^6.0' #set the name for each job name: PHP ${{ matrix.php-versions }} From a8b8dc99a141675a1db2fd253149979be9ce92c1 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:18:29 -0500 Subject: [PATCH 15/40] Update tests.yml --- .github/workflows/tests.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f22ce12..c09feb0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2'] + php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.1', '7.2.2'] include: - php-versions: '5.5' laravel-versions: '5.1.*' @@ -23,9 +23,9 @@ jobs: laravel-versions: '5.5.*' - php-versions: '7.1' laravel-versions: '^5.5' - - php-versions: '7.2' + - php-versions: '7.2.1' laravel-versions: '^5.5' - - php-versions: '7.2' + - php-versions: '7.2.2' laravel-versions: '^6.0' #set the name for each job @@ -47,12 +47,6 @@ jobs: - name: Checkout codebase uses: actions/checkout@v3 - #remove laravel - - name: Remove laravel - run: | - composer remove laravel/framework - rm composer.lock - #require laravel - name: require laravel run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist @@ -69,7 +63,7 @@ jobs: #require lumen - name: require laravel - run: composer require laravel/lumen-framework:5.1.* --no-interaction --prefer-dist + run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist #run tests - name: Run test suite From f944defacdf36c7a3d39dd21cfce7a412be38e65 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:21:26 -0500 Subject: [PATCH 16/40] Update tests.yml --- .github/workflows/tests.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c09feb0..1acd31a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.1', '7.2.2'] + php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.1', '7.2.2', '7.2.3', '7.3.1', '7.3.2', '7.3.3'] include: - php-versions: '5.5' laravel-versions: '5.1.*' @@ -27,6 +27,14 @@ jobs: laravel-versions: '^5.5' - php-versions: '7.2.2' laravel-versions: '^6.0' + - php-versions: '7.2.3' + laravel-versions: '^7.0' + - php-versions: '7.3.1' + laravel-versions: '^6.0' + - php-versions: '7.3.2' + laravel-versions: '^7.0' + - php-versions: '7.3.3' + laravel-versions: '^8.0' #set the name for each job name: PHP ${{ matrix.php-versions }} From 3d12983b0483cac29a5420cfd18b91184bb4e920 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:24:24 -0500 Subject: [PATCH 17/40] Update tests.yml --- .github/workflows/tests.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1acd31a..6260347 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.1', '7.2.2', '7.2.3', '7.3.1', '7.3.2', '7.3.3'] + php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0', '8.0.1'] include: - php-versions: '5.5' laravel-versions: '5.1.*' @@ -23,18 +23,28 @@ jobs: laravel-versions: '5.5.*' - php-versions: '7.1' laravel-versions: '^5.5' - - php-versions: '7.2.1' + - php-versions: '7.2.0' laravel-versions: '^5.5' - - php-versions: '7.2.2' + - php-versions: '7.2.1' laravel-versions: '^6.0' - - php-versions: '7.2.3' + - php-versions: '7.2.2' laravel-versions: '^7.0' - - php-versions: '7.3.1' + - php-versions: '7.3.0' laravel-versions: '^6.0' + - php-versions: '7.3.1' + laravel-versions: '^7.0' - php-versions: '7.3.2' + laravel-versions: '^8.0' + - php-versions: '7.4.0' + laravel-versions: '^6.0' + - php-versions: '7.4.1' laravel-versions: '^7.0' - - php-versions: '7.3.3' + - php-versions: '7.4.2' + laravel-versions: '^8.0' + - php-versions: '8.0.0' laravel-versions: '^8.0' + - php-versions: '8.0.1' + laravel-versions: '^9.0' #set the name for each job name: PHP ${{ matrix.php-versions }} From 90036094c54b95505bfb8b6ecb39454610b2dbb4 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:28:43 -0500 Subject: [PATCH 18/40] delete travis file --- .github/workflows/tests.yml | 5 ++++ .travis.yml | 56 ------------------------------------- 2 files changed, 5 insertions(+), 56 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6260347..8d4cb8d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -65,6 +65,11 @@ jobs: - name: Checkout codebase uses: actions/checkout@v3 + #upgrade to minimum supported php unit + - if: ${{ matrix.php-versions <= '8.0'}} + name: PHP 8.0+ specific setup + run: composer require --dev --ignore-platform-reqs phpunit/phpunit "^8.0" + #require laravel - name: require laravel run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 12ceee5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -dist: trusty - -cache: - directories: - - $HOME/.composer/cache/files - -language: php - -matrix: - allow_failures: - - 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" - - php: 7.2 - env: LARAVEL="^5.5" LUMEN="^5.5" - - php: 7.2 - env: LARAVEL="^6.0" LUMEN="^6.0" - - php: 7.2 - env: LARAVEL="^7.0" LUMEN="^7.0@dev" - - 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" - - 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" - - php: nightly - env: LARAVEL="^7.0" LUMEN="^7.0" - - php: nightly - env: LARAVEL="^8.0" LUMEN="^8.0@dev" - -before_install: - - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - -script: - - travis_retry composer require laravel/framework:${LARAVEL} --no-interaction --prefer-dist - - vendor/bin/phpunit - - composer remove laravel/framework - - rm composer.lock - - travis_retry composer require laravel/lumen-framework:${LUMEN} --no-interaction --prefer-dist - - vendor/bin/phpunit From 6e193478fb2e6b2da0551701bd60044e35ca6bfb Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:29:33 -0500 Subject: [PATCH 19/40] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8d4cb8d..7d28e8a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,7 +66,7 @@ jobs: uses: actions/checkout@v3 #upgrade to minimum supported php unit - - if: ${{ matrix.php-versions <= '8.0'}} + - if: ${{ matrix.php-versions >= '8.0'}} name: PHP 8.0+ specific setup run: composer require --dev --ignore-platform-reqs phpunit/phpunit "^8.0" From d062fef1a182d79582e32d1a375ef2588924fb5e Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:31:56 -0500 Subject: [PATCH 20/40] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7d28e8a..2398903 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,7 +68,7 @@ jobs: #upgrade to minimum supported php unit - if: ${{ matrix.php-versions >= '8.0'}} name: PHP 8.0+ specific setup - run: composer require --dev --ignore-platform-reqs phpunit/phpunit "^8.0" + run: composer require --dev --ignore-platform-reqs phpunit/phpunit ">=8.0" #require laravel - name: require laravel From 9a114912e3761bd88787a4a624606707659af06f Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:35:15 -0500 Subject: [PATCH 21/40] Update tests.yml --- .github/workflows/tests.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2398903..247b6e9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,15 +13,15 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0', '8.0.1'] + php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0', '8.0.1'] include: - - php-versions: '5.5' + - php-versions: '5.5.0' laravel-versions: '5.1.*' - - php-versions: '5.6' + - php-versions: '5.6.0' laravel-versions: '5.1.*' - - php-versions: '7.0' + - php-versions: '7.0.0' laravel-versions: '5.5.*' - - php-versions: '7.1' + - php-versions: '7.1.0' laravel-versions: '^5.5' - php-versions: '7.2.0' laravel-versions: '^5.5' @@ -42,8 +42,6 @@ jobs: - php-versions: '7.4.2' laravel-versions: '^8.0' - php-versions: '8.0.0' - laravel-versions: '^8.0' - - php-versions: '8.0.1' laravel-versions: '^9.0' #set the name for each job From 7ddbbc2bdd1f64c2ceebf99e8c4ce642590432b8 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:35:43 -0500 Subject: [PATCH 22/40] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 247b6e9..898a232 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0', '8.0.1'] + php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] include: - php-versions: '5.5.0' laravel-versions: '5.1.*' From 85785cd232fc11225e30b863181288c4537f056e Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:38:30 -0500 Subject: [PATCH 23/40] Update AwsServiceProviderTest.php --- tests/AwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index 3686345..a9c54a0 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -4,7 +4,7 @@ use Aws\Laravel\AwsServiceProvider; use Illuminate\Container\Container; -abstract class AwsServiceProviderTest extends \PHPUnit_Framework_TestCase +abstract class AwsServiceProviderTest extends \PHPUnit\Framework\TestCase { public function testFacadeCanBeResolvedToServiceInstance() From 8229429af0f0d7af0baf6a0e5351f5edd7f92cc3 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:40:28 -0500 Subject: [PATCH 24/40] Update LaravelAwsServiceProviderTest.php --- tests/LaravelAwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/LaravelAwsServiceProviderTest.php b/tests/LaravelAwsServiceProviderTest.php index 85f24d6..11c5835 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(); From 1b1b533733802903302112eb9bc442fe419f146e Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:41:46 -0500 Subject: [PATCH 25/40] Update tests.yml --- .github/workflows/tests.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 898a232..d4f07ef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,14 +13,8 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] + php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] include: - - php-versions: '5.5.0' - laravel-versions: '5.1.*' - - php-versions: '5.6.0' - laravel-versions: '5.1.*' - - php-versions: '7.0.0' - laravel-versions: '5.5.*' - php-versions: '7.1.0' laravel-versions: '^5.5' - php-versions: '7.2.0' From 21708e8546bcfe788bb1437905118f45563c70a3 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:42:50 -0500 Subject: [PATCH 26/40] Update LumenAwsServiceProviderTest.php --- tests/LumenAwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/LumenAwsServiceProviderTest.php b/tests/LumenAwsServiceProviderTest.php index ff301c4..5228544 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(); From b485bbafc7c6009e726410ce5581d7b2b8097512 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 15:44:22 -0500 Subject: [PATCH 27/40] Update phpunit.xml --- phpunit.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 9bca1c5..e5598ab 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,8 +7,7 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" - syntaxCheck="false"> + stopOnFailure="false"> From b21a033e06ac9818ef8800c738694b67c276f6c4 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:15:19 -0500 Subject: [PATCH 28/40] Revert "Update phpunit.xml" This reverts commit b485bbafc7c6009e726410ce5581d7b2b8097512. --- phpunit.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index e5598ab..9bca1c5 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,7 +7,8 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false"> + stopOnFailure="false" + syntaxCheck="false"> From f631ae976c1c3793203bdb9cd9f8bede8485ca25 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:15:21 -0500 Subject: [PATCH 29/40] Revert "Update LumenAwsServiceProviderTest.php" This reverts commit 21708e8546bcfe788bb1437905118f45563c70a3. --- tests/LumenAwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/LumenAwsServiceProviderTest.php b/tests/LumenAwsServiceProviderTest.php index 5228544..ff301c4 100644 --- a/tests/LumenAwsServiceProviderTest.php +++ b/tests/LumenAwsServiceProviderTest.php @@ -6,7 +6,7 @@ class LumenAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp(): void + public function setUp() { if (!class_exists(Application::class)) { $this->markTestSkipped(); From 4e509eaf53220f2401d12337a409218481efb9a7 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:15:37 -0500 Subject: [PATCH 30/40] Revert "Update tests.yml" This reverts commit 1b1b533733802903302112eb9bc442fe419f146e. --- .github/workflows/tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d4f07ef..898a232 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,14 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] + php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] include: + - php-versions: '5.5.0' + laravel-versions: '5.1.*' + - php-versions: '5.6.0' + laravel-versions: '5.1.*' + - php-versions: '7.0.0' + laravel-versions: '5.5.*' - php-versions: '7.1.0' laravel-versions: '^5.5' - php-versions: '7.2.0' From f93714f1d3c5af43580044574da3cbe481b27860 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:17:56 -0500 Subject: [PATCH 31/40] reverting --- .github/workflows/tests.yml | 9 +-------- tests/AwsServiceProviderTest.php | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 898a232..97f57bd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] + php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2'] include: - php-versions: '5.5.0' laravel-versions: '5.1.*' @@ -41,8 +41,6 @@ jobs: laravel-versions: '^7.0' - php-versions: '7.4.2' laravel-versions: '^8.0' - - php-versions: '8.0.0' - laravel-versions: '^9.0' #set the name for each job name: PHP ${{ matrix.php-versions }} @@ -63,11 +61,6 @@ jobs: - name: Checkout codebase uses: actions/checkout@v3 - #upgrade to minimum supported php unit - - if: ${{ matrix.php-versions >= '8.0'}} - name: PHP 8.0+ specific setup - run: composer require --dev --ignore-platform-reqs phpunit/phpunit ">=8.0" - #require laravel - name: require laravel run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index a9c54a0..e34706c 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -4,7 +4,7 @@ use Aws\Laravel\AwsServiceProvider; use Illuminate\Container\Container; -abstract class AwsServiceProviderTest extends \PHPUnit\Framework\TestCase +abstract class AwsServiceProviderTest extends \PHPUnit_Framework_TestCase { public function testFacadeCanBeResolvedToServiceInstance() @@ -52,7 +52,7 @@ public function testVersionInformationIsProvidedToSdkUserAgent() $config = $app['config']->get('aws'); $this->assertArrayHasKey('ua_append', $config); - $this->assertInternalType('array', $config['ua_append']); + $this->assertIsArray('array', $config['ua_append']); $this->assertNotEmpty($config['ua_append']); $this->assertNotEmpty(array_filter($config['ua_append'], function ($ua) { return false !== strpos($ua, AwsServiceProvider::VERSION); From 53f234e73d2ea6f868a07c33f1b7844c99bfe65d Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:19:03 -0500 Subject: [PATCH 32/40] remove changes --- tests/AwsServiceProviderTest.php | 2 +- tests/LaravelAwsServiceProviderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index e34706c..3686345 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -52,7 +52,7 @@ public function testVersionInformationIsProvidedToSdkUserAgent() $config = $app['config']->get('aws'); $this->assertArrayHasKey('ua_append', $config); - $this->assertIsArray('array', $config['ua_append']); + $this->assertInternalType('array', $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 11c5835..85f24d6 100644 --- a/tests/LaravelAwsServiceProviderTest.php +++ b/tests/LaravelAwsServiceProviderTest.php @@ -5,7 +5,7 @@ class LaravelAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp(): void + public function setUp() { if (!class_exists(Application::class)) { $this->markTestSkipped(); From fb6b754f12bd165f5c15c64ab30f859dd1c5c315 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:25:48 -0500 Subject: [PATCH 33/40] laravel 9 tests --- .github/workflows/tests.yml | 10 +++------- composer.json | 4 ++-- phpunit.xml | 3 +-- tests/AwsServiceProviderTest.php | 2 +- tests/LumenAwsServiceProviderTest.php | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 97f57bd..e36bb0d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,14 +13,8 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['5.5.0', '5.6.0', '7.0.0', '7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2'] + php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2' '8.0.0'] include: - - php-versions: '5.5.0' - laravel-versions: '5.1.*' - - php-versions: '5.6.0' - laravel-versions: '5.1.*' - - php-versions: '7.0.0' - laravel-versions: '5.5.*' - php-versions: '7.1.0' laravel-versions: '^5.5' - php-versions: '7.2.0' @@ -41,6 +35,8 @@ jobs: laravel-versions: '^7.0' - php-versions: '7.4.2' laravel-versions: '^8.0' + - php-versions: '8.0.0' + laravel-versions: '^9.0' #set the name for each job name: PHP ${{ matrix.php-versions }} diff --git a/composer.json b/composer.json index 9a79269..4a43e1e 100644 --- a/composer.json +++ b/composer.json @@ -12,12 +12,12 @@ } ], "require": { - "php": ">=5.5.9", + "php": ">=7.1", "aws/aws-sdk-php": "~3.0", "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^8.0", "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0" }, "suggest": { diff --git a/phpunit.xml b/phpunit.xml index 9bca1c5..e5598ab 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,8 +7,7 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" - syntaxCheck="false"> + stopOnFailure="false"> diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index 3686345..3f34fe5 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -52,7 +52,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/LumenAwsServiceProviderTest.php b/tests/LumenAwsServiceProviderTest.php index ff301c4..5228544 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(); From ee7e299c294b4ed4b644dcf2a42d182f275f6815 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:26:40 -0500 Subject: [PATCH 34/40] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e36bb0d..2f4c930 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2' '8.0.0'] + php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] include: - php-versions: '7.1.0' laravel-versions: '^5.5' From 49ae8cb4c6706b858440583cb4ed61c5878defeb Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:27:42 -0500 Subject: [PATCH 35/40] Update AwsServiceProviderTest.php --- tests/AwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index 3f34fe5..8d4035b 100644 --- a/tests/AwsServiceProviderTest.php +++ b/tests/AwsServiceProviderTest.php @@ -4,7 +4,7 @@ use Aws\Laravel\AwsServiceProvider; use Illuminate\Container\Container; -abstract class AwsServiceProviderTest extends \PHPUnit_Framework_TestCase +abstract class AwsServiceProviderTest extends \PHPUnit\Framework\TestCase { public function testFacadeCanBeResolvedToServiceInstance() From 7907e75d5798f01b24dedcd97bb6bc5188a31b93 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:28:45 -0500 Subject: [PATCH 36/40] Update LaravelAwsServiceProviderTest.php --- tests/LaravelAwsServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/LaravelAwsServiceProviderTest.php b/tests/LaravelAwsServiceProviderTest.php index 85f24d6..11c5835 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(); From fafe34511c656e9860325a1e61578d58c5bd16d9 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:30:19 -0500 Subject: [PATCH 37/40] Update tests.yml --- .github/workflows/tests.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f4c930..b383c3d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,10 +13,8 @@ jobs: strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: - php-versions: ['7.1.0', '7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] + php-versions: ['7.2.0', '7.2.1', '7.2.2', '7.3.0', '7.3.1', '7.3.2', '7.4.0', '7.4.1', '7.4.2', '8.0.0'] include: - - php-versions: '7.1.0' - laravel-versions: '^5.5' - php-versions: '7.2.0' laravel-versions: '^5.5' - php-versions: '7.2.1' @@ -58,7 +56,7 @@ jobs: uses: actions/checkout@v3 #require laravel - - name: require laravel + - name: Require laravel run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist #run tests @@ -72,7 +70,7 @@ jobs: rm composer.lock #require lumen - - name: require laravel + - name: Require laravel run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist #run tests From 4ed097cd0e992f40f8ecb371eb316b7f7d47cf08 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Mon, 7 Mar 2022 21:31:38 -0500 Subject: [PATCH 38/40] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b383c3d..ad0dc7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -70,7 +70,7 @@ jobs: rm composer.lock #require lumen - - name: Require laravel + - name: Require lumen run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist #run tests From 5117412805c7c82d0e77b06e5c950636d8792b3a Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Tue, 8 Mar 2022 17:01:11 -0500 Subject: [PATCH 39/40] 3.7.0 release --- CHANGELOG.md | 2 +- src/AwsServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 863f6d1..c9b1095 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## 3.6.0 - 2020-09-14 +## 3.7.0 - 2022-03-08 * Adds support for Laravel 8.0 diff --git a/src/AwsServiceProvider.php b/src/AwsServiceProvider.php index 05c02f4..60b1b69 100644 --- a/src/AwsServiceProvider.php +++ b/src/AwsServiceProvider.php @@ -10,7 +10,7 @@ */ class AwsServiceProvider extends ServiceProvider { - const VERSION = '3.6.0'; + const VERSION = '3.7.0'; /** * Indicates if loading of the provider is deferred. From ec818f8e9e747a8e87edd34f87d88fbe5dc171e1 Mon Sep 17 00:00:00 2001 From: Sam Remis Date: Tue, 15 Mar 2022 13:46:48 -0400 Subject: [PATCH 40/40] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b1095..63a0693 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## 3.7.0 - 2022-03-08 -* Adds support for Laravel 8.0 +* Adds support for Laravel 9.0 +* Moves Travis CI tests to GitHub actions ## 3.5.0 - 2020-03-11