phpmyadmin
diff --git a/‎src/Core.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Core.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Header.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Header.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/unit/Plugins/Import/ImportLdiTest.php‎
Lines changed: 2 additions & 3 deletions b/‎tests/unit/Plugins/Import/ImportLdiTest.php‎
Lines changed: 2 additions & 3 deletions
@@ -178,10 +178,10 @@ public static function getEnv(string $variableName): string
      *
      * @return array<string, string>
      */
-    public static function headerJSON(ClockInterface|null $clock = null): array
+    public static function headerJSON(ClockInterface $clock = new Clock()): array
     {
         // No caching
-        $headers = self::getNoCacheHeaders($clock ?? new Clock());
+        $headers = self::getNoCacheHeaders($clock);
 
         // Media type
         $headers['Content-Type'] = 'application/json; charset=UTF-8';
 
@@ -326,7 +326,7 @@ public function getMessage(): string
     }
 
     /** @return array<string, string> */
-    public function getHttpHeaders(ClockInterface|null $clock = null): array
+    public function getHttpHeaders(ClockInterface $clock = new Clock()): array
     {
         $headers = [
             'Referrer-Policy' => 'same-origin',
@@ -372,7 +372,7 @@ public function getHttpHeaders(ClockInterface|null $clock = null): array
             'Permissions-Policy' => 'fullscreen=(self), interest-cohort=()',
         ];
 
-        $headers = array_merge($headers, Core::getNoCacheHeaders($clock ?? new Clock()));
+        $headers = array_merge($headers, Core::getNoCacheHeaders($clock));
 
         /**
          * A different Content-Type is set in {@see \PhpMyAdmin\Controllers\Transformation\WrapperController}.
 
@@ -200,11 +200,10 @@ public function testDoImportLDISetting(): void
         self::assertTrue(ImportSettings::$finished);
     }
 
-    private function getImportLdi(DatabaseInterface|null $dbi = null, Config|null $config = null): ImportLdi
+    private function getImportLdi(DatabaseInterface|null $dbi = null, Config $config = new Config()): ImportLdi
     {
         $dbiObject = $dbi ?? $this->createDatabaseInterface();
-        $configObject = $config ?? new Config();
 
-        return new ImportLdi(new Import($dbiObject, new ResponseRenderer(), $configObject), $dbiObject, $configObject);
+        return new ImportLdi(new Import($dbiObject, new ResponseRenderer(), $config), $dbiObject, $config);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,10 @@ public static function getEnv(string $variableName): string`
`178`	`178`	`*`
`179`	`179`	`* @return array<string, string>`
`180`	`180`	`*/`
`181`		`- public static function headerJSON(ClockInterface\|null $clock = null): array`
	`181`	`+ public static function headerJSON(ClockInterface $clock = new Clock()): array`
`182`	`182`	`{`
`183`	`183`	`// No caching`
`184`		`- $headers = self::getNoCacheHeaders($clock ?? new Clock());`
	`184`	`+ $headers = self::getNoCacheHeaders($clock);`
`185`	`185`
`186`	`186`	`// Media type`
`187`	`187`	`$headers['Content-Type'] = 'application/json; charset=UTF-8';`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ public function getMessage(): string`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`/** @return array<string, string> */`
`329`		`- public function getHttpHeaders(ClockInterface\|null $clock = null): array`
	`329`	`+ public function getHttpHeaders(ClockInterface $clock = new Clock()): array`
`330`	`330`	`{`
`331`	`331`	`$headers = [`
`332`	`332`	`'Referrer-Policy' => 'same-origin',`
`@@ -372,7 +372,7 @@ public function getHttpHeaders(ClockInterface\|null $clock = null): array`
`372`	`372`	`'Permissions-Policy' => 'fullscreen=(self), interest-cohort=()',`
`373`	`373`	`];`
`374`	`374`
`375`		`- $headers = array_merge($headers, Core::getNoCacheHeaders($clock ?? new Clock()));`
	`375`	`+ $headers = array_merge($headers, Core::getNoCacheHeaders($clock));`
`376`	`376`
`377`	`377`	`/**`
`378`	`378`	`* A different Content-Type is set in {@see \PhpMyAdmin\Controllers\Transformation\WrapperController}.`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,10 @@ public function testDoImportLDISetting(): void`
`200`	`200`	`self::assertTrue(ImportSettings::$finished);`
`201`	`201`	`}`
`202`	`202`
`203`		`- private function getImportLdi(DatabaseInterface\|null $dbi = null, Config\|null $config = null): ImportLdi`
	`203`	`+ private function getImportLdi(DatabaseInterface\|null $dbi = null, Config $config = new Config()): ImportLdi`
`204`	`204`	`{`
`205`	`205`	`$dbiObject = $dbi ?? $this->createDatabaseInterface();`
`206`		`- $configObject = $config ?? new Config();`
`207`	`206`
`208`		`- return new ImportLdi(new Import($dbiObject, new ResponseRenderer(), $configObject), $dbiObject, $configObject);`
	`207`	`+ return new ImportLdi(new Import($dbiObject, new ResponseRenderer(), $config), $dbiObject, $config);`
`209`	`208`	`}`
`210`	`209`	`}`