Skip to content

Commit 5170d6b

Browse files
stobrien89stobrien89
authored
Merge pull request #225 from stobrien89/laravel-10-ci-update
update CI to run tests against PHP 8-8.2
2 parents 7555ed9 + 8870f9e commit 5170d6b

6 files changed

+42
-36
lines changed

‎.github/workflows/tests.yml

+32-17
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,53 @@ jobs:
1111
run:
1212
runs-on: ubuntu-18.04
1313
strategy:
14-
#for each of the following versions of PHP, with and without --prefer-lowest
1514
matrix:
16-
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']
1715
include:
18-
- php-versions: '5.5.0'
16+
- php-versions: '5.5'
1917
laravel-versions: '5.1.*'
20-
- php-versions: '5.6.0'
18+
- php-versions: '5.6'
2119
laravel-versions: '5.1.*'
22-
- php-versions: '7.0.0'
20+
- php-versions: '7.0'
2321
laravel-versions: '5.5.*'
24-
- php-versions: '7.1.0'
22+
- php-versions: '7.1'
2523
laravel-versions: '^5.5'
26-
- php-versions: '7.2.0'
24+
- php-versions: '7.2'
2725
laravel-versions: '^5.5'
28-
- php-versions: '7.2.1'
26+
- php-versions: '7.2'
2927
laravel-versions: '^6.0'
30-
- php-versions: '7.2.2'
28+
- php-versions: '7.2'
3129
laravel-versions: '^7.0'
32-
- php-versions: '7.3.0'
30+
- php-versions: '7.3'
3331
laravel-versions: '^6.0'
34-
- php-versions: '7.3.1'
32+
- php-versions: '7.3'
3533
laravel-versions: '^7.0'
36-
- php-versions: '7.3.2'
34+
- php-versions: '7.3'
3735
laravel-versions: '^8.0'
38-
- php-versions: '7.4.0'
36+
- php-versions: '7.4'
3937
laravel-versions: '^6.0'
40-
- php-versions: '7.4.1'
38+
- php-versions: '7.4'
4139
laravel-versions: '^7.0'
42-
- php-versions: '7.4.2'
40+
- php-versions: '7.4'
4341
laravel-versions: '^8.0'
42+
- php-versions: '8.0'
43+
laravel-versions: '^7.0'
44+
- php-versions: '8.0'
45+
laravel-versions: '^8.0'
46+
- php-versions: '8.0'
47+
laravel-versions: '^9.0'
48+
- php-versions: '8.1'
49+
laravel-versions: '^8.0'
50+
- php-versions: '8.1'
51+
laravel-versions: '^9.0'
52+
- php-versions: '8.1'
53+
laravel-versions: '^10.0'
54+
- php-versions: '8.2'
55+
laravel-versions: '^9.0'
56+
- php-versions: '8.2'
57+
laravel-versions: '^10.0'
4458

4559
#set the name for each job
46-
name: PHP ${{ matrix.php-versions }}
60+
name: PHP ${{ matrix.php-versions }} with Laravel ${{ matrix.laravel-versions }}
4761
#set up environment variables used by unit tests
4862
env:
4963
AWS_ACCESS_KEY_ID: foo
@@ -77,8 +91,9 @@ jobs:
7791
7892
#require lumen
7993
- name: Require lumen
94+
if: ${{ matrix.laravel-versions != '^10.0' && (matrix.php-versions != '^8.0' && matrix.laravel-versions != '^7.0') }}
8095
run: composer require laravel/lumen-framework:${{ matrix.laravel-versions }} --no-interaction --prefer-dist --no-plugins
8196

8297
#run tests
8398
- name: Run test suite
84-
run: vendor/bin/phpunit
99+
run: vendor/bin/phpunit

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ composer.lock
22
composer.phar
33
vendor
44
.idea
5-
.DS_Store
5+
.DS_Store
6+
.phpunit.result.cache

‎composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^4.0 || ^5.0",
21-
"vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0"
20+
"phpunit/phpunit": "^4.0 || ^5.0 || ^9.0",
21+
"vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0 || ^5.0",
22+
"yoast/phpunit-polyfills": "^1.0"
2223
},
2324
"suggest": {
2425
"laravel/framework": "To test the Laravel bindings",

‎tests/AwsServiceProviderTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
use Aws\Laravel\AwsFacade as AWS;
44
use Aws\Laravel\AwsServiceProvider;
55
use Illuminate\Container\Container;
6+
use Yoast\PHPUnitPolyfills\TestCases\TestCase;
67

7-
abstract class AwsServiceProviderTest extends \PHPUnit_Framework_TestCase
8+
abstract class AwsServiceProviderTest extends TestCase
89
{
910

1011
public function testFacadeCanBeResolvedToServiceInstance()
@@ -52,7 +53,7 @@ public function testVersionInformationIsProvidedToSdkUserAgent()
5253
$config = $app['config']->get('aws');
5354

5455
$this->assertArrayHasKey('ua_append', $config);
55-
$this->assertInternalType('array', $config['ua_append']);
56+
$this->assertIsArray($config['ua_append']);
5657
$this->assertNotEmpty($config['ua_append']);
5758
$this->assertNotEmpty(array_filter($config['ua_append'], function ($ua) {
5859
return false !== strpos($ua, AwsServiceProvider::VERSION);

‎tests/LaravelAwsServiceProviderTest.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,11 @@
55

66
class LaravelAwsServiceProviderTest extends AwsServiceProviderTest
77
{
8-
public function setUp()
8+
protected function setupApplication()
99
{
1010
if (!class_exists(Application::class)) {
1111
$this->markTestSkipped();
1212
}
13-
14-
parent::setUp();
15-
}
16-
17-
protected function setupApplication()
18-
{
1913
// Create the application such that the config is loaded.
2014
$app = new Application();
2115
$app->setBasePath(sys_get_temp_dir());

‎tests/LumenAwsServiceProviderTest.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@
66

77
class LumenAwsServiceProviderTest extends AwsServiceProviderTest
88
{
9-
public function setUp()
9+
protected function setupApplication()
1010
{
1111
if (!class_exists(Application::class)) {
1212
$this->markTestSkipped();
1313
}
14-
15-
parent::setUp();
16-
}
17-
18-
protected function setupApplication()
19-
{
2014
// Create the application such that the config is loaded.
2115
$app = new Application(sys_get_temp_dir());
2216
$app->instance('config', new Repository());

0 commit comments

Comments
 (0)