Skip to content

Commit 11cb363

Browse files
authored
Merge pull request #242 from stobrien89/deprecation-below-7.2
2 parents f877c7c + c388168 commit 11cb363

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

.github/workflows/tests.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,9 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16-
- php-versions: '5.5'
17-
laravel-versions: '5.1.*'
18-
- php-versions: '5.6'
19-
laravel-versions: '5.1.*'
20-
- php-versions: '7.0'
21-
laravel-versions: '5.5.*'
22-
- php-versions: '7.1'
23-
laravel-versions: '^5.5'
24-
- php-versions: '7.2'
25-
laravel-versions: '^5.5'
26-
- php-versions: '7.2'
16+
- php-versions: '7.2.5'
2717
laravel-versions: '^6.0'
28-
- php-versions: '7.2'
18+
- php-versions: '7.2.5'
2919
laravel-versions: '^7.0'
3020
- php-versions: '7.3'
3121
laravel-versions: '^6.0'
@@ -55,6 +45,16 @@ jobs:
5545
laravel-versions: '^9.0'
5646
- php-versions: '8.2'
5747
laravel-versions: '^10.0'
48+
- php-versions: '8.2'
49+
laravel-versions: '^11.0'
50+
- php-versions: '8.3'
51+
laravel-versions: '^9.0'
52+
- php-versions: '8.3'
53+
laravel-versions: '^10.0'
54+
- php-versions: '8.3'
55+
laravel-versions: '^9.0'
56+
- php-versions: '8.3'
57+
laravel-versions: '^11.0'
5858

5959
#set the name for each job
6060
name: PHP ${{ matrix.php-versions }} with Laravel ${{ matrix.laravel-versions }}
@@ -91,8 +91,7 @@ jobs:
9191
9292
#require lumen
9393
- name: Require lumen
94-
if: ${{ matrix.laravel-versions != '^10.0' && (matrix.php-versions != '^8.0' && matrix.laravel-versions != '^7.0') }}
95-
run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins
94+
run: composer require laravel/lumen-framework --no-interaction --prefer-dist --no-plugins
9695

9796
#run tests
9897
- name: Run test suite

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PHP and Laravel 5.1.
1212

1313
**Major Versions:**
1414

15-
* **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`
15+
* **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`
1616
* **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`
1717
* **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`
1818

composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "aws/aws-sdk-php-laravel",
3-
"homepage": "http://aws.amazon.com/sdkforphp2",
4-
"description": "A simple Laravel v5.1 - v11 service provider for including the AWS SDK for PHP.",
5-
"keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"],
3+
"homepage": "https://aws.amazon.com/sdk-for-php/",
4+
"description": "A simple Laravel 6/7/8/9/10/11 service provider for including the AWS SDK for PHP.",
5+
"keywords": ["laravel", "laravel 6", "laravel 7", "laravel 8", "laravel 9", "laravel 10", "laravel 11", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"],
66
"type":"library",
77
"license":"Apache-2.0",
88
"authors":[
@@ -12,12 +12,12 @@
1212
}
1313
],
1414
"require": {
15-
"php": ">=5.5.9",
16-
"aws/aws-sdk-php": "~3.0",
17-
"illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
15+
"php": ">=7.2.5",
16+
"aws/aws-sdk-php": "^3.279.0",
17+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^4.0 || ^5.0 || ^9.0 || ^10.0",
20+
"phpunit/phpunit": "^8.0 || ^9.0",
2121
"vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0",
2222
"yoast/phpunit-polyfills": "^1.0"
2323
},

phpunit.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
convertNoticesToExceptions="true"
88
convertWarningsToExceptions="true"
99
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false">
10+
stopOnFailure="false">
1211

1312
<testsuites>
1413
<testsuite name="AwsServiceProvider Test Suite">
@@ -22,12 +21,13 @@
2221
<env name="AWS_REGION" value="baz"/>
2322
</php>
2423

25-
<filter>
26-
<whitelist addUncoveredFilesFromWhitelist="false">
24+
<coverage>
25+
<include>
2726
<directory suffix=".php">src</directory>
28-
<exclude>
29-
<directory suffix=".php">vendor</directory>
30-
</exclude>
31-
</whitelist>
32-
</filter>
27+
</include>
28+
<exclude>
29+
<directory suffix=".php">vendor</directory>
30+
</exclude>
31+
</coverage>
32+
3333
</phpunit>

0 commit comments

Comments
 (0)