Merge branch 'master' into patch-3

generationtux · Nov 30, 2020 · 1c65fa3 · 1c65fa3
2 parents e1df828 + b044a1d
commit 1c65fa3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,25 @@
 language: php
 
 php:
+  - 7.2
   - 7.3
   - 7.4
+  - 8.0snapshot
 
 env:
+  - LARAVEL=^6.0
   - LARAVEL=^7.0
   - LARAVEL=^8.0
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.4
-
 cache:
   directories:
     - $HOME/.composer/cache
 
 install:
-  - travis_retry composer install --no-suggest --no-interaction --prefer-dist --no-progress
+  - travis_retry composer self-update
+  - travis_retry composer install --no-interaction --prefer-dist --no-progress
 
-script: 
+script:
   - ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_success:

diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
           "email": "[email protected]"
         }
     ],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Gentux\\Healthz\\": "src/"
@@ -26,18 +27,18 @@
         ]
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.2.5",
         "guzzlehttp/guzzle": "^6.2",
         "aws/aws-sdk-php": "~3.0",
-        "illuminate/contracts": "^7.0|^8.0",
-        "illuminate/database": "^7.0|^8.0",
-        "illuminate/queue": "^7.0|^8.0",
-        "illuminate/console": "^7.0|^8.0",
+        "illuminate/contracts": "^6.0|^7.0|^8.0",
+        "illuminate/database": "^6.0|^7.0|^8.0",
+        "illuminate/queue": "^6.0|7.0|^8.0",
+        "illuminate/console": "^6.0|^7.0|^8.0",
         "twig/twig": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
-        "mockery/mockery": "^1.2.1",
+        "phpunit/phpunit": "^8.4|^9.3.3",
+        "mockery/mockery": "~1.3.3|^1.4.2",
         "gecko-packages/gecko-memcache-mock": "^1.0"
     },
     "extra": {

diff --git a/src/HealthResult.php b/src/HealthResult.php
@@ -71,9 +71,9 @@ public function title(): string
     }
 
     /**
-     * @return string
+     * @return null|string
      */
-    public function description(): string
+    public function description(): ?string
     {
         return $this->check->description();
     }

diff --git a/src/Support/HealthzServiceProvider.php b/src/Support/HealthzServiceProvider.php
@@ -2,6 +2,7 @@
 namespace Gentux\Healthz\Support;
 
 use Gentux\Healthz\Healthz;
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 
 class HealthzServiceProvider extends ServiceProvider
@@ -51,8 +52,8 @@ protected function healthzUIHandler()
             $password = getenv('HEALTHZ_PASSWORD');
             if ($username != "") {
                 if (
-                    array_get($_SERVER, 'PHP_AUTH_USER') !== $username ||
-                    array_get($_SERVER, 'PHP_AUTH_PW') !== $password
+                    Arr::get($_SERVER, 'PHP_AUTH_USER') !== $username ||
+                    Arr::get($_SERVER, 'PHP_AUTH_PW') !== $password
                 ) {
                     return response('Invalid credentials', 401, ['WWW-Authenticate' => 'Basic']);
                 }