fix: filter argc, argv, ARGC, ARGV

Author: recca0120

composer.json

@@ -22,8 +22,8 @@
     },
     "require-dev": {
         "mockery/mockery": "^0.9|^1.3",
-        "orchestra/testbench": "^6.18|^5.19",
-        "phpunit/phpunit": "^9.1|^8.5"
+        "orchestra/testbench": "^5.19|^6.18",
+        "phpunit/phpunit": "^8.5|^9.1"
     },
     "autoload": {
         "psr-4": {

src/ParallelArtisan.php

@@ -31,9 +31,9 @@ class ParallelArtisan
      */
     private $process;
 
-    public function __construct(Request $request, array $env = [])
+    public function __construct(Request $request = null, array $env = [])
     {
-        $this->request = $request;
+        $this->request = $request ?? Request::capture();
         $this->setEnv($env);
     }
 
@@ -105,9 +105,14 @@ private function parseParameters(array $parameters): array
 
     private function getEnv(): array
     {
-        return array_filter(array_merge($this->request->server->all(), $_ENV, $this->env), static function ($env) {
-            return ! is_array($env);
-        });
+        $env = array_merge($this->request->server->all(), $_ENV, $this->env);
+        foreach (['argc', 'argv', 'ARGC', 'ARGV'] as $key) {
+            if (array_key_exists($key, $env)) {
+                unset($env[$key]);
+            }
+        }
+
+        return $env;
     }
 
     private function getPhpBinary(): string

src/ParallelRequest.php

@@ -15,13 +15,18 @@ class ParallelRequest
     use MakesHttpRequests;
     use InteractsWithAuthentication;
 
+    /**
+     * @var Request|null
+     */
+    private $request;
+
     /**
      * AsyncRequest constructor.
-     * @param array $serverVariables
+     * @param Request|null $request
      */
-    public function __construct(array $serverVariables = [])
+    public function __construct(Request $request = null)
     {
-        $this->withServerVariables($serverVariables);
+        $this->request = $request ?? Request::capture();
     }
 
     /**
@@ -38,10 +43,10 @@ public function __construct(array $serverVariables = [])
      */
     public function call(string $method, string $uri, array $parameters = [], array $cookies = [], array $files = [], array $server = [], $content = null): PromiseInterface
     {
-        $artisan = new ParallelArtisan(Request::capture(), $this->serverVariables);
+        $artisan = new ParallelArtisan($this->request, $this->serverVariables);
         $params = $this->toParams($uri, $method, $parameters, $cookies, $files, $server, $content);
 
-        return ($artisan)->call(ParallelCommand::COMMAND_NAME, $params)
+        return $artisan->call(ParallelCommand::COMMAND_NAME, $params)
             ->then(function () use ($artisan) {
                 return $this->updateCookies($this->toResponse($artisan->output()));
             });
@@ -66,11 +71,12 @@ public static function setBinary(string $binary): void
 
     /**
      * @param array $serverVariables
+     * @param Request|null $request
      * @return $this
      */
-    public static function create(array $serverVariables = []): self
+    public static function create(Request $request = null): self
     {
-        return new static($serverVariables);
+        return new static($request);
     }
 
     /**

src/ParallelServiceProvider.php

@@ -4,19 +4,11 @@
 
 use Illuminate\Support\ServiceProvider;
 use Recca0120\LaravelParallel\Console\ParallelCommand;
-use Recca0120\LaravelParallel\Tests\ParallelRequest;
 
 class ParallelServiceProvider extends ServiceProvider
 {
     public function register()
     {
         $this->commands([ParallelCommand::class]);
-
-        $this->app->bind(ParallelRequest::class, function () {
-            return ParallelRequest::create($this->app['request']->server->all());
-        });
-        $this->app->bind(ParallelRequest::class, function () {
-            return ParallelRequest::create($this->app['request']->server->all());
-        });
     }
 }

tests/ParallelRequestTest.php

@@ -35,7 +35,7 @@ public function test_it_should_return_previous_url(): void
 
     public function test_it_should_has_db_connection_in_server_variables(): void
     {
-        $request = ParallelRequest::create(['CUSTOM' => 'custom']);
+        $request = ParallelRequest::create()->withServerVariables(['CUSTOM' => 'custom']);
 
         $response = $request->getJson('/server_variables')->wait();