fix rector parallel process error and strict types declaration

mattvb91 · Feb 4, 2024 · 9393209 · 9393209
1 parent a443040
commit 9393209
Show file tree

Hide file tree

Showing 61 changed files with 143 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
     "phpstan": "phpstan analyse",
     "codesniffer": "phpcs ./src ./tests/**/*.php --standard=./codesniffer.xml -p",
     "codefixer": "phpcbf ./src ./tests/**/*.php --standard=./codesniffer.xml",
-    "rector": "rector --dry-run",
-    "rector-fix": "rector"
+    "rector": "rector process --dry-run",
+    "rector-fix": "rector process"
   },
   "autoload": {
     "psr-4": {
@@ -33,6 +33,6 @@
     "dms/phpunit-arraysubset-asserts": "^0.4.0",
     "phpstan/phpstan": "^1.10",
     "squizlabs/php_codesniffer": "^3.7",
-    "rector/rector": "^0.18.13"
+    "rector/rector": "^0.17"
   }
 }
diff --git a/rector.php b/rector.php
@@ -4,20 +4,23 @@
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
 
 return static function (RectorConfig $rectorConfig): void {
-
     $rectorConfig->paths([
         __DIR__ . '/src',
     ]);
 
     // register a single rule
-    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->rules([
+        InlineConstructorDefaultToPropertyRector::class,
+        DeclareStrictTypesRector::class,
+    ]);
 
     // define sets of rules
-        $rectorConfig->sets([
-            \Rector\Set\ValueObject\SetList::DEAD_CODE,
-            \Rector\Set\ValueObject\SetList::CODE_QUALITY,
-            \Rector\Set\ValueObject\SetList::TYPE_DECLARATION,
-        ]);
+    $rectorConfig->sets([
+        \Rector\Set\ValueObject\SetList::DEAD_CODE,
+        \Rector\Set\ValueObject\SetList::CODE_QUALITY,
+        \Rector\Set\ValueObject\SetList::TYPE_DECLARATION,
+    ]);
 };
diff --git a/src/Caddy.php b/src/Caddy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp;
 
 use GuzzleHttp\Client;
@@ -72,7 +74,12 @@ public function syncHosts(string $hostIdentifier): void
         $this->buildHostsCache($hostIdentifier);
 
         /** @var string[] $hosts */
-        $hosts = json_decode($this->client->get($this->hostsCache[$hostIdentifier]['path'])->getBody(), true);
+        $hosts = json_decode(
+            $this->client->get($this->hostsCache[$hostIdentifier]['path'])
+                ->getBody()
+                ->getContents(),
+            true
+        );
 
         $this->hostsCache[$hostIdentifier]['host']->setHosts($hosts);
     }
@@ -129,7 +136,12 @@ public function removeHostname(string $hostIdentifier, string $hostname): bool
     public function getRemoteConfig(): object
     {
         /** @var object */
-        return json_decode($this->client->get('/config')->getBody(), false, 512, JSON_THROW_ON_ERROR);
+        return json_decode(
+            $this->client->get('/config')->getBody()->getContents(),
+            false,
+            512,
+            JSON_THROW_ON_ERROR
+        );
     }
 
     /**

diff --git a/src/Config/Admin.php b/src/Config/Admin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Cache.php b/src/Config/Apps/Cache.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps;
 
 use mattvb91\CaddyPhp\Config\Apps\Cache\Api;

diff --git a/src/Config/Apps/Cache/Api.php b/src/Config/Apps/Cache/Api.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache;
 
 use mattvb91\CaddyPhp\Config\Apps\Cache\Api\Souin;

diff --git a/src/Config/Apps/Cache/Api/Souin.php b/src/Config/Apps/Cache/Api/Souin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache\Api;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Cache/Cdn.php b/src/Config/Apps/Cache/Cdn.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Cache/Key.php b/src/Config/Apps/Cache/Key.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Cache/Nuts.php b/src/Config/Apps/Cache/Nuts.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Cache/Redis.php b/src/Config/Apps/Cache/Redis.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Cache;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Http.php b/src/Config/Apps/Http.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server;

diff --git a/src/Config/Apps/Http/Server.php b/src/Config/Apps/Http/Server.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server\Route;

diff --git a/src/Config/Apps/Http/Server/Route.php b/src/Config/Apps/Http/Server/Route.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\HandlerInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Authentication.php b/src/Config/Apps/Http/Server/Routes/Handle/Authentication.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\Authentication\ProviderInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic.php b/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Authentication\Providers;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Authentication\Providers\HttpBasic\Account;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic/Account.php b/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic/Account.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Authentication\Providers\HttpBasic;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic/Hash/Bcrypt.php b/src/Config/Apps/Http/Server/Routes/Handle/Authentication/Providers/HttpBasic/Hash/Bcrypt.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Authentication\Providers\HttpBasic\Hash;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\Authentication\Providers\HttpBasic\HashInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Cache.php b/src/Config/Apps/Http/Server/Routes/Handle/Cache.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Config\Logs\LogLevel;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Error.php b/src/Config/Apps/Http/Server/Routes/Handle/Error.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\HandlerInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/FileServer.php b/src/Config/Apps/Http/Server/Routes/Handle/FileServer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\HandlerInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Headers.php b/src/Config/Apps/Http/Server/Routes/Handle/Headers.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Headers\Request;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Headers/Request.php b/src/Config/Apps/Http/Server/Routes/Handle/Headers/Request.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Headers;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Headers/Response.php b/src/Config/Apps/Http/Server/Routes/Handle/Headers/Response.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\Headers;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy.php b/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\ReverseProxy\Upstream;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy/Transport/FastCGI.php b/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy/Transport/FastCGI.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\ReverseProxy\Transport;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\ReverseProxy\TransportInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy/Upstream.php b/src/Config/Apps/Http/Server/Routes/Handle/ReverseProxy/Upstream.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle\ReverseProxy;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Rewrite.php b/src/Config/Apps/Http/Server/Routes/Handle/Rewrite.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\HandlerInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/StaticResponse.php b/src/Config/Apps/Http/Server/Routes/Handle/StaticResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Handle\HandlerInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Handle/Subroute.php b/src/Config/Apps/Http/Server/Routes/Handle/Subroute.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Handle;
 
 use mattvb91\CaddyPhp\Config\Apps\Http\Server\Route;

diff --git a/src/Config/Apps/Http/Server/Routes/Match/File.php b/src/Config/Apps/Http/Server/Routes/Match/File.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Match\MatcherInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Match/Host.php b/src/Config/Apps/Http/Server/Routes/Match/Host.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Match\MatcherInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Match/MatchProtocol.php b/src/Config/Apps/Http/Server/Routes/Match/MatchProtocol.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 enum MatchProtocol: string

diff --git a/src/Config/Apps/Http/Server/Routes/Match/Not.php b/src/Config/Apps/Http/Server/Routes/Match/Not.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Match\MatcherInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Match/Path.php b/src/Config/Apps/Http/Server/Routes/Match/Path.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Match\MatcherInterface;

diff --git a/src/Config/Apps/Http/Server/Routes/Match/Protocol.php b/src/Config/Apps/Http/Server/Routes/Match/Protocol.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Http\Server\Routes\Match;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Servers\Routes\Match\MatcherInterface;

diff --git a/src/Config/Apps/Tls.php b/src/Config/Apps/Tls.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps;
 
 use mattvb91\CaddyPhp\Config\Apps\Tls\Automation;

diff --git a/src/Config/Apps/Tls/Automation.php b/src/Config/Apps/Tls/Automation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Tls;
 
 use mattvb91\CaddyPhp\Config\Apps\Tls\Automation\OnDemand;

diff --git a/src/Config/Apps/Tls/Automation/OnDemand.php b/src/Config/Apps/Tls/Automation/OnDemand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Tls\Automation;
 
 use mattvb91\CaddyPhp\Config\Apps\Tls\Automation\OnDemand\RateLimit;

diff --git a/src/Config/Apps/Tls/Automation/OnDemand/RateLimit.php b/src/Config/Apps/Tls/Automation/OnDemand/RateLimit.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Tls\Automation\OnDemand;
 
 use mattvb91\CaddyPhp\Interfaces\Arrayable;

diff --git a/src/Config/Apps/Tls/Automation/Policies.php b/src/Config/Apps/Tls/Automation/Policies.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Tls\Automation;
 
 use mattvb91\CaddyPhp\Interfaces\Apps\Tls\Automation\Policies\IssuerInterface;

diff --git a/src/Config/Apps/Tls/Automation/Policies/Issuers/Acme.php b/src/Config/Apps/Tls/Automation/Policies/Issuers/Acme.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace mattvb91\CaddyPhp\Config\Apps\Tls\Automation\Policies\Issuers;
 
 use mattvb91\CaddyPhp\Config\Apps\Tls\Automation\Policies\Issuers\Acme\Challenges;