Merge pull request #225 from stobrien89/laravel-10-ci-update

update CI to run tests against PHP 8-8.2

Author: stobrien89

.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

.gitignore

@@ -2,4 +2,5 @@ composer.lock
 composer.phar
 vendor
 .idea
-.DS_Store
+.DS_Store
+.phpunit.result.cache

composer.json

@@ -17,8 +17,9 @@
         "illuminate/support": "^5.1 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0",
-        "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^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"
     },
     "suggest": {
         "laravel/framework": "To test the Laravel bindings",

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);

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());

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());