Merge branch 'master' into update-cli-output

.github/workflows/run-tests.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        php: [7.4, 8.0, 8.1]
+        os: [macos-latest, ubuntu-latest]
+        php: [8.0, 8.1]
         stability: [prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-cli
+FROM php:8.0-cli
 
 RUN apt-get update
 RUN apt-get install -y git libzip-dev zip

app/Client/Configuration.php

@@ -6,7 +6,7 @@ class Configuration
 {
     /** @var string */
     protected $host;
-    
+
     /** @var string */
     protected $serverHost;
 
@@ -35,6 +35,11 @@ class Configuration
         return $this->serverHost;
     }
 
+    public function setServerHost($serverHost)
+    {
+        $this->serverHost = $serverHost;
+    }
+
     public function auth(): ?string
     {
         return $this->auth;
@@ -45,11 +50,6 @@ class Configuration
         return intval($this->port);
     }
 
-    public function setServerHost($host)
-    {
-        $this->serverHost = $host;
-    }
-
     public function getUrl(string $subdomain): string
     {
         $httpProtocol = $this->port() === 443 ? 'https' : 'http';

app/Server/Factory.php

@@ -310,7 +310,7 @@ class Factory
     protected function registerStatisticsCollector()
     {
         if (config('expose.admin.statistics.enable_statistics', true) === false) {
-            return;
+            return $this;
         }
 
         app()->singleton(StatisticsRepository::class, function () {

composer.json

@@ -16,9 +16,9 @@
         }
     ],
     "require": {
-        "php": "^7.3.0 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
-        "padraic/phar-updater": "^1.0.6"
+        "laravel-zero/phar-updater": "^1.2"
     },
     "require-dev": {
         "cboden/ratchet": "^0.4.3",

config/app.php

@@ -26,7 +26,7 @@ return [
     |
     */
 
-    'version' => '2.1.0',
+    'version' => '2.1.2',
 
     /*
     |--------------------------------------------------------------------------