Merge pull request #45 from olssonm/dev

Improve phpunit tests, minor refactoring

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 src/config.php
 .DS_Store
 .phpunit.result.cache
+phpunit-output

.travis.yml

@@ -1,6 +1,8 @@
 language: php
 
-sudo: false
+dist: xenial
+
+os: linux
 
 before_script:
   - travis_retry composer self-update
@@ -9,7 +11,7 @@ before_script:
 script:
   - composer test
 
-matrix:
+jobs:
   include:
     - php: 7.1
       env:

phpunit.xml

@@ -14,4 +14,12 @@
             <file>./tests/VeryBasicAuthTests.php</file>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+            <exclude>
+                <directory suffix=".blade.php">src</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>

src/Http/Middleware/VeryBasicAuth.php

@@ -3,6 +3,7 @@
 namespace Olssonm\VeryBasicAuth\Http\Middleware;
 
 use \Illuminate\Http\Request;
+use \Symfony\Component\HttpFoundation\Response;
 
 use Closure;
 
@@ -11,13 +12,13 @@ class VeryBasicAuth
     /**
      * Handle an incoming request
      *
-     * @param \Illuminate\Http\Request  $request
-     * @param \Closure $next
-     * @param mixed $username
-     * @param mixed $password
-     * @return \Illuminate\Http\Response
+     * @param  Request  $request
+     * @param  Closure  $next
+     * @param  mixed    $username
+     * @param  mixed    $password
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handle(Request $request, Closure $next, $username = null, $password = null)
+    public function handle(Request $request, Closure $next, $username = null, $password = null): Response
     {
         $active = (count(array_intersect([
             '*',
@@ -42,7 +43,7 @@ public function handle(Request $request, Closure $next, $username = null, $passw
     /**
      * Return a error response
      *
-     * @param \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     private function deniedResponse(Request $request)

tests/VeryBasicAuthTests.php

@@ -45,6 +45,18 @@ public function test_config_file_is_installed()
 		$this->assertTrue(file_exists(__DIR__ . '/../src/config.php'));
 	}
 
+	/** @test */
+	public function test_view_exists()
+	{
+		$view = file_get_contents(__DIR__ . '/../src/resources/views/default.blade.php');
+
+		if (method_exists($this, 'assertStringContainsStringIgnoringCase')) {
+			$this->assertStringContainsStringIgnoringCase('This is the default view for the olssonm/l5-very-basic-auth-package', $view);
+		} else {
+			$this->assertContains('This is the default view for the olssonm/l5-very-basic-auth-package', $view);
+		}
+	}
+
 	/** @test */
 	public function test_very_basic_auth_authenticate_no_credentials()
 	{