Fix constraints, add tests & GitHub Actions.

Author: olsgreen

.github/workflows/run_tests.yml

@@ -0,0 +1,56 @@
+name: Tests
+
+on: ['push', 'pull_request']
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: [7.1, 7.2, 7.3, 7.4, 8.0]
+        laravel: [5.6.*, 5.7.*, 5.8.*, 6.*]
+        dependency-version: [prefer-stable, prefer-lowest]
+        include:
+          - laravel: 5.6.*
+            testbench: 3.6.*
+            php: 7.1.*
+          - laravel: 5.7.*
+            testbench: 3.7.*
+            php: 7.1.*
+          - laravel: 5.8.*
+            testbench: 3.8.*
+            php: 7.1.*
+          - laravel: 6.*
+            testbench: 4.*
+        exclude:
+          - laravel: 6.*
+            php: 7.1
+
+    name: PHP ${{ matrix.php }}  - Laravel ${{ matrix.laravel }} - Testbench ${{ matrix.testbench }} (${{ matrix.dependency-version }})
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-php-${{ matrix.php }}-composer-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.dependency-version }}
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: mbstring, zip
+        coverage: pcov
+
+    - name: Install Composer dependencies
+      run: |
+        composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+        composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist --no-suggest
+
+    - name: PHPUnit Testing
+      run: vendor/bin/phpunit

.gitignore

@@ -1,2 +1,4 @@
 composer.lock
-vendor
+.phpunit.result.cache
+vendor
+.idea

composer.json

@@ -9,14 +9,15 @@
             "email": "green2go@gmail.com"
         }
     ],
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "laravel/framework": "^5.6|^6.0",
+        "php": "^7.1.3",
+        "illuminate/contracts": "^5.6|^6.0",
+        "illuminate/http": "^5.6|^6.0",
         "s1lentium/iptools": "^1.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.5",
+        "orchestra/testbench": "^3.6|^3.7|^3.8|^4.0",
         "symfony/thanks": "^1.0"
     },
     "autoload": {

phpunit.xml.dist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="Package Test Suite">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+            <exclude>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

src/Repositories/ConfigRepository.php

@@ -4,7 +4,6 @@
 
 use BoxedCode\Laravel\Auth\Ip\Contracts\Repository;
 use IPTools\IP;
-use IPTools\Network;
 use IPTools\Range;
 use Exception;
 

tests/Integration/EnforcingMiddlewareTestCase.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Integration;
+
+use BoxedCode\Laravel\Auth\Challenge\Contracts\Challenge;
+use Illuminate\Encryption\Encrypter;
+
+class EnforcingMiddlewareTestCase extends TestCase
+{
+    /**
+     * Setup the test environment.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function testDefaultConfigurationDenied()
+    {
+        $response = $this->actingAs($this->testUser)->get('/');
+
+        $response->assertForbidden();
+    }
+
+    public function testWhitelistAuthorized()
+    {
+        config()->set('ip_auth.addresses.whitelist', ['127.0.0.1']);
+
+        $response = $this->actingAs($this->testUser)->get('/');
+
+        $response->assertOk();
+    }
+
+    public function testBlacklistOverridesWhitelist()
+    {
+        config()->set('ip_auth.addresses.whitelist', ['127.0.0.1']);
+        config()->set('ip_auth.addresses.blacklist', ['127.0.0.1']);
+
+        $response = $this->actingAs($this->testUser)->get('/');
+
+        $response->assertForbidden();
+    }
+
+    public function testDefaultActionAllow()
+    {
+        config()->set('ip_auth.default_action', 'allow');
+
+        $response = $this->actingAs($this->testUser)->get('/');
+
+        $response->assertOk();
+    }
+}

tests/Integration/Support/Controller.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Integration\Support;
+
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
+{
+    use AuthenticatesUsers;
+
+    public function home(Request $request)
+    {
+        return 'Hello '.$request->user()->name.'!';
+    }
+}

tests/Integration/Support/User.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Tests\Integration\Support;
+
+use Illuminate\Foundation\Auth\User as BaseUser;
+
+class User extends BaseUser
+{
+    protected $table = 'users';
+
+    protected $fillable = ['name', 'email', 'password'];
+}

tests/Integration/TestCase.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Integration;
+
+use Tests\Integration\Support\User;
+
+abstract class TestCase extends \Orchestra\Testbench\TestCase
+{
+    public $testUser;
+
+    /**
+     * Get package providers.  At a minimum this is the package being tested, but also
+     * would include packages upon which our package depends, e.g. Cartalyst/Sentry
+     * In a normal app environment these would be added to the 'providers' array in
+     * the config/app.php file.
+     *
+     * @param \Illuminate\Foundation\Application $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            \BoxedCode\Laravel\Auth\Ip\IpAuthServiceProvider::class,
+        ];
+    }
+
+    /**
+     * Setup the test environment.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Run the migrations.
+        $this->loadLaravelMigrations(['--database' => 'testing']);
+        $this->artisan('migrate', ['--database' => 'testing']);
+
+        // Create a test user.
+        $this->testUser = User::create([
+            'name'     => 'Test User',
+            'email'    => 'test@user.com',
+            'password' => 'password',
+        ]);
+
+        \Route::get('/', '\Tests\Integration\Support\Controller@home')->middleware([
+            'auth',
+            \BoxedCode\Laravel\Auth\Ip\Middleware\RequireIpAuthorization::class,
+        ]);
+
+        \Route::get('/logout', '\Tests\Integration\Support\Controller@logout')->name('logout');
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        // Setup default database to use sqlite :memory:
+        $app['config']->set('database.default', 'testing');
+        $app['config']->set('database.connections.testing', [
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => '',
+        ]);
+
+        // Set default user model.
+        $app['config']->set('auth.providers.users.model', User::class);
+        //$app['config']->set()
+    }
+}