From ddc64ed9ad1f6b841da16cae8237fbbeff7e643a Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Wed, 3 Jul 2019 19:46:52 -0500 Subject: [PATCH 01/23] add a Lumen example --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c63d2f8..5cd6565 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ return [ ], 'region' => env('AWS_REGION', 'us-east-1'), 'version' => 'latest', - + // You can override settings for specific services 'Ses' => [ 'region' => 'us-east-1', @@ -109,7 +109,7 @@ the SDK's User Guide. ## Usage In order to use the AWS SDK for PHP within your app, you need to retrieve it from the [Laravel Service -Container](https://laravel.com/docs/container#binding). The following example uses the Amazon S3 client to upload a file. +Container](https://laravel.com/docs/container#binding). The following example uses the Amazon S3 client to upload a file (in the full Laravel framework). ```php $s3 = App::make('aws')->createClient('s3'); @@ -121,7 +121,7 @@ $s3->putObject(array( ``` If the AWS facade is registered within the `aliases` section of the application configuration, you can also use the -following technique. +following technique (in the full Laravel framework). ```php $s3 = AWS::createClient('s3'); @@ -132,6 +132,17 @@ $s3->putObject(array( )); ``` +To use in Lumen, you need to retrieve it from the service container a bit differently: + +```php +$s3 = app('aws')->createClient('s3'); +$s3->putObject(array( + 'Bucket' => 'YOUR_BUCKET', + 'Key' => 'YOUR_OBJECT_KEY', + 'SourceFile' => '/the/path/to/the/file/you/are/uploading.ext', +)); +``` + ## Links * [AWS SDK for PHP on Github](http://github.com/aws/aws-sdk-php/) From 0fd8a3c97deafcd2e9793989ccf9823636e948d2 Mon Sep 17 00:00:00 2001 From: sunaoka Date: Wed, 28 Jul 2021 11:27:51 +0900 Subject: [PATCH 02/23] Add .gitattributes Let's ignore these files and folder while installing this package via composer. --- .gitattributes | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9bef9e3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +.gitattributes export-ignore +.github export-ignore +.gitignore export-ignore +.travis.yml export-ignore +CHANGELOG.md export-ignore +CONTRIBUTING.md export-ignore +Makefile export-ignore +README.md export-ignore +phpunit.xml export-ignore +tests export-ignore From b3dce011278c04feea944e93825c6453d3ecb6cd Mon Sep 17 00:00:00 2001 From: SamRemis Date: Tue, 15 Mar 2022 13:58:05 -0400 Subject: [PATCH 03/23] Changelog fix (#212) * Fix changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b1095..daf1d91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 3.7.0 - 2022-03-08 +* Adds support for Laravel 9.0 +* Moves Travis CI tests to GitHub actions + +## 3.6.0 - 2020-09-14 + * Adds support for Laravel 8.0 ## 3.5.0 - 2020-03-11 From d7e771b51355e678a126cbeb810640882652fb91 Mon Sep 17 00:00:00 2001 From: kellertk Date: Thu, 31 Mar 2022 14:23:41 -0700 Subject: [PATCH 04/23] feat: Standardize issue templates for discussions --- .github/ISSUE_TEMPLATE/bug-report.md | 42 ------------- .github/ISSUE_TEMPLATE/bug-report.yml | 73 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 6 ++ .github/ISSUE_TEMPLATE/documentation.md | 23 ------- .github/ISSUE_TEMPLATE/documentation.yml | 23 +++++++ .github/ISSUE_TEMPLATE/feature-request.md | 20 ------ .github/ISSUE_TEMPLATE/feature-request.yml | 59 +++++++++++++++++ .github/ISSUE_TEMPLATE/questions-help.md | 29 --------- 8 files changed, 161 insertions(+), 114 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/documentation.md create mode 100644 .github/ISSUE_TEMPLATE/documentation.yml delete mode 100644 .github/ISSUE_TEMPLATE/feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml delete mode 100644 .github/ISSUE_TEMPLATE/questions-help.md diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index 0feab0d..0000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -name: "\U0001F41B Bug report" -about: Create a report to help us improve -title: '' -labels: needs-triage, bug -assignees: '' - ---- - -Confirm by changing [ ] to [x] below to ensure that it's a bug: -- [ ] I've gone though [Developer Guide](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/welcome.html) and [API reference](https://docs.aws.amazon.com/aws-sdk-php/v3/api/index.html) -- [ ] I've checked [AWS Forums](https://forums.aws.amazon.com) and [StackOverflow](https://stackoverflow.com/questions/tagged/aws-php-sdk) for answers -- [ ] I've searched for [previous similar issues](https://github.com/aws/aws-sdk-php-laravel/issues) and didn't find any solution - -**Describe the bug** -A clear and concise description of what the bug is. - -**Version of AWS SDK for PHP?** -Example: v3.133.6 -* get SDK version by printing the output of `Aws\Sdk::VERSION` in your code -* if the SDK was installed via composer you can see the version installed with `composer show -i` - -**Version of AWS Service Provider for Laravel?** - - -**Version of Laravel (`php artisan --version`)?** - - -**Version of PHP (`php -v`)?** - - -**To Reproduce (observed behavior)** -Steps to reproduce the behavior (please share code or minimal repo) - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Additional context** -Any additional information relevant to the issue. Examples include any framework you may be using (e.g. Laravel, Wordpress) in conjunction with the AWS SDK for PHP, or PHP/environment config settings if the issue is related to memory or performance. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 0000000..94d19fb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,73 @@ +--- +name: "🐛 Bug Report" +description: Report a bug +title: "(short issue description)" +labels: [bug, needs-triage] +assignees: [] +body: + - type: textarea + id: description + attributes: + label: Describe the bug + description: What is the problem? A clear and concise description of the bug. + validations: + required: true + - type: textarea + id: expected + attributes: + label: Expected Behavior + description: | + What did you expect to happen? + validations: + required: true + - type: textarea + id: current + attributes: + label: Current Behavior + description: | + What actually happened? + + Please include full errors, uncaught exceptions, stack traces, and relevant logs. + If service responses are relevant, please include wire logs. + validations: + required: true + - type: textarea + id: reproduction + attributes: + label: Reproduction Steps + description: | + Provide a self-contained, concise snippet of code that can be used to reproduce the issue. + For more complex issues provide a repo with the smallest sample that reproduces the bug. + + Avoid including business logic or unrelated code, it makes diagnosis more difficult. + The code sample should be an SSCCE. See http://sscce.org/ for details. In short, please provide a code sample that we can copy/paste, run and reproduce. + validations: + required: true + - type: textarea + id: solution + attributes: + label: Possible Solution + description: | + Suggest a fix/reason for the bug + validations: + required: false + - type: textarea + id: context + attributes: + label: Additional Information/Context + description: | + Anything else that might be relevant for troubleshooting this bug. Providing context helps us come up with a solution that is most useful in the real world. + validations: + required: false + - type: input + id: sdk-version + attributes: + label: SDK version used + validations: + required: true + - type: input + id: environment + attributes: + label: Environment details (OS name and version, etc.) + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..7c7ea35 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,6 @@ +--- +blank_issues_enabled: false +contact_links: + - name: 💬 General Question + url: https://github.com/aws/aws-sdk-php-laravel/discussions/categories/q-a + about: Please ask and answer questions as a discussion thread \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md deleted file mode 100644 index 9dd63f2..0000000 --- a/.github/ISSUE_TEMPLATE/documentation.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: "\U0001F4DDDocumentation" -about: Suggest incorrect/improvement in documentation -title: '' -labels: needs-triage, documentation -assignees: '' - ---- - -**Describe the issue with documentation** -A clear and concise description of what the issue is. - -**To Reproduce (observed behavior)** -Steps to reproduce the behavior (please share code or minimal repo) - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Additional context** -Add any other context about the problem here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml new file mode 100644 index 0000000..7d73869 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation.yml @@ -0,0 +1,23 @@ +--- +name: "📕 Documentation Issue" +description: Report an issue in the API Reference documentation or Developer Guide +title: "(short issue description)" +labels: [documentation, needs-triage] +assignees: [] +body: + - type: textarea + id: description + attributes: + label: Describe the issue + description: A clear and concise description of the issue. + validations: + required: true + + - type: textarea + id: links + attributes: + label: Links + description: | + Include links to affected documentation page(s). + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md deleted file mode 100644 index c48cd8f..0000000 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: "\U0001F680 Feature request" -about: Suggest an idea for this project -title: '' -labels: needs-triage, feature-request -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml new file mode 100644 index 0000000..60d2431 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -0,0 +1,59 @@ +--- +name: 🚀 Feature Request +description: Suggest an idea for this project +title: "(short issue description)" +labels: [feature-request, needs-triage] +assignees: [] +body: + - type: textarea + id: description + attributes: + label: Describe the feature + description: A clear and concise description of the feature you are proposing. + validations: + required: true + - type: textarea + id: use-case + attributes: + label: Use Case + description: | + Why do you need this feature? For example: "I'm always frustrated when..." + validations: + required: true + - type: textarea + id: solution + attributes: + label: Proposed Solution + description: | + Suggest how to implement the addition or change. Please include prototype/workaround/sketch/reference implementation. + validations: + required: false + - type: textarea + id: other + attributes: + label: Other Information + description: | + Any alternative solutions or features you considered, a more detailed explanation, stack traces, related issues, links for context, etc. + validations: + required: false + - type: checkboxes + id: ack + attributes: + label: Acknowledgements + options: + - label: I may be able to implement this feature request + required: false + - label: This feature might incur a breaking change + required: false + - type: input + id: sdk-version + attributes: + label: SDK version used + validations: + required: true + - type: input + id: environment + attributes: + label: Environment details (OS name and version, etc.) + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/questions-help.md b/.github/ISSUE_TEMPLATE/questions-help.md deleted file mode 100644 index 530d8aa..0000000 --- a/.github/ISSUE_TEMPLATE/questions-help.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: "\U0001F4AC Questions / Help" -about: If you have questions, please check AWS Forums or StackOverflow -title: '' -labels: needs-triage, guidance -assignees: '' - ---- - -Confirm by changing [ ] to [x] below: -- [ ] I've gone though [Developer Guide](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/welcome.html) and [API reference](https://docs.aws.amazon.com/aws-sdk-php/v3/api/index.html) -- [ ] I've checked [AWS Forums](https://forums.aws.amazon.com) and [StackOverflow](https://stackoverflow.com/questions/tagged/aws-php-sdk) for answers - -**Version of AWS SDK for PHP?** -Example: v3.133.6 -* get SDK version by printing the output of `Aws\Sdk::VERSION` in your code -* if the SDK was installed via composer you can see the version installed with `composer show -i` - -**Version of AWS Service Provider for Laravel?** - - -**Version of Laravel (`php artisan --version`)?** - - -**Version of PHP (`php -v`)?** - - -**Describe the question** - From 581f107a6171e7b48600ece820449be5f713a83f Mon Sep 17 00:00:00 2001 From: Mateus Junges Date: Tue, 14 Feb 2023 17:49:52 -0300 Subject: [PATCH 05/23] Add support for laravel 10 --- README.md | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 150a268..67b0b12 100644 --- a/README.md +++ b/README.md @@ -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|9.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|10.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 9a79269..2eb8a7e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "aws/aws-sdk-php-laravel", "homepage": "http://aws.amazon.com/sdkforphp2", "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"], + "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], "type":"library", "license":"Apache-2.0", "authors":[ @@ -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 || ^9.0" + "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { "phpunit/phpunit": "^4.0 || ^5.0", From c25070078fab128f931be01eceb64f0355e70ac5 Mon Sep 17 00:00:00 2001 From: Mateus Junges Date: Tue, 14 Feb 2023 17:50:45 -0300 Subject: [PATCH 06/23] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67b0b12..3708dd2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AWS Service Provider for Laravel 5/6/7/8/9 +# AWS Service Provider for Laravel 5/6/7/8/9/10 [![@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) From 943174f4ea223a18142d8de34920776d065cd196 Mon Sep 17 00:00:00 2001 From: Mateus Junges Date: Tue, 14 Feb 2023 17:54:18 -0300 Subject: [PATCH 07/23] Allow plugins --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2eb8a7e..481f1b4 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,10 @@ "autoload-dev": { "psr-4": { "Aws\\Laravel\\Test\\": "tests/" } }, - "extra": { + "config": { + "allow-plugins": true + }, + "extra": { "laravel": { "providers": [ "Aws\\Laravel\\AwsServiceProvider" From 868fcbd3d080c80a63a9340ce42156f7fc9e853f Mon Sep 17 00:00:00 2001 From: Mateus Junges Date: Tue, 14 Feb 2023 20:32:44 -0300 Subject: [PATCH 08/23] Add `--no-plugins` when installing composer dependencies for tests --- .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 0f26ad9..3f22b4c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -63,7 +63,7 @@ jobs: #require laravel - name: Require laravel - run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist + run: composer require laravel/framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins #run tests - name: Run test suite @@ -72,12 +72,12 @@ jobs: #remove laravel - name: Remove laravel run: | - composer remove laravel/framework + composer remove laravel/framework --no-plugins rm composer.lock #require lumen - name: Require lumen - run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist + run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins #run tests - name: Run test suite From 3055e1f4a9fe4f85fe10dfcd89ad1baeba70b221 Mon Sep 17 00:00:00 2001 From: Mateus Junges Date: Tue, 14 Feb 2023 20:32:56 -0300 Subject: [PATCH 09/23] Revert "Allow plugins" This reverts commit 943174f4ea223a18142d8de34920776d065cd196. --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 481f1b4..2eb8a7e 100644 --- a/composer.json +++ b/composer.json @@ -30,10 +30,7 @@ "autoload-dev": { "psr-4": { "Aws\\Laravel\\Test\\": "tests/" } }, - "config": { - "allow-plugins": true - }, - "extra": { + "extra": { "laravel": { "providers": [ "Aws\\Laravel\\AwsServiceProvider" From a61fc41970a8a9b176c9ab9a80930702b9b339c8 Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Wed, 15 Feb 2023 20:27:51 -0500 Subject: [PATCH 10/23] update CI to run tests against PHP 8-8.2 --- .github/workflows/tests.yml | 49 ++++++++++++++++--------- .gitignore | 3 +- composer.json | 3 +- tests/AwsServiceProviderTest.php | 5 ++- tests/LaravelAwsServiceProviderTest.php | 8 +--- tests/LumenAwsServiceProviderTest.php | 8 +--- 6 files changed, 41 insertions(+), 35 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3f22b4c..b4c1af0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,39 +11,53 @@ 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.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' + - php-versions: '5.5' laravel-versions: '5.1.*' - - php-versions: '5.6.0' + - php-versions: '5.6' laravel-versions: '5.1.*' - - php-versions: '7.0.0' + - php-versions: '7.0' laravel-versions: '5.5.*' - - php-versions: '7.1.0' + - php-versions: '7.1' laravel-versions: '^5.5' - - php-versions: '7.2.0' + - php-versions: '7.2' laravel-versions: '^5.5' - - php-versions: '7.2.1' + - php-versions: '7.2' laravel-versions: '^6.0' - - php-versions: '7.2.2' + - php-versions: '7.2' laravel-versions: '^7.0' - - php-versions: '7.3.0' + - php-versions: '7.3' laravel-versions: '^6.0' - - php-versions: '7.3.1' + - php-versions: '7.3' laravel-versions: '^7.0' - - php-versions: '7.3.2' + - php-versions: '7.3' laravel-versions: '^8.0' - - php-versions: '7.4.0' + - php-versions: '7.4' laravel-versions: '^6.0' - - php-versions: '7.4.1' + - php-versions: '7.4' laravel-versions: '^7.0' - - php-versions: '7.4.2' + - php-versions: '7.4' laravel-versions: '^8.0' + - php-versions: '8.0' + laravel-versions: '^7.0' + - php-versions: '8.0' + laravel-versions: '^8.0' + - php-versions: '8.0' + laravel-versions: '^9.0' + - php-versions: '8.1' + laravel-versions: '^8.0' + - php-versions: '8.1' + laravel-versions: '^9.0' + - php-versions: '8.1' + laravel-versions: '^10.0' + - php-versions: '8.2' + laravel-versions: '^9.0' + - php-versions: '8.2' + laravel-versions: '^10.0' #set the name for each job - name: PHP ${{ matrix.php-versions }} + name: PHP ${{ matrix.php-versions }} with Laravel ${{ matrix.laravel-versions }} #set up environment variables used by unit tests env: AWS_ACCESS_KEY_ID: foo @@ -77,8 +91,9 @@ jobs: #require lumen - name: Require lumen + if: ${{ matrix.laravel-versions != '^10.0' && (matrix.php-versions != '^8.0' && matrix.laravel-versions != '^7.0') }} run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins #run tests - name: Run test suite - run: vendor/bin/phpunit + run: vendor/bin/phpunit \ No newline at end of file diff --git a/.gitignore b/.gitignore index 02eb855..75f93a5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ composer.lock composer.phar vendor .idea -.DS_Store \ No newline at end of file +.DS_Store +.phpunit.result.cache \ No newline at end of file diff --git a/composer.json b/composer.json index 2eb8a7e..89960b8 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ }, "require-dev": { "phpunit/phpunit": "^4.0 || ^5.0", - "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0" + "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0",,, + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "laravel/framework": "To test the Laravel bindings", diff --git a/tests/AwsServiceProviderTest.php b/tests/AwsServiceProviderTest.php index 3686345..69dd42f 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 Yoast\PHPUnitPolyfills\TestCases\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..dc20c09 100644 --- a/tests/LaravelAwsServiceProviderTest.php +++ b/tests/LaravelAwsServiceProviderTest.php @@ -5,17 +5,11 @@ class LaravelAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp() + protected function setupApplication() { if (!class_exists(Application::class)) { $this->markTestSkipped(); } - - parent::setUp(); - } - - protected function setupApplication() - { // Create the application such that the config is loaded. $app = new Application(); $app->setBasePath(sys_get_temp_dir()); diff --git a/tests/LumenAwsServiceProviderTest.php b/tests/LumenAwsServiceProviderTest.php index ff301c4..e623346 100644 --- a/tests/LumenAwsServiceProviderTest.php +++ b/tests/LumenAwsServiceProviderTest.php @@ -6,17 +6,11 @@ class LumenAwsServiceProviderTest extends AwsServiceProviderTest { - public function setUp() + protected function setupApplication() { if (!class_exists(Application::class)) { $this->markTestSkipped(); } - - parent::setUp(); - } - - protected function setupApplication() - { // Create the application such that the config is loaded. $app = new Application(sys_get_temp_dir()); $app->instance('config', new Repository()); From b7e423a370e8f59b472ad097fbc98a123660a21d Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Wed, 15 Feb 2023 20:29:16 -0500 Subject: [PATCH 11/23] fix typo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 89960b8..1ebaa46 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require-dev": { "phpunit/phpunit": "^4.0 || ^5.0", - "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0",,, + "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0", "yoast/phpunit-polyfills": "^1.0" }, "suggest": { From 8870f9e7deecd4ba67fd62904e95ba1b964696c9 Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Wed, 15 Feb 2023 20:31:42 -0500 Subject: [PATCH 12/23] update phpunit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1ebaa46..012b83a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^9.0", "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0", "yoast/phpunit-polyfills": "^1.0" }, From 5dbd01ee8bc6730f1256270d29364e7bd2738e13 Mon Sep 17 00:00:00 2001 From: Sean O'Brien <60306702+stobrien89@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:27:13 -0500 Subject: [PATCH 13/23] Update ubuntu image --- .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 0f26ad9..86f78bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: jobs: run: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: #for each of the following versions of PHP, with and without --prefer-lowest matrix: From b57460f23db3e4ef601b86d16b2efce26745d079 Mon Sep 17 00:00:00 2001 From: Sean O'Brien <60306702+stobrien89@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:34:34 -0400 Subject: [PATCH 14/23] Enhancement: update anchors, remove broken links --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3708dd2..7315d78 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # AWS Service Provider for Laravel 5/6/7/8/9/10 -[![@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) [![Latest Stable Version](https://img.shields.io/packagist/v/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) [![Total Downloads](https://img.shields.io/packagist/dt/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/aws/aws-sdk-php?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) @@ -19,10 +17,10 @@ PHP and Laravel 5.1. * **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` Jump To: -* [Getting Started](_#Getting-Started_) -* [Getting Help](_#Getting-Help_) -* [Contributing](_#Contributing_) -* [More Resources](_#Resources_) +* [Getting Started](#Getting-Started) +* [Getting Help](#Getting-Help) +* [Contributing](#Contributing) +* [More Resources](#Resources) ## Getting Started From f8a734cfe3fbdccd007e5911ccd3feaf6c5e80b1 Mon Sep 17 00:00:00 2001 From: Sean O'Brien <60306702+stobrien89@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:25:01 -0400 Subject: [PATCH 15/23] add trailing forward slash to tests --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 9bef9e3..28b9aaf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,4 @@ CONTRIBUTING.md export-ignore Makefile export-ignore README.md export-ignore phpunit.xml export-ignore -tests export-ignore +tests/ export-ignore From 2c88407eb595d255dcd8b3cb2df4628f8aa314bb Mon Sep 17 00:00:00 2001 From: shailja Date: Fri, 14 Jul 2023 14:03:52 -0700 Subject: [PATCH 16/23] added workflow for handling answerable discussions --- .github/workflows/handle-stale-discussions.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/handle-stale-discussions.yml diff --git a/.github/workflows/handle-stale-discussions.yml b/.github/workflows/handle-stale-discussions.yml new file mode 100644 index 0000000..2b89f2d --- /dev/null +++ b/.github/workflows/handle-stale-discussions.yml @@ -0,0 +1,18 @@ +name: HandleStaleDiscussions +on: + schedule: + - cron: '0 */4 * * *' + discussion_comment: + types: [created] + +jobs: + handle-stale-discussions: + name: Handle stale discussions + runs-on: ubuntu-latest + permissions: + discussions: write + steps: + - name: Stale discussions action + uses: aws-github-ops/handle-stale-discussions@v1 + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From 740a71883663c6c8b5d2859ac9d81cb1031affd2 Mon Sep 17 00:00:00 2001 From: Tom Keller Date: Fri, 26 Jan 2024 17:24:18 -0800 Subject: [PATCH 17/23] chore: a more polite closed issue message --- .github/workflows/closed-issue-message.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/closed-issue-message.yml b/.github/workflows/closed-issue-message.yml index 3340afb..3691dea 100644 --- a/.github/workflows/closed-issue-message.yml +++ b/.github/workflows/closed-issue-message.yml @@ -11,7 +11,6 @@ jobs: # These inputs are both required repo-token: "${{ secrets.GITHUB_TOKEN }}" message: | - ### ⚠️COMMENT VISIBILITY WARNING⚠️ Comments on closed issues are hard for our team to see. If you need more assistance, please either tag a team member or open a new issue that references this one. If you wish to keep having a conversation with other community members under this issue feel free to do so. From 1c89035305d7354f318fc19638ce64ed90c854db Mon Sep 17 00:00:00 2001 From: Tom Keller Date: Fri, 26 Jan 2024 17:24:27 -0800 Subject: [PATCH 18/23] chore: relax stale issue timings We received customer feedback that our stale issue timings are too tight. This brings issue timings into line with other AWS SDK teams. --- .github/workflows/stale_issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml index 1156d97..4741bcb 100644 --- a/.github/workflows/stale_issues.yml +++ b/.github/workflows/stale_issues.yml @@ -29,7 +29,7 @@ jobs: closed-for-staleness-label: closed-for-staleness # Issue timing - days-before-stale: 7 + days-before-stale: 10 days-before-close: 4 days-before-ancient: 1095 From 831e01d4e5e6c08d9b451bed363cc3aa8e6c5e32 Mon Sep 17 00:00:00 2001 From: Erik Telford Date: Mon, 12 Feb 2024 10:17:39 -0600 Subject: [PATCH 19/23] Add support for Laravel 11 * Laravel 11 uses a newer version of PHPUnit so that is included here as well --- README.md | 4 ++-- composer.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index aa018a7..6295304 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AWS Service Provider for Laravel 5/6/7/8/9/10 +# AWS Service Provider for Laravel 5 - 11 [![Latest Stable Version](https://img.shields.io/packagist/v/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) [![Total Downloads](https://img.shields.io/packagist/dt/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) @@ -12,7 +12,7 @@ PHP and Laravel 5.1. **Major Versions:** -* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0|~7.0|~8.0|9.0|10.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|10.0|11.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 012b83a..89c028f 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/9 service provider for including the AWS SDK for PHP.", - "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], + "description": "A simple Laravel v5.1 - v11 service provider for including the AWS SDK for PHP.", + "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], "type":"library", "license":"Apache-2.0", "authors":[ @@ -14,10 +14,10 @@ "require": { "php": ">=5.5.9", "aws/aws-sdk-php": "~3.0", - "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" + "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^9.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^9.0 || ^10.0", "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0", "yoast/phpunit-polyfills": "^1.0" }, From c3881685b38979629b1563a868ef2d12e1c2ea12 Mon Sep 17 00:00:00 2001 From: Sean O'Brien Date: Thu, 14 Mar 2024 16:41:23 -0400 Subject: [PATCH 20/23] enhancement: deprecate versions below 7.2.5, add support for PHP 8.3 --- .github/workflows/tests.yml | 27 +++++++++++++-------------- README.md | 2 +- composer.json | 14 +++++++------- phpunit.xml | 18 +++++++++--------- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 562589f..95780d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,19 +13,9 @@ jobs: strategy: matrix: 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.1' - laravel-versions: '^5.5' - - php-versions: '7.2' - laravel-versions: '^5.5' - - php-versions: '7.2' + - php-versions: '7.2.5' laravel-versions: '^6.0' - - php-versions: '7.2' + - php-versions: '7.2.5' laravel-versions: '^7.0' - php-versions: '7.3' laravel-versions: '^6.0' @@ -55,6 +45,16 @@ jobs: laravel-versions: '^9.0' - php-versions: '8.2' laravel-versions: '^10.0' + - php-versions: '8.2' + laravel-versions: '^11.0' + - php-versions: '8.3' + laravel-versions: '^9.0' + - php-versions: '8.3' + laravel-versions: '^10.0' + - php-versions: '8.3' + laravel-versions: '^9.0' + - php-versions: '8.3' + laravel-versions: '^11.0' #set the name for each job name: PHP ${{ matrix.php-versions }} with Laravel ${{ matrix.laravel-versions }} @@ -91,8 +91,7 @@ jobs: #require lumen - name: Require lumen - if: ${{ matrix.laravel-versions != '^10.0' && (matrix.php-versions != '^8.0' && matrix.laravel-versions != '^7.0') }} - run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins + run: composer require laravel/lumen-framework --no-interaction --prefer-dist --no-plugins #run tests - name: Run test suite diff --git a/README.md b/README.md index 6295304..b3cf392 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ PHP and Laravel 5.1. **Major Versions:** -* **3.x** (YOU ARE HERE) - For `laravel/framework:5.1|6.0|7.0|8.0|9.0|10.0|11.0` and `aws/aws-sdk-php:~3.0` +* **3.x** (YOU ARE HERE) - For `laravel/framework:6.0|7.0|8.0|9.0|10.0|11.0` and `aws/aws-sdk-php:^3.279.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 89c028f..a598ab2 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 v5.1 - v11 service provider for including the AWS SDK for PHP.", - "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], + "homepage": "https://aws.amazon.com/sdk-for-php/", + "description": "A simple Laravel 6/7/8/9/10/11 service provider for including the AWS SDK for PHP.", + "keywords": ["laravel", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], "type":"library", "license":"Apache-2.0", "authors":[ @@ -12,12 +12,12 @@ } ], "require": { - "php": ">=5.5.9", - "aws/aws-sdk-php": "~3.0", - "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0" + "php": ">=7.2.5", + "aws/aws-sdk-php": "^3.279.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^9.0 || ^10.0", + "phpunit/phpunit": "^8.0 || ^9.0", "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0", "yoast/phpunit-polyfills": "^1.0" }, diff --git a/phpunit.xml b/phpunit.xml index 9bca1c5..59a93f6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,8 +7,7 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" - syntaxCheck="false"> + stopOnFailure="false"> @@ -22,12 +21,13 @@ - - + + src - - vendor - - - + + + vendor + + + From b5d77cbdd1aada19abef7f5e72ff5c190fee5312 Mon Sep 17 00:00:00 2001 From: Ashish Dhingra <67916761+ashishdhingra@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:20:35 -0700 Subject: [PATCH 21/23] chore: Modified bug issue template to add checkbox to report potential regression. --- .github/ISSUE_TEMPLATE/bug-report.yml | 8 +++++ .../workflows/issue-regression-labeler.yml | 32 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/workflows/issue-regression-labeler.yml diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 94d19fb..946fd2f 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -12,6 +12,14 @@ body: description: What is the problem? A clear and concise description of the bug. validations: required: true + - type: checkboxes + id: regression + attributes: + label: Regression Issue + description: What is a regression? If it worked in a previous version but doesn't in the latest version, it's considered a regression. In this case, please provide specific version number in the report. + options: + - label: Select this option if this issue appears to be a regression. + required: false - type: textarea id: expected attributes: diff --git a/.github/workflows/issue-regression-labeler.yml b/.github/workflows/issue-regression-labeler.yml new file mode 100644 index 0000000..bd00071 --- /dev/null +++ b/.github/workflows/issue-regression-labeler.yml @@ -0,0 +1,32 @@ +# Apply potential regression label on issues +name: issue-regression-label +on: + issues: + types: [opened, edited] +jobs: + add-regression-label: + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: Fetch template body + id: check_regression + uses: actions/github-script@v7 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TEMPLATE_BODY: ${{ github.event.issue.body }} + with: + script: | + const regressionPattern = /\[x\] Select this option if this issue appears to be a regression\./i; + const template = `${process.env.TEMPLATE_BODY}` + const match = regressionPattern.test(template); + core.setOutput('is_regression', match); + - name: Manage regression label + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + if [ "${{ steps.check_regression.outputs.is_regression }}" == "true" ]; then + gh issue edit ${{ github.event.issue.number }} --add-label "potential-regression" -R ${{ github.repository }} + else + gh issue edit ${{ github.event.issue.number }} --remove-label "potential-regression" -R ${{ github.repository }} + fi From c1477b1efd43a61238090c0e8f1ede979573dd4b Mon Sep 17 00:00:00 2001 From: Sean O'Brien <60306702+stobrien89@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:25:56 -0500 Subject: [PATCH 22/23] feat: add laravel 12 support (#249) Co-authored-by: Sean O'Brien Co-authored-by: vbergerondev <46461380+vbergerondev@users.noreply.github.com> Co-authored-by: rugaard --- .github/workflows/tests.yml | 62 +++++++++++++++++++++---------------- README.md | 6 ++-- composer.json | 10 +++--- 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95780d2..aacf1e1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,52 +9,62 @@ on: jobs: run: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: include: - - php-versions: '7.2.5' + - php-versions: '8.1' laravel-versions: '^6.0' - - php-versions: '7.2.5' - laravel-versions: '^7.0' - - php-versions: '7.3' + - php-versions: '8.2' laravel-versions: '^6.0' - - php-versions: '7.3' - laravel-versions: '^7.0' - - php-versions: '7.3' - laravel-versions: '^8.0' - - php-versions: '7.4' + - php-versions: '8.3' + laravel-versions: '^6.0' + - php-versions: '8.4' laravel-versions: '^6.0' - - php-versions: '7.4' + - php-versions: '8.1' laravel-versions: '^7.0' - - php-versions: '7.4' - laravel-versions: '^8.0' - - php-versions: '8.0' + - php-versions: '8.2' + laravel-versions: '^7.0' + - php-versions: '8.3' + laravel-versions: '^7.0' + - php-versions: '8.4' laravel-versions: '^7.0' - - php-versions: '8.0' - laravel-versions: '^8.0' - - php-versions: '8.0' - laravel-versions: '^9.0' - php-versions: '8.1' laravel-versions: '^8.0' + - php-versions: '8.2' + laravel-versions: '^8.0' + - php-versions: '8.3' + laravel-versions: '^8.0' + - php-versions: '8.4' + laravel-versions: '^8.0' - php-versions: '8.1' laravel-versions: '^9.0' - - php-versions: '8.1' - laravel-versions: '^10.0' - php-versions: '8.2' laravel-versions: '^9.0' - - php-versions: '8.2' - laravel-versions: '^10.0' - - php-versions: '8.2' - laravel-versions: '^11.0' - php-versions: '8.3' laravel-versions: '^9.0' - - php-versions: '8.3' + - php-versions: '8.4' + laravel-versions: '^9.0' + - php-versions: '8.1' + laravel-versions: '^10.0' + - php-versions: '8.2' laravel-versions: '^10.0' - php-versions: '8.3' - laravel-versions: '^9.0' + laravel-versions: '^10.0' + - php-versions: '8.4' + laravel-versions: '^10.0' + - php-versions: '8.2' + laravel-versions: '^11.0' - php-versions: '8.3' laravel-versions: '^11.0' + - php-versions: '8.4' + laravel-versions: '^11.0' + - php-versions: '8.2' + laravel-versions: '^12.0' + - php-versions: '8.3' + laravel-versions: '^12.0' + - php-versions: '8.4' + laravel-versions: '^12.0' #set the name for each job name: PHP ${{ matrix.php-versions }} with Laravel ${{ matrix.laravel-versions }} diff --git a/README.md b/README.md index b3cf392..ea66dd0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AWS Service Provider for Laravel 5 - 11 +# AWS Service Provider for Laravel 6 - 12 [![Latest Stable Version](https://img.shields.io/packagist/v/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) [![Total Downloads](https://img.shields.io/packagist/dt/aws/aws-sdk-php-laravel.svg)](https://packagist.org/packages/aws/aws-sdk-php-laravel) @@ -8,11 +8,11 @@ This is a simple [Laravel](http://laravel.com/) service provider for making it e [AWS SDK for PHP](https://github.com/aws/aws-sdk-php) in your Laravel and Lumen applications. This README is for version 3.x of the service provider, which is implemented to work with Version 3 of the AWS SDK for -PHP and Laravel 5.1. +PHP and Laravel 6-12. **Major Versions:** -* **3.x** (YOU ARE HERE) - For `laravel/framework:6.0|7.0|8.0|9.0|10.0|11.0` and `aws/aws-sdk-php:^3.279.0` +* **3.x** (YOU ARE HERE) - For `laravel/framework:6.0|7.0|8.0|9.0|10.0|11.0|12.0` and `aws/aws-sdk-php:^3.338.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 a598ab2..6749389 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "name": "aws/aws-sdk-php-laravel", "homepage": "https://aws.amazon.com/sdk-for-php/", - "description": "A simple Laravel 6/7/8/9/10/11 service provider for including the AWS SDK for PHP.", - "keywords": ["laravel", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], + "description": "A simple Laravel 6/7/8/9/10/11/12 service provider for including the AWS SDK for PHP.", + "keywords": ["laravel", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "laravel 12", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"], "type":"library", "license":"Apache-2.0", "authors":[ @@ -12,9 +12,9 @@ } ], "require": { - "php": ">=7.2.5", - "aws/aws-sdk-php": "^3.279.0", - "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0" + "php": ">=8.1", + "aws/aws-sdk-php": "^3.338.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0" }, "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", From f6fd2e23c89d4fef1eb0287a548c23f02cebe264 Mon Sep 17 00:00:00 2001 From: Sean O'Brien <60306702+stobrien89@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:47:32 -0400 Subject: [PATCH 23/23] Update handle-stale-discussions.yml (#251) --- .github/workflows/handle-stale-discussions.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/handle-stale-discussions.yml b/.github/workflows/handle-stale-discussions.yml index 2b89f2d..ce9a066 100644 --- a/.github/workflows/handle-stale-discussions.yml +++ b/.github/workflows/handle-stale-discussions.yml @@ -7,6 +7,7 @@ on: jobs: handle-stale-discussions: + if: github.repository_owner == 'aws' name: Handle stale discussions runs-on: ubuntu-latest permissions: @@ -15,4 +16,4 @@ jobs: - name: Stale discussions action uses: aws-github-ops/handle-stale-discussions@v1 env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy