Merge pull request #3 from InteractionDesignFoundation/ixdf

Update dependencies, migrate from Travis to GitHub actions

Author: lptn

.gitattributes

@@ -1,6 +1,5 @@
 # Ignore all test and documentation with "export-ignore".
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/.travis.yml        export-ignore
 /phpunit.xml        export-ignore
 /tests              export-ignore

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: composer
+    directory: "/"
+    schedule:
+      interval: monthly
+    open-pull-requests-limit: 50
+    labels:
+      - "dependencies"

.github/run-tests.yml

@@ -0,0 +1,43 @@
+name: run-tests
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ ubuntu-latest ]
+        php: [ 8.0, 8.1 ]
+        laravel: [ 8.* ]
+        dependency-version: [ prefer-stable ]
+        include:
+          - laravel: 8.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer install --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-scripts
+        env:
+          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+
+      - name: Execute tests
+        run: composer test

.gitignore

@@ -1,6 +1,11 @@
 /vendor
 composer.phar
 composer.lock
+auth.json
+
+phpunit.xml
 .phpunit.result.cache
+
 .DS_Store
-.idea/*
+Thumbs.db
+/.idea

.travis.yml

@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
+    "php": "^8.0|^8.1",
     "illuminate/support": "^8.0",
     "illuminate/console": "^8.0",
     "illuminate/cache": "^8.0"
@@ -28,12 +28,12 @@
     "monolog/monolog": "Allows for storing location not found errors to the log"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.0",
-    "mockery/mockery": "^1.3",
+    "phpunit/phpunit": "^9.5",
+    "mockery/mockery": "^1.4",
     "geoip2/geoip2": "~2.1",
     "vlucas/phpdotenv": "^5.0",
-    "phpstan/phpstan": "^0.12.14",
-    "squizlabs/php_codesniffer": "^3.5"
+    "phpstan/phpstan": "^1.2",
+    "squizlabs/php_codesniffer": "^3.6"
   },
   "autoload": {
     "files": [
@@ -51,6 +51,11 @@
       "Torann\\GeoIP\\Tests\\": "tests/"
     }
   },
+  "scripts": {
+    "test": "vendor/bin/phpunit",
+    "phpcs": "vendor/bin/phpcs --standard=phpcs.xml src",
+    "phpstan": "vendor/bin/phpstan --level=0 --no-progress analyse --configuration phpstan.neon --memory-limit 2G"
+  },
   "extra": {
     "branch-alias": {
       "dev-master": "1.0-dev"

composer.json

@@ -1,7 +1,17 @@
 parameters:
-    excludes_analyse:
-        - vendor
-        - resources
+    # The level 9 is the highest level
+    level: 9
+    reportUnmatchedIgnoredErrors: false
+
+    paths:
+        - src
+        - tests
+
+    excludePaths:
+        analyse:
+            - vendor
+            - resources
+
     ignoreErrors:
         - '#Function config_path not found#'
         - '#Function config not found#'

phpstan.neon

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
@@ -10,6 +12,11 @@
          stopOnFailure="false"
          verbose="true"
 >
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="GeoIP Package Test Suite">
             <directory>./tests</directory>

phpunit.xml

@@ -154,7 +154,7 @@ public function __set($key, $value)
      *
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->$offset);
     }
@@ -166,7 +166,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return $this->$offset;
     }
@@ -179,7 +179,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->$offset = $value;
     }
@@ -191,7 +191,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->$offset);
     }