Adjustment for tests.

Updated to latest Bag version.
Jacked-PHP · Oct 10, 2024 · 0b74464 · 0b74464
1 parent a82c58c
commit 0b74464
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 55 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/jackit b/jackit
@@ -1,7 +1,23 @@
 #!/usr/bin/env php
 <?php
 
-require __DIR__.'/vendor/autoload.php';
+$autoload = null;
+$dir = __DIR__;
+
+for ($i = 0; $i < 6; $i++) {
+    if (file_exists($dir . '/vendor/autoload.php')) {
+        $autoload = $dir . '/vendor/autoload.php';
+        break;
+    }
+    $dir = dirname($dir);
+}
+
+if ($autoload) {
+    require $autoload;
+} else {
+    fwrite(STDERR, "Autoload file not found.\n");
+    exit(1);
+}
 
 use JackedPhp\JackedServer\Commands\RunCommand;
 use JackedPhp\JackedServer\Services\Server;

diff --git a/src/Data/Traits/DataBagHelper.php b/src/Data/Traits/DataBagHelper.php
@@ -4,7 +4,7 @@
 
 trait DataBagHelper
 {
-    public static function from(mixed $values): static
+    public static function from(mixed ...$values): static
     {
         /** @var static $data */
         $data = parent::from($values);

diff --git a/tests/Sample/config/jacked-server-http.php b/tests/Sample/config/jacked-server-http.php
@@ -53,6 +53,10 @@
 
         // @phpstan-ignore-next-line
         // 'pid_file' => $_ENV['JACKED_SERVER_PID_FILE'] ?? ROOT_DIR . '/jacked-server.pid',
+
+        'http_compression' => ($_ENV['JACKED_SERVER_HTTP_COMPRESSION'] ?? 'true') === 'true',
+        'http_compression_level' => (int) ($_ENV['JACKED_SERVER_HTTP_COMPRESSION_LEVEL'] ?? 1),
+        'http_parse_cookie' => ($_ENV['JACKED_SERVER_HTTP_PARSE_COOKIE'] ?? 'true') === 'true',
     ],
 
     // ------------------------------------------------------------

diff --git a/tests/Sample/config/jacked-server.php b/tests/Sample/config/jacked-server.php
@@ -53,6 +53,10 @@
 
         // @phpstan-ignore-next-line
         // 'pid_file' => $_ENV['JACKED_SERVER_PID_FILE'] ?? ROOT_DIR . '/jacked-server.pid',
+
+        'http_compression' => ($_ENV['JACKED_SERVER_HTTP_COMPRESSION'] ?? 'true') === 'true',
+        'http_compression_level' => (int) ($_ENV['JACKED_SERVER_HTTP_COMPRESSION_LEVEL'] ?? 1),
+        'http_parse_cookie' => ($_ENV['JACKED_SERVER_HTTP_PARSE_COOKIE'] ?? 'true') === 'true',
     ],
 
     // ------------------------------------------------------------

diff --git a/tests/Sample/ws-auth/jacked-server-with-ws-auth-2.php b/tests/Sample/ws-auth/jacked-server-with-ws-auth-2.php
@@ -53,6 +53,10 @@
 
         // @phpstan-ignore-next-line
         // 'pid_file' => $_ENV['JACKED_SERVER_PID_FILE'] ?? ROOT_DIR . '/jacked-server.pid',
+
+        'http_compression' => ($_ENV['JACKED_SERVER_HTTP_COMPRESSION'] ?? 'true') === 'true',
+        'http_compression_level' => (int) ($_ENV['JACKED_SERVER_HTTP_COMPRESSION_LEVEL'] ?? 1),
+        'http_parse_cookie' => ($_ENV['JACKED_SERVER_HTTP_PARSE_COOKIE'] ?? 'true') === 'true',
     ],
     'conveyor-options' => [
         'websocket-auth-token' => $_ENV['JACKED_SERVER_WEBSOCKET_AUTH_TOKEN'] ?? null,

diff --git a/tests/Sample/ws-auth/jacked-server-with-ws-auth.php b/tests/Sample/ws-auth/jacked-server-with-ws-auth.php
@@ -53,6 +53,10 @@
 
         // @phpstan-ignore-next-line
         // 'pid_file' => $_ENV['JACKED_SERVER_PID_FILE'] ?? ROOT_DIR . '/jacked-server.pid',
+
+        'http_compression' => ($_ENV['JACKED_SERVER_HTTP_COMPRESSION'] ?? 'true') === 'true',
+        'http_compression_level' => (int) ($_ENV['JACKED_SERVER_HTTP_COMPRESSION_LEVEL'] ?? 1),
+        'http_parse_cookie' => ($_ENV['JACKED_SERVER_HTTP_PARSE_COOKIE'] ?? 'true') === 'true',
     ],
     'conveyor-options' => [
         'websocket-auth-token' => $_ENV['JACKED_SERVER_WEBSOCKET_AUTH_TOKEN'] ?? null,