Merge pull request #143 from stof/gha

Migrate the CI to GitHub Actions

Author: michalpierog

.gitattributes

@@ -0,0 +1,5 @@
+/tests export-ignore
+/.github export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/phpunit.xml.dist export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: CI
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    check_composer:
+        name: Check composer.json
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  php-version: '8.2'
+            - run: composer validate --strict --no-check-lock
+
+    coding_standards:
+        name: Coding standards
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  php-version: '8.2'
+            - name: Install dependencies
+              run: composer update --ansi --no-progress --prefer-dist --no-interaction
+            - run: composer phpcs
+
+    tests:
+        name: "Tests on PHP ${{ matrix.php }}${{ matrix.name_suffix }}"
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [ '5.6', '7.0', '7.1', '7.4', '8.0', '8.1', '8.2' ]
+                min_stability: [ '' ]
+                name_suffix: [ '' ]
+                composer_flags: [ '' ]
+                include:
+                    - php: '8.2'
+                      min_stability: 'dev'
+                      name_suffix: ' (dev deps)'
+                    - php: '5.6'
+                      min_stability: ''
+                      name_suffix: ' (lowest deps)'
+                      composer_flags: '--prefer-lowest'
+
+        steps:
+            -   uses: actions/checkout@v3
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    coverage: none
+                    php-version: "${{ matrix.php }}"
+
+            -   name: Configure stability
+                if: "matrix.min_stability != ''"
+                run: composer config minimum-stability "${{ matrix.min_stability }}"
+
+            -   name: Install dependencies
+                run: composer update --ansi --no-progress --prefer-dist --no-interaction ${{ matrix.composer_flags }}
+
+            -   name: Run tests
+                run: vendor/bin/phpunit -v --colors=always

.gitignore

@@ -1,3 +1,4 @@
 composer.phar
 composer.lock
 vendor
+.phpunit.result.cache

.travis.yml

@@ -19,7 +19,8 @@
         "paragonie/random_compat": "^1.4 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.3.*"
+        "phpunit/phpunit": "^5.7.27 || ^8.5.32 || ^9.6.3",
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "homepage": "http://keen.io",
     "autoload": {

composer.json

@@ -7,7 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 		 bootstrap="tests/bootstrap.php"
         >
 	<php>

phpunit.xml.dist

@@ -2,16 +2,21 @@
 
 namespace KeenIO\Tests\Client;
 
+use GuzzleHttp\Command\Exception\CommandClientException;
 use KeenIO\Client\KeenIOClient;
-use GuzzleHttp\Subscriber\Mock;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Command\Guzzle\GuzzleClient;
+use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
+use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
-class KeenIOClientTest extends \PHPUnit_Framework_TestCase
+class KeenIOClientTest extends TestCase
 {
+    use AssertIsType;
+    use ExpectException;
+
     /**
      * Check that a Keen IO Client is instantiated properly
      */
@@ -299,7 +304,7 @@ public function testServiceCommands($method, $params)
         }
 
         // Make sure that the response is a PHP array, according to the documented return type
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
     }
 
     /**
@@ -336,7 +341,6 @@ public function providerServiceCommands()
 
     /**
      * @dataProvider        providerServiceCommands
-     * @expectedException   GuzzleHttp\Command\Exception\CommandClientException
      */
     public function testServiceCommandsReturnExceptionOnInvalidAuth($method, $params)
     {
@@ -345,12 +349,14 @@ public function testServiceCommandsReturnExceptionOnInvalidAuth($method, $params
         ])));
 
         $command = $client->getCommand($method, $params);
+
+        $this->expectException(CommandClientException::class);
+
         $client->execute($command);
     }
 
     /**
      * @dataProvider        providerServiceCommands
-     * @expectedException   GuzzleHttp\Command\Exception\CommandClientException
      */
     public function testServiceCommandsReturnExceptionOnInvalidProjectId($method, $params)
     {
@@ -359,6 +365,9 @@ public function testServiceCommandsReturnExceptionOnInvalidProjectId($method, $p
         ])));
 
         $command = $client->getCommand($method, $params);
+
+        $this->expectException(CommandClientException::class);
+
         $client->execute($command);
     }
 

tests/Tests/Client/KeenIOClientTest.php

@@ -19,8 +19,9 @@
 namespace KeenIO\Tests\Filter;
 
 use KeenIO\Client\Filter\MultiTypeFiltering;
+use PHPUnit\Framework\TestCase;
 
-class MultiTypeFilteringTest extends \PHPUnit_Framework_TestCase
+class MultiTypeFilteringTest extends TestCase
 {
     public function testCanEncode()
     {