diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 59a3806b85..e46d4bbeaa 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1323,6 +1323,15 @@ parameters: count: 1 path: src/ConfigStorage/Relation.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 4 + path: src/ConfigStorage/UserGroups.php + - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: @@ -5448,7 +5457,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 4 + count: 5 path: src/Encoding.php - @@ -5481,6 +5490,15 @@ parameters: count: 1 path: src/Encoding.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 1 + path: src/Engines/Innodb.php + - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: @@ -5520,6 +5538,15 @@ parameters: count: 2 path: src/Error/Error.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 1 + path: src/Error/Error.php + - message: '#^Cannot access offset ''args'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible @@ -5895,7 +5922,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 3 + count: 4 path: src/Favorites/RecentFavoriteTables.php - @@ -6846,7 +6873,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 8 + count: 9 path: src/Html/Generator.php - @@ -7572,6 +7599,15 @@ parameters: count: 1 path: src/Menu.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 1 + path: src/Message.php + - message: '#^Cannot cast mixed to string\.$#' identifier: cast.string @@ -8592,7 +8628,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 6 + count: 7 path: src/Plugins/AuthenticationPlugin.php - @@ -10593,7 +10629,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 1 + count: 2 path: src/Plugins/TwoFactorPlugin.php - @@ -12591,15 +12627,6 @@ parameters: count: 6 path: src/Table/TableMover.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Template.php - - message: '#^Call to function in_array\(\) requires parameter \#3 to be set\.$#' identifier: function.strict @@ -15882,7 +15909,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 21 + count: 20 path: tests/unit/InsertEditTest.php - diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 0335d89fb3..48b348e542 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -629,6 +629,10 @@ + + + + @@ -3932,6 +3936,7 @@ + getUploadTempDir()]]> @@ -3942,6 +3947,7 @@ + @@ -3955,6 +3961,9 @@ + + + @@ -4161,6 +4170,7 @@ + @@ -4743,6 +4753,7 @@ + @@ -5168,6 +5179,9 @@ + + + params]]> @@ -5783,6 +5797,7 @@ + @@ -7223,6 +7238,7 @@ + @@ -8240,11 +8256,6 @@ - - - - - @@ -10213,7 +10224,6 @@ - diff --git a/src/Config/FormDisplayTemplate.php b/src/Config/FormDisplayTemplate.php index 4f959f1226..ef7b5d72b7 100644 --- a/src/Config/FormDisplayTemplate.php +++ b/src/Config/FormDisplayTemplate.php @@ -23,7 +23,7 @@ class FormDisplayTemplate public function __construct(protected Config $config) { - $this->template = new Template(); + $this->template = new Template($this->config); } /** diff --git a/src/ConfigStorage/UserGroups.php b/src/ConfigStorage/UserGroups.php index 502e843cef..5cb90cdbaa 100644 --- a/src/ConfigStorage/UserGroups.php +++ b/src/ConfigStorage/UserGroups.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; use PhpMyAdmin\Dbal\ConnectionType; use PhpMyAdmin\Dbal\DatabaseInterface; @@ -56,7 +57,7 @@ class UserGroups } } - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('server/user_groups/user_listings', [ 'user_group_special_chars' => $userGroupSpecialChars, @@ -116,7 +117,7 @@ class UserGroups $addUserUrl = Url::getFromRoute('/server/user-groups', ['addUserGroup' => 1]); $addUserIcon = Generator::getIcon('b_usradd'); - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('server/user_groups/user_groups', [ 'action' => $action, @@ -240,7 +241,7 @@ class UserGroups $allowedTabs['table'], ); - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('server/user_groups/edit_user_groups', [ 'user_group' => $userGroup, @@ -272,7 +273,7 @@ class UserGroups $tabDetails[] = $tabDetail; } - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('server/user_groups/tab_list', [ 'title' => $title, diff --git a/src/Database/CentralColumns.php b/src/Database/CentralColumns.php index 8d5b0c6dca..d4bba2dcfb 100644 --- a/src/Database/CentralColumns.php +++ b/src/Database/CentralColumns.php @@ -71,7 +71,7 @@ class CentralColumns $this->disableIs = $config->selectedServer['DisableIS']; $this->relation = new Relation($this->dbi); - $this->template = new Template(); + $this->template = new Template($config); } /** diff --git a/src/Display/Results.php b/src/Display/Results.php index 53f3344380..c7091739f5 100644 --- a/src/Display/Results.php +++ b/src/Display/Results.php @@ -219,7 +219,7 @@ class Results ) { $this->relation = new Relation($this->dbi); $this->transformations = new Transformations($this->dbi, $this->relation); - $this->template = new Template(); + $this->template = new Template($this->config); $this->setDefaultTransformations(); diff --git a/src/Encoding.php b/src/Encoding.php index 88b2c7d916..8af0ae41b8 100644 --- a/src/Encoding.php +++ b/src/Encoding.php @@ -282,7 +282,7 @@ class Encoding */ public static function kanjiEncodingForm(): string { - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('encoding/kanji_encoding_form'); } diff --git a/src/Engines/Innodb.php b/src/Engines/Innodb.php index 1767990d64..883fa43421 100644 --- a/src/Engines/Innodb.php +++ b/src/Engines/Innodb.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Engines; +use PhpMyAdmin\Config; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Engines\Innodb\BufferPool; use PhpMyAdmin\StorageEngine; @@ -109,7 +110,7 @@ class Innodb extends StorageEngine */ public function getPageBufferPool(): string { - return (new Template())->render('server/engines/_innodb_buffer_pool', [ + return (new Template(Config::getInstance()))->render('server/engines/_innodb_buffer_pool', [ 'buffer_pool' => $this->getBufferPoolStatus(), ]); } diff --git a/src/Error/Error.php b/src/Error/Error.php index afe97ca957..74d96b1c43 100644 --- a/src/Error/Error.php +++ b/src/Error/Error.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Error; +use PhpMyAdmin\Config; use PhpMyAdmin\Message; use PhpMyAdmin\MessageType; use PhpMyAdmin\Template; @@ -422,7 +423,7 @@ class Error extends Message { $this->isDisplayed(true); - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('error/get_display', [ 'context' => $this->getLevel() === MessageType::Error ? 'danger' : 'primary', diff --git a/src/Favorites/RecentFavoriteTables.php b/src/Favorites/RecentFavoriteTables.php index 7ba72ac224..d26f00a7ce 100644 --- a/src/Favorites/RecentFavoriteTables.php +++ b/src/Favorites/RecentFavoriteTables.php @@ -89,7 +89,7 @@ class RecentFavoriteTables public static function getInstance(TableType $type): RecentFavoriteTables { if (! array_key_exists($type->value, self::$instances)) { - $template = new Template(); + $template = new Template(Config::getInstance()); $dbi = DatabaseInterface::getInstance(); self::$instances[$type->value] = new RecentFavoriteTables( $template, diff --git a/src/FileListing.php b/src/FileListing.php index ba03d0bbdc..a498387b1f 100644 --- a/src/FileListing.php +++ b/src/FileListing.php @@ -89,7 +89,7 @@ class FileListing return false; } - $template = new Template(); + $template = new Template($this->config); return $template->render('file_select_options', ['filesList' => $list, 'active' => $active]); } diff --git a/src/Html/Generator.php b/src/Html/Generator.php index 20ff903698..01293f4608 100644 --- a/src/Html/Generator.php +++ b/src/Html/Generator.php @@ -1048,7 +1048,7 @@ class Generator ); } - return (new Template())->render('list_navigator', [ + return (new Template(Config::getInstance()))->render('list_navigator', [ 'count' => $count, 'max_count' => $maxCount, 'classes' => $classes, diff --git a/src/InsertEdit.php b/src/InsertEdit.php index 0e7f8761b4..7dd73880ec 100644 --- a/src/InsertEdit.php +++ b/src/InsertEdit.php @@ -636,7 +636,7 @@ class InsertEdit $function = $this->showTypeOrFunction('function', $urlParams, true); } - $template = new Template(); + $template = new Template($this->config); return $template->render('table/insert/get_head_and_foot_of_insert_row_table', [ 'type' => $type, @@ -1420,7 +1420,7 @@ class InsertEdit */ public function getHtmlForInsertEditFormHeader(bool $hasBlobField, bool $isUpload): string { - $template = new Template(); + $template = new Template($this->config); return $template->render('table/insert/get_html_for_insert_edit_form_header', [ 'has_blob_field' => $hasBlobField, diff --git a/src/Message.php b/src/Message.php index d5a21408dc..b96fed967c 100644 --- a/src/Message.php +++ b/src/Message.php @@ -536,7 +536,7 @@ class Message implements Stringable { $this->isDisplayed(true); - $template = new Template(); + $template = new Template(Config::getInstance()); return $template->render('message', ['context' => $this->getContext(), 'message' => $this->getMessage()]); } diff --git a/src/Plugins/AuthenticationPlugin.php b/src/Plugins/AuthenticationPlugin.php index 0bd329db88..f744bf9e6d 100644 --- a/src/Plugins/AuthenticationPlugin.php +++ b/src/Plugins/AuthenticationPlugin.php @@ -54,7 +54,7 @@ abstract class AuthenticationPlugin public function __construct() { $this->ipAllowDeny = new IpAllowDeny(); - $this->template = new Template(); + $this->template = new Template(Config::getInstance()); } /** diff --git a/src/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php b/src/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php index 4142989103..7f048b3821 100644 --- a/src/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php +++ b/src/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php @@ -42,7 +42,8 @@ abstract class TextImageLinkTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string { - $cfg = Config::getInstance()->settings; + $config = Config::getInstance(); + $cfg = $config->settings; $options = $this->getOptions($options, $cfg['DefaultTransformations']['TextImageLink']); $url = $options[0] . $buffer; /* Do not allow javascript links */ @@ -50,7 +51,7 @@ abstract class TextImageLinkTransformationsPlugin extends TransformationsPlugin return htmlspecialchars($url); } - $template = new Template(); + $template = new Template($config); return $template->render('plugins/text_image_link_transformations', [ 'url' => $url, diff --git a/src/Plugins/TwoFactorPlugin.php b/src/Plugins/TwoFactorPlugin.php index 3643f0c992..87c422c7f8 100644 --- a/src/Plugins/TwoFactorPlugin.php +++ b/src/Plugins/TwoFactorPlugin.php @@ -43,7 +43,7 @@ class TwoFactorPlugin public function __construct(protected TwoFactor $twofactor) { - $this->template = new Template(); + $this->template = new Template(Config::getInstance()); } /** diff --git a/src/Server/Select.php b/src/Server/Select.php index 08fa7027dd..617eba66fd 100644 --- a/src/Server/Select.php +++ b/src/Server/Select.php @@ -87,7 +87,7 @@ class Select } } - $template = new Template(); + $template = new Template($config); return $template->render('server/select/index', [ 'not_only_options' => $notOnlyOptions, diff --git a/src/Sql.php b/src/Sql.php index d248c281b7..cff383f73b 100644 --- a/src/Sql.php +++ b/src/Sql.php @@ -1669,7 +1669,7 @@ class Sql { $indexes = Index::getFromTable($this->dbi, $table, $db); $indexesDuplicates = Index::findDuplicates($table, $db); - $template = new Template(); + $template = new Template($this->config); return $template->render('indexes', [ 'url_params' => UrlParams::$params, diff --git a/src/Template.php b/src/Template.php index 865ccecb66..424a3617cd 100644 --- a/src/Template.php +++ b/src/Template.php @@ -36,11 +36,8 @@ class Template public const TEMPLATES_FOLDER = ROOT_PATH . 'resources/templates'; - private Config $config; - - public function __construct(Config|null $config = null) + public function __construct(private readonly Config $config) { - $this->config = $config ?? Config::getInstance(); } public static function getTwigEnvironment(string|null $cacheDir, bool $isDevEnv): Environment diff --git a/tests/unit/BrowseForeignersTest.php b/tests/unit/BrowseForeignersTest.php index b1947aeefb..cc765478cd 100644 --- a/tests/unit/BrowseForeignersTest.php +++ b/tests/unit/BrowseForeignersTest.php @@ -23,7 +23,8 @@ class BrowseForeignersTest extends AbstractTestCase { parent::setUp(); - $this->browseForeigners = new BrowseForeigners(new Template(), new Config(), new ThemeManager()); + $config = new Config(); + $this->browseForeigners = new BrowseForeigners(new Template($config), $config, new ThemeManager()); } /** @@ -48,7 +49,7 @@ class BrowseForeignersTest extends AbstractTestCase $config = new Config(); $config->set('MaxRows', 50); - $browseForeigners = new BrowseForeigners(new Template(), $config, new ThemeManager()); + $browseForeigners = new BrowseForeigners(new Template($config), $config, new ThemeManager()); self::assertSame( 'LIMIT 10, 50 ', @@ -127,7 +128,7 @@ class BrowseForeignersTest extends AbstractTestCase $config = new Config(); $config->set('LimitChars', 5); - $browseForeigners = new BrowseForeigners(new Template(), $config, new ThemeManager()); + $browseForeigners = new BrowseForeigners(new Template($config), $config, new ThemeManager()); self::assertSame( ['fooba...', 'foobarcreateDatabaseInterface(); $dbi = DatabaseInterface::getInstance(); + $config = Config::getInstance(); $relation = new Relation($dbi); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $history = new History($dbi, $relation, Config::getInstance()); - $console = new Console($relation, new Template(), $bookmarkRepository, $history); + $history = new History($dbi, $relation, $config); + $console = new Console($relation, new Template($config), $bookmarkRepository, $history); self::assertSame(['console.js'], $console->getScripts()); } } diff --git a/tests/unit/Controllers/BrowseForeignersControllerTest.php b/tests/unit/Controllers/BrowseForeignersControllerTest.php index 7becbfe920..264c87b070 100644 --- a/tests/unit/Controllers/BrowseForeignersControllerTest.php +++ b/tests/unit/Controllers/BrowseForeignersControllerTest.php @@ -95,7 +95,7 @@ final class BrowseForeignersControllerTest extends AbstractTestCase $dbiDummy->addResult('SELECT COUNT(*) FROM .`actor`', [['3']], ['COUNT(*)']); $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template($config); $response = (new BrowseForeignersController( new ResponseRenderer(), diff --git a/tests/unit/Controllers/ChangeLogControllerTest.php b/tests/unit/Controllers/ChangeLogControllerTest.php index 84449fa9c7..1b81709327 100644 --- a/tests/unit/Controllers/ChangeLogControllerTest.php +++ b/tests/unit/Controllers/ChangeLogControllerTest.php @@ -37,7 +37,7 @@ final class ChangeLogControllerTest extends AbstractTestCase $request = ServerRequestFactory::create()->createServerRequest('GET', 'https://example.com/'); $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $controller = new ChangeLogController($responseRenderer, $config, ResponseFactory::create(), $template); $response = $controller($request); @@ -57,7 +57,12 @@ final class ChangeLogControllerTest extends AbstractTestCase $request = ServerRequestFactory::create()->createServerRequest('GET', 'https://example.com/'); $responseRenderer = new ResponseRenderer(); - $controller = new ChangeLogController($responseRenderer, $config, ResponseFactory::create(), new Template()); + $controller = new ChangeLogController( + $responseRenderer, + $config, + ResponseFactory::create(), + new Template(new Config()), + ); $response = $controller($request); self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); diff --git a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php index a8352c59b2..05ed8f9d0b 100644 --- a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php +++ b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php @@ -25,10 +25,11 @@ class RefreshControllerTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); $response = new ResponseRenderer(); $dbi = DatabaseInterface::getInstance(); + $config = Config::getInstance(); $relation = new Relation($dbi); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $template = new Template(); - $history = new History($dbi, $relation, Config::getInstance()); + $template = new Template($config); + $history = new History($dbi, $relation, $config); $controller = new RefreshController( $response, new Console($relation, $template, $bookmarkRepository, $history), diff --git a/tests/unit/Controllers/Database/EventsControllerTest.php b/tests/unit/Controllers/Database/EventsControllerTest.php index 327a830c5f..2bcc67d495 100644 --- a/tests/unit/Controllers/Database/EventsControllerTest.php +++ b/tests/unit/Controllers/Database/EventsControllerTest.php @@ -51,7 +51,7 @@ final class EventsControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') ->withQueryParams(['db' => 'test_db']); @@ -256,7 +256,7 @@ final class EventsControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') ->withQueryParams(['db' => 'test_db']); diff --git a/tests/unit/Controllers/Database/RoutinesControllerTest.php b/tests/unit/Controllers/Database/RoutinesControllerTest.php index b45ee76117..89fdfa365b 100644 --- a/tests/unit/Controllers/Database/RoutinesControllerTest.php +++ b/tests/unit/Controllers/Database/RoutinesControllerTest.php @@ -78,7 +78,7 @@ final class RoutinesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template($config); $response = new ResponseRenderer(); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') @@ -314,7 +314,7 @@ final class RoutinesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template($config); $response = new ResponseRenderer(); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') diff --git a/tests/unit/Controllers/Database/Structure/AddPrefixControllerTest.php b/tests/unit/Controllers/Database/Structure/AddPrefixControllerTest.php index b96435b2f7..4052f9b848 100644 --- a/tests/unit/Controllers/Database/Structure/AddPrefixControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/AddPrefixControllerTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use Fig\Http\Message\StatusCodeInterface; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\Structure\AddPrefixController; use PhpMyAdmin\Current; use PhpMyAdmin\Http\Factory\ResponseFactory; @@ -25,7 +26,7 @@ final class AddPrefixControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db']) ->withParsedBody(['selected_tbl' => ['test_table']]); - $template = new Template(); + $template = new Template(new Config()); $controller = new AddPrefixController(new ResponseRenderer(), ResponseFactory::create(), $template); $response = $controller($request); diff --git a/tests/unit/Controllers/Database/Structure/ChangePrefixFormControllerTest.php b/tests/unit/Controllers/Database/Structure/ChangePrefixFormControllerTest.php index eb7d3b50ed..30ac04ca27 100644 --- a/tests/unit/Controllers/Database/Structure/ChangePrefixFormControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/ChangePrefixFormControllerTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use Fig\Http\Message\StatusCodeInterface; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\Structure\ChangePrefixFormController; use PhpMyAdmin\Current; use PhpMyAdmin\Http\Factory\ResponseFactory; @@ -25,7 +26,7 @@ final class ChangePrefixFormControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db']) ->withParsedBody(['selected_tbl' => ['test_table']]); - $template = new Template(); + $template = new Template(new Config()); $controller = new ChangePrefixFormController(new ResponseRenderer(), ResponseFactory::create(), $template); $response = $controller($request); diff --git a/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php b/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php index f419be52ad..abd990e444 100644 --- a/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/CopyFormControllerTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Database\Structure; use Fig\Http\Message\StatusCodeInterface; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Database\Structure\CopyFormController; use PhpMyAdmin\Current; use PhpMyAdmin\Dbal\DatabaseInterface; @@ -34,7 +35,7 @@ final class CopyFormControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db']) ->withParsedBody(['selected_tbl' => ['test_table']]); - $template = new Template(); + $template = new Template(new Config()); $controller = new CopyFormController(new ResponseRenderer(), ResponseFactory::create(), $template); $response = $controller($request); diff --git a/tests/unit/Controllers/Database/StructureControllerTest.php b/tests/unit/Controllers/Database/StructureControllerTest.php index 18ed355f95..12002fb3d8 100644 --- a/tests/unit/Controllers/Database/StructureControllerTest.php +++ b/tests/unit/Controllers/Database/StructureControllerTest.php @@ -40,7 +40,8 @@ class StructureControllerTest extends AbstractTestCase { parent::setUp(); - Config::getInstance()->selectedServer['DisableIS'] = false; + $config = Config::getInstance(); + $config->selectedServer['DisableIS'] = false; Current::$table = 'table'; Current::$database = 'db'; @@ -61,7 +62,7 @@ class StructureControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; - $this->template = new Template(); + $this->template = new Template($config); $this->response = new ResponseStub(); $this->relation = new Relation($dbi); $this->replication = new Replication($dbi); diff --git a/tests/unit/Controllers/Export/Template/CreateControllerTest.php b/tests/unit/Controllers/Export/Template/CreateControllerTest.php index f5b65dd332..b7a0acad47 100644 --- a/tests/unit/Controllers/Export/Template/CreateControllerTest.php +++ b/tests/unit/Controllers/Export/Template/CreateControllerTest.php @@ -48,7 +48,7 @@ class CreateControllerTest extends AbstractTestCase $config->selectedServer['user'] = 'user'; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ 'exportType' => 'raw', diff --git a/tests/unit/Controllers/GisDataEditorControllerTest.php b/tests/unit/Controllers/GisDataEditorControllerTest.php index 3ce977ac30..b14cc3d4ae 100644 --- a/tests/unit/Controllers/GisDataEditorControllerTest.php +++ b/tests/unit/Controllers/GisDataEditorControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\GisDataEditorController; use PhpMyAdmin\Current; use PhpMyAdmin\Dbal\DatabaseInterface; @@ -28,7 +29,7 @@ class GisDataEditorControllerTest extends AbstractTestCase DatabaseInterface::$instance = $this->createDatabaseInterface(); - $this->controller = new GisDataEditorController(new ResponseRenderer(), new Template()); + $this->controller = new GisDataEditorController(new ResponseRenderer(), new Template(new Config())); } #[DataProvider('providerForTestValidateGisData')] diff --git a/tests/unit/Controllers/Import/ImportControllerTest.php b/tests/unit/Controllers/Import/ImportControllerTest.php index 56728a07c4..97d4e0e3d6 100644 --- a/tests/unit/Controllers/Import/ImportControllerTest.php +++ b/tests/unit/Controllers/Import/ImportControllerTest.php @@ -87,7 +87,7 @@ class ImportControllerTest extends AbstractTestCase $responseRenderer = new ResponseRenderer(); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); - $template = new Template(); + $template = new Template($config); $sql = new Sql( $this->dbi, $relation, diff --git a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php index b63f4514e8..2700ceda6e 100644 --- a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php +++ b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php @@ -32,7 +32,7 @@ class AddNewPrimaryControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new AddNewPrimaryController( diff --git a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php index 22ab3c624e..c13f91ff3e 100644 --- a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php +++ b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php @@ -32,7 +32,7 @@ class CreateNewColumnControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = self::createStub(ServerRequest::class); $relation = new Relation($dbi); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php index 8e94a1f20d..3554bceb09 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\FirstStepController; use PhpMyAdmin\Current; @@ -33,7 +34,7 @@ class FirstStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody(['normalizeTo' => $normalizeTo]); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php index 17336f98ab..8bd442dfd4 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\FourthStepController; use PhpMyAdmin\Current; @@ -30,7 +31,7 @@ class FourthStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new FourthStepController( diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php index 55151ecb35..4da9a935e4 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\SecondStepController; use PhpMyAdmin\Current; @@ -27,7 +28,7 @@ class SecondStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new SecondStepController( diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php index 1ce66bd156..e025da69a0 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\FirstNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\ThirdStepController; use PhpMyAdmin\Current; @@ -30,7 +31,7 @@ class ThirdStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new ThirdStepController( diff --git a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php index 5b8c611070..e7fffb11ba 100644 --- a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php +++ b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\GetColumnsController; use PhpMyAdmin\Current; @@ -30,7 +31,7 @@ class GetColumnsControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new GetColumnsController( diff --git a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php index 5e5d1ec7e9..424811728a 100644 --- a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php +++ b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\MoveRepeatingGroup; use PhpMyAdmin\Current; @@ -38,7 +39,7 @@ class MoveRepeatingGroupTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ 'repeatingColumns' => 'col1, col2', diff --git a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php index a37c1ea96b..53bdd9709d 100644 --- a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php +++ b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\PartialDependenciesController; use PhpMyAdmin\Current; @@ -38,7 +39,7 @@ class PartialDependenciesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new PartialDependenciesController( diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php index 6402dca846..a2cf0d1591 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\CreateNewTablesController; use PhpMyAdmin\Current; @@ -35,7 +36,7 @@ class CreateNewTablesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ 'pd' => json_encode(['ID, task' => [], 'task' => ['timestamp']]), diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php index 41479211d0..1ce4ada103 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\FirstStepController; use PhpMyAdmin\Current; @@ -27,7 +28,7 @@ class FirstStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $relation = new Relation($dbi); $controller = new FirstStepController( diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php index aa301e2237..0570a3437d 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\SecondNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\NewTablesController; use PhpMyAdmin\Current; @@ -29,7 +30,7 @@ class NewTablesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ 'pd' => json_encode(['ID, task' => [], 'task' => ['timestamp']]), diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php index 03d7b816aa..4fb0e7cf9f 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\CreateNewTablesController; use PhpMyAdmin\Current; @@ -52,7 +53,7 @@ class CreateNewTablesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody(['newTables' => $newTables]); diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php index aa94b1bc57..e149a32e06 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\FirstStepController; use PhpMyAdmin\Current; @@ -30,7 +31,7 @@ class FirstStepControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dbiDummy); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = self::createStub(ServerRequest::class); $request->method('getParsedBodyParam')->willReturnMap([['tables', null, ['test_table']]]); diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php index 0084ef08ce..a1749b2008 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Normalization\ThirdNormalForm; +use PhpMyAdmin\Config; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\NewTablesController; use PhpMyAdmin\Current; @@ -38,7 +39,7 @@ class NewTablesControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ 'tables' => $tables, diff --git a/tests/unit/Controllers/Operations/TableControllerTest.php b/tests/unit/Controllers/Operations/TableControllerTest.php index 981559003b..e3f62d8146 100644 --- a/tests/unit/Controllers/Operations/TableControllerTest.php +++ b/tests/unit/Controllers/Operations/TableControllerTest.php @@ -83,7 +83,7 @@ class TableControllerTest extends AbstractTestCase $charsets = Charsets::getCharsets($this->dbi, false); $collations = Charsets::getCollations($this->dbi, false); - $expectedOutput = (new Template())->render('table/operations/index', [ + $expectedOutput = (new Template($config))->render('table/operations/index', [ 'db' => 'test_db', 'table' => 'test_table', 'url_params' => [ diff --git a/tests/unit/Controllers/Server/PrivilegesControllerTest.php b/tests/unit/Controllers/Server/PrivilegesControllerTest.php index 81cf4225a1..8519bae279 100644 --- a/tests/unit/Controllers/Server/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Server/PrivilegesControllerTest.php @@ -71,13 +71,14 @@ class PrivilegesControllerTest extends AbstractTestCase $request->method('getQueryParam')->willReturnMap([['initial', null, null]]); $response = new ResponseRenderer(); + $config = new Config(); (new PrivilegesController( $response, - new Template(), + new Template($config), new Relation($this->dbi), $this->dbi, new UserPrivilegesFactory($this->dbi), - new Config(), + $config, ))($request); $this->dummyDbi->assertAllQueriesConsumed(); @@ -139,7 +140,7 @@ class PrivilegesControllerTest extends AbstractTestCase $controller = new PrivilegesController( new ResponseRenderer(), - new Template(), + new Template($config), new Relation($dbi), $dbi, new UserPrivilegesFactory($dbi), diff --git a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php index 85fdcd66e3..8d99bf2284 100644 --- a/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/AdvisorControllerTest.php @@ -36,7 +36,7 @@ class AdvisorControllerTest extends AbstractTestCase $config->selectedServer['host'] = 'localhost'; $this->response = new ResponseRenderer(); - $this->template = new Template(); + $this->template = new Template($config); $this->data = new Data(DatabaseInterface::getInstance(), $config); } diff --git a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php index db5fb584be..983920a083 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php @@ -54,7 +54,7 @@ class GeneralLogControllerTest extends AbstractTestCase $dbi = DatabaseInterface::getInstance(); $controller = new GeneralLogController( $response, - new Template(), + new Template(new Config()), $this->data, new Monitor($dbi), $dbi, diff --git a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php index 06a7a7a269..e7780be400 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/LogVarsControllerTest.php @@ -57,7 +57,7 @@ class LogVarsControllerTest extends AbstractTestCase $dbi = DatabaseInterface::getInstance(); $controller = new LogVarsController( $response, - new Template(), + new Template(new Config()), $this->data, new Monitor($dbi), $dbi, diff --git a/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php index c214baf60a..bdd3229a34 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php @@ -44,7 +44,13 @@ class QueryAnalyzerControllerTest extends AbstractTestCase $dummyDbi->cachedAffectedRows = 123; $statusData = new Data($dbi, $config); - $controller = new QueryAnalyzerController($response, new Template(), $statusData, new Monitor($dbi), $dbi); + $controller = new QueryAnalyzerController( + $response, + new Template($config), + $statusData, + new Monitor($dbi), + $dbi, + ); $request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/') ->withParsedBody([ diff --git a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php index 8dca32598a..60a0969acc 100644 --- a/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Monitor/SlowLogControllerTest.php @@ -50,7 +50,7 @@ class SlowLogControllerTest extends AbstractTestCase $dbi = DatabaseInterface::getInstance(); $controller = new SlowLogController( $response, - new Template(), + new Template(new Config()), $this->data, new Monitor($dbi), $dbi, diff --git a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php index 46e7ecb340..e7708fbf7f 100644 --- a/tests/unit/Controllers/Server/Status/MonitorControllerTest.php +++ b/tests/unit/Controllers/Server/Status/MonitorControllerTest.php @@ -50,7 +50,7 @@ class MonitorControllerTest extends AbstractTestCase $controller = new MonitorController( $response, - new Template(), + new Template(new Config()), $this->data, DatabaseInterface::getInstance(), ); diff --git a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php index 1d17a16fff..cacc06f9ee 100644 --- a/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php +++ b/tests/unit/Controllers/Server/Status/Processes/RefreshControllerTest.php @@ -52,13 +52,14 @@ class RefreshControllerTest extends AbstractTestCase 'State' => 'State1', 'Time' => 'Time1', ]; - Config::getInstance()->settings['MaxCharactersInDisplayedSQL'] = 12; + $config = Config::getInstance(); + $config->settings['MaxCharactersInDisplayedSQL'] = 12; $response = new ResponseRenderer(); $controller = new RefreshController( $response, - new Template(), + new Template($config), $this->data, new Processes(DatabaseInterface::getInstance()), ); diff --git a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php index ae4726c89f..1c89186ee4 100644 --- a/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/ProcessesControllerTest.php @@ -51,7 +51,7 @@ class ProcessesControllerTest extends AbstractTestCase $dbi = DatabaseInterface::getInstance(); $controller = new ProcessesController( $response, - new Template(), + new Template(new Config()), $this->data, $dbi, new Processes($dbi), diff --git a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php index 1a6482c5ed..c5f507ce9a 100644 --- a/tests/unit/Controllers/Server/Status/QueriesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/QueriesControllerTest.php @@ -80,7 +80,12 @@ class QueriesControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new QueriesController($response, new Template(), $this->data, DatabaseInterface::getInstance()); + $controller = new QueriesController( + $response, + new Template(new Config()), + $this->data, + DatabaseInterface::getInstance(), + ); $this->dummyDbi->addSelectDb('mysql'); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Server/Status/StatusControllerTest.php b/tests/unit/Controllers/Server/Status/StatusControllerTest.php index 25c52599ec..f231cd1945 100644 --- a/tests/unit/Controllers/Server/Status/StatusControllerTest.php +++ b/tests/unit/Controllers/Server/Status/StatusControllerTest.php @@ -63,10 +63,11 @@ class StatusControllerTest extends AbstractTestCase ['Com_empty_query', '0'], ], ['Variable_name', 'Value']); - $data = new Data($dbi, Config::getInstance()); + $config = Config::getInstance(); + $data = new Data($dbi, $config); $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $controller = new StatusController( $response, diff --git a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php index 886e878a17..9c96444264 100644 --- a/tests/unit/Controllers/Server/Status/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/Status/VariablesControllerTest.php @@ -46,7 +46,12 @@ class VariablesControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new VariablesController($response, new Template(), $this->data, DatabaseInterface::getInstance()); + $controller = new VariablesController( + $response, + new Template(new Config()), + $this->data, + DatabaseInterface::getInstance(), + ); $this->dummyDbi->addSelectDb('mysql'); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Server/VariablesControllerTest.php b/tests/unit/Controllers/Server/VariablesControllerTest.php index c5297c903b..491be758bb 100644 --- a/tests/unit/Controllers/Server/VariablesControllerTest.php +++ b/tests/unit/Controllers/Server/VariablesControllerTest.php @@ -76,7 +76,7 @@ class VariablesControllerTest extends AbstractTestCase ->with('SHOW SESSION VARIABLES;') ->willReturn($resultStub); - $controller = new VariablesController($response, new Template(), $this->mockedDbi); + $controller = new VariablesController($response, new Template(new Config()), $this->mockedDbi); $controller(self::createStub(ServerRequest::class)); $html = $response->getHTMLResult(); @@ -118,7 +118,7 @@ class VariablesControllerTest extends AbstractTestCase { $controller = new VariablesController( ResponseRenderer::getInstance(), - new Template(), + new Template(new Config()), $this->mockedDbi, ); @@ -184,7 +184,7 @@ class VariablesControllerTest extends AbstractTestCase $controller = new VariablesController( ResponseRenderer::getInstance(), - new Template(), + new Template(new Config()), $this->mockedDbi, ); @@ -237,7 +237,7 @@ class VariablesControllerTest extends AbstractTestCase $controller = new VariablesController( ResponseRenderer::getInstance(), - new Template(), + new Template(new Config()), $this->mockedDbi, ); diff --git a/tests/unit/Controllers/Sql/EnumValuesControllerTest.php b/tests/unit/Controllers/Sql/EnumValuesControllerTest.php index eeb499148b..ff582a5913 100644 --- a/tests/unit/Controllers/Sql/EnumValuesControllerTest.php +++ b/tests/unit/Controllers/Sql/EnumValuesControllerTest.php @@ -60,7 +60,8 @@ class EnumValuesControllerTest extends AbstractTestCase ]); $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $config = Config::getInstance(); + $template = new Template($config); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); $sql = new Sql( @@ -70,7 +71,7 @@ class EnumValuesControllerTest extends AbstractTestCase self::createStub(Transformations::class), $template, $bookmarkRepository, - Config::getInstance(), + $config, ); $sqlController = new EnumValuesController($responseRenderer, $template, $sql); @@ -121,7 +122,8 @@ class EnumValuesControllerTest extends AbstractTestCase ]); $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $config = Config::getInstance(); + $template = new Template($config); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); $sql = new Sql( @@ -131,7 +133,7 @@ class EnumValuesControllerTest extends AbstractTestCase self::createStub(Transformations::class), $template, $bookmarkRepository, - Config::getInstance(), + $config, ); $sqlController = new EnumValuesController($responseRenderer, $template, $sql); diff --git a/tests/unit/Controllers/Sql/SetValuesControllerTest.php b/tests/unit/Controllers/Sql/SetValuesControllerTest.php index f38572cbf9..6b4fbe532b 100644 --- a/tests/unit/Controllers/Sql/SetValuesControllerTest.php +++ b/tests/unit/Controllers/Sql/SetValuesControllerTest.php @@ -60,7 +60,8 @@ class SetValuesControllerTest extends AbstractTestCase Current::$table = 'enums'; $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $config = Config::getInstance(); + $template = new Template($config); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); $sql = new Sql( @@ -70,7 +71,7 @@ class SetValuesControllerTest extends AbstractTestCase self::createStub(Transformations::class), $template, $bookmarkRepository, - Config::getInstance(), + $config, ); $sqlController = new SetValuesController($responseRenderer, $template, $sql); @@ -121,7 +122,8 @@ class SetValuesControllerTest extends AbstractTestCase Current::$table = 'enums'; $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $config = Config::getInstance(); + $template = new Template($config); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); $sql = new Sql( @@ -131,7 +133,7 @@ class SetValuesControllerTest extends AbstractTestCase self::createStub(Transformations::class), $template, $bookmarkRepository, - Config::getInstance(), + $config, ); $sqlController = new SetValuesController($responseRenderer, $template, $sql); diff --git a/tests/unit/Controllers/Table/AddFieldControllerTest.php b/tests/unit/Controllers/Table/AddFieldControllerTest.php index 201a0bcb71..3dc311f76d 100644 --- a/tests/unit/Controllers/Table/AddFieldControllerTest.php +++ b/tests/unit/Controllers/Table/AddFieldControllerTest.php @@ -173,7 +173,7 @@ class AddFieldControllerTest extends AbstractTestCase $relation = new Relation($dbi); $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $expected = $template->render('columns_definitions/column_definitions_form', [ 'is_backup' => false, 'fields_meta' => null, @@ -261,7 +261,7 @@ class AddFieldControllerTest extends AbstractTestCase (new AddFieldController( $response, $transformations, - new Config(), + $config, $dbi, new ColumnsDefinition($dbi, $relation, $transformations), new DbTableExists($dbi), diff --git a/tests/unit/Controllers/Table/ChartControllerTest.php b/tests/unit/Controllers/Table/ChartControllerTest.php index f0222a85b5..29e87d3d65 100644 --- a/tests/unit/Controllers/Table/ChartControllerTest.php +++ b/tests/unit/Controllers/Table/ChartControllerTest.php @@ -76,7 +76,8 @@ class ChartControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $config = new Config(); + $template = new Template($config); $expected = $template->render('table/chart/tbl_chart', [ 'url_params' => [ 'db' => 'test_db', @@ -105,7 +106,7 @@ class ChartControllerTest extends AbstractTestCase 'unlim_num_rows' => '4', ]); - (new ChartController($response, $dbi, new DbTableExists($dbi), new Config()))($request); + (new ChartController($response, $dbi, new DbTableExists($dbi), $config))($request); self::assertSame($expected, $response->getHTMLResult()); } } diff --git a/tests/unit/Controllers/Table/CreateControllerTest.php b/tests/unit/Controllers/Table/CreateControllerTest.php index 4a3f547e24..c68e38aa4c 100644 --- a/tests/unit/Controllers/Table/CreateControllerTest.php +++ b/tests/unit/Controllers/Table/CreateControllerTest.php @@ -191,7 +191,7 @@ class CreateControllerTest extends AbstractTestCase $relation = new Relation($dbi); $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $expected = $template->render('columns_definitions/column_definitions_form', [ 'is_backup' => false, 'fields_meta' => null, diff --git a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php index c748edfe7a..2f73bfa8ed 100644 --- a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php +++ b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\DeleteConfirmController; use PhpMyAdmin\Current; use PhpMyAdmin\Dbal\DatabaseInterface; @@ -36,7 +37,7 @@ class DeleteConfirmControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template(new Config()); $expected = $template->render('table/delete/confirm', [ 'db' => 'test_db', 'table' => 'test_table', diff --git a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php index 3f8c52fa14..741be07798 100644 --- a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php +++ b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\DropColumnConfirmationController; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\DbTableExists; @@ -41,7 +42,7 @@ class DropColumnConfirmationControllerTest extends AbstractTestCase $response = new ResponseRenderer(); $response->setAjax(true); - $template = new Template(); + $template = new Template(new Config()); $expected = $template->render('table/structure/drop_confirm', [ 'db' => 'test_db', 'table' => 'test_table', diff --git a/tests/unit/Controllers/Table/FindReplaceControllerTest.php b/tests/unit/Controllers/Table/FindReplaceControllerTest.php index ff55100254..86e4d112a8 100644 --- a/tests/unit/Controllers/Table/FindReplaceControllerTest.php +++ b/tests/unit/Controllers/Table/FindReplaceControllerTest.php @@ -33,12 +33,13 @@ final class FindReplaceControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $responseRenderer = new ResponseRenderer(); + $config = new Config(); $controller = new FindReplaceController( $responseRenderer, - new Template(), + new Template($config), $dbi, new DbTableExists($dbi), - new Config(), + $config, ); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') @@ -80,12 +81,13 @@ final class FindReplaceControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $responseRenderer = new ResponseRenderer(); + $config = new Config(); $controller = new FindReplaceController( $responseRenderer, - new Template(), + new Template($config), $dbi, new DbTableExists($dbi), - new Config(), + $config, ); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') diff --git a/tests/unit/Controllers/Table/GisVisualizationControllerTest.php b/tests/unit/Controllers/Table/GisVisualizationControllerTest.php index abc3c18b13..0bddf18a0c 100644 --- a/tests/unit/Controllers/Table/GisVisualizationControllerTest.php +++ b/tests/unit/Controllers/Table/GisVisualizationControllerTest.php @@ -77,7 +77,8 @@ class GisVisualizationControllerTest extends AbstractTestCase ]; $downloadUrl = Url::getFromRoute('/table/gis-visualization', $downloadParams + $params); - $template = new Template(); + $config = new Config(); + $template = new Template($config); $expected = $template->render('table/gis_visualization/gis_visualization', [ 'url_params' => $params, 'download_url' => $downloadUrl, @@ -121,7 +122,7 @@ class GisVisualizationControllerTest extends AbstractTestCase $dbi, new DbTableExists($dbi), ResponseFactory::create(), - new Config(), + $config, ); $response = $controller($request); diff --git a/tests/unit/Controllers/Table/IndexRenameControllerTest.php b/tests/unit/Controllers/Table/IndexRenameControllerTest.php index eb11abe0e7..0e8319ae29 100644 --- a/tests/unit/Controllers/Table/IndexRenameControllerTest.php +++ b/tests/unit/Controllers/Table/IndexRenameControllerTest.php @@ -34,7 +34,7 @@ class IndexRenameControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template(new Config()); $expected = $template->render('table/index_rename_form', [ 'index' => new Index(['Key_name' => 'index']), 'form_params' => ['db' => 'test_db', 'table' => 'test_table_index_rename', 'old_index' => 'index'], @@ -60,7 +60,8 @@ class IndexRenameControllerTest extends AbstractTestCase $indexRegistry = new ReflectionProperty(Index::class, 'registry'); $indexRegistry->setValue(null, []); - Config::getInstance()->selectedServer['DisableIS'] = true; + $config = Config::getInstance(); + $config->selectedServer['DisableIS'] = true; Current::$database = 'test_db'; Current::$table = 'test_table_index_rename'; @@ -106,7 +107,7 @@ class IndexRenameControllerTest extends AbstractTestCase ]); $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $controller = new IndexRenameController( $responseRenderer, $template, diff --git a/tests/unit/Controllers/Table/IndexesControllerTest.php b/tests/unit/Controllers/Table/IndexesControllerTest.php index a14cbd4854..215b9b8dd7 100644 --- a/tests/unit/Controllers/Table/IndexesControllerTest.php +++ b/tests/unit/Controllers/Table/IndexesControllerTest.php @@ -89,7 +89,8 @@ class IndexesControllerTest extends AbstractTestCase $response = new ResponseStub(); $index = new Index(); - $template = new Template(); + $config = Config::getInstance(); + $template = new Template($config); $method = new ReflectionMethod(IndexesController::class, 'displayForm'); @@ -99,7 +100,7 @@ class IndexesControllerTest extends AbstractTestCase $dbi, new Indexes($dbi), new DbTableExists($dbi), - Config::getInstance(), + $config, ); $_POST['create_index'] = true; diff --git a/tests/unit/Controllers/Table/RelationControllerTest.php b/tests/unit/Controllers/Table/RelationControllerTest.php index 1e648061c5..82a2f820cb 100644 --- a/tests/unit/Controllers/Table/RelationControllerTest.php +++ b/tests/unit/Controllers/Table/RelationControllerTest.php @@ -35,7 +35,8 @@ class RelationControllerTest extends AbstractTestCase Current::$database = 'db'; Current::$table = 'table'; - Config::getInstance()->selectedServer['DisableIS'] = false; + $config = Config::getInstance(); + $config->selectedServer['DisableIS'] = false; //$_SESSION $_POST['foreignDb'] = 'db'; @@ -46,7 +47,7 @@ class RelationControllerTest extends AbstractTestCase ->getMock(); $this->response = new ResponseStub(); - $this->template = new Template(); + $this->template = new Template($config); } /** diff --git a/tests/unit/Controllers/Table/ReplaceControllerTest.php b/tests/unit/Controllers/Table/ReplaceControllerTest.php index 753606eb0c..b9cff5db8d 100644 --- a/tests/unit/Controllers/Table/ReplaceControllerTest.php +++ b/tests/unit/Controllers/Table/ReplaceControllerTest.php @@ -94,14 +94,14 @@ class ReplaceControllerTest extends AbstractTestCase $dummyDbi = $this->createDbiDummy(); $dbi = $this->createDatabaseInterface($dummyDbi); + $config = Config::getInstance(); $relation = new Relation($dbi); $transformations = new Transformations($dbi, $relation); - $template = new Template(); + $template = new Template($config); $response = new ResponseRenderer(); $pageSettings = self::createStub(PageSettings::class); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $config = Config::getInstance(); $sqlController = new SqlController( $response, new Sql( diff --git a/tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php b/tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php index 8f5f29b0e4..35972c4e76 100644 --- a/tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table\Structure; +use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Table\Structure\MoveColumnsController; use PhpMyAdmin\Current; use PhpMyAdmin\Message; @@ -39,7 +40,7 @@ class MoveColumnsControllerTest extends AbstractTestCase $controller = new MoveColumnsController( new ResponseStub(), - new Template(), + new Template(new Config()), $dbi, ); /** @var string|Message $alterStatement */ diff --git a/tests/unit/Controllers/Table/TrackingControllerTest.php b/tests/unit/Controllers/Table/TrackingControllerTest.php index 76490009a6..ee4aad3b0f 100644 --- a/tests/unit/Controllers/Table/TrackingControllerTest.php +++ b/tests/unit/Controllers/Table/TrackingControllerTest.php @@ -55,7 +55,7 @@ class TrackingControllerTest extends AbstractTestCase ->withParsedBody(['version' => '', 'table' => '']); $responseRenderer = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $trackingChecker = self::createStub(TrackingChecker::class); $relation = new Relation($this->dbi); $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); diff --git a/tests/unit/Controllers/Table/ZoomSearchControllerTest.php b/tests/unit/Controllers/Table/ZoomSearchControllerTest.php index 4f7cbb833e..0da27d4b94 100644 --- a/tests/unit/Controllers/Table/ZoomSearchControllerTest.php +++ b/tests/unit/Controllers/Table/ZoomSearchControllerTest.php @@ -41,7 +41,7 @@ final class ZoomSearchControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db', 'table' => 'test_table']); $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $controller = new ZoomSearchController( $response, $template, @@ -91,7 +91,7 @@ final class ZoomSearchControllerTest extends AbstractTestCase ->withParsedBody(['change_tbl_info' => '1']); $response = new ResponseRenderer(); - $template = new Template(); + $template = new Template($config); $controller = new ZoomSearchController( $response, $template, diff --git a/tests/unit/Controllers/Triggers/IndexControllerTest.php b/tests/unit/Controllers/Triggers/IndexControllerTest.php index de8ac7c943..069cf9164b 100644 --- a/tests/unit/Controllers/Triggers/IndexControllerTest.php +++ b/tests/unit/Controllers/Triggers/IndexControllerTest.php @@ -27,7 +27,8 @@ final class IndexControllerTest extends AbstractTestCase { Current::$server = 2; Current::$database = 'test_db'; - Config::getInstance()->selectedServer['DisableIS'] = true; + $config = Config::getInstance(); + $config->selectedServer['DisableIS'] = true; $dummyDbi = $this->createDbiDummy(); // phpcs:disable Generic.Files.LineLength.TooLong @@ -47,7 +48,7 @@ final class IndexControllerTest extends AbstractTestCase // phpcs:enable $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template($config); $response = new ResponseRenderer(); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') @@ -196,7 +197,8 @@ final class IndexControllerTest extends AbstractTestCase { Current::$server = 2; Current::$database = 'test_db'; - Config::getInstance()->selectedServer['DisableIS'] = true; + $config = Config::getInstance(); + $config->selectedServer['DisableIS'] = true; $dummyDbi = $this->createDbiDummy(); // phpcs:disable Generic.Files.LineLength.TooLong @@ -216,7 +218,7 @@ final class IndexControllerTest extends AbstractTestCase // phpcs:enable $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template($config); $response = new ResponseRenderer(); $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') @@ -337,7 +339,7 @@ final class IndexControllerTest extends AbstractTestCase $dbi = self::createStub(DatabaseInterface::class); DatabaseInterface::$instance = $dbi; - $template = new Template(); + $template = new Template(new Config()); $response = new ResponseRenderer(); $indexController = new IndexController( $response, diff --git a/tests/unit/Database/DesignerTest.php b/tests/unit/Database/DesignerTest.php index 11f8a9c856..dc2fc2caa0 100644 --- a/tests/unit/Database/DesignerTest.php +++ b/tests/unit/Database/DesignerTest.php @@ -83,7 +83,8 @@ class DesignerTest extends AbstractTestCase $this->mockDatabaseInteraction($db); $dbi = DatabaseInterface::getInstance(); - $this->designer = new Designer($dbi, new Relation($dbi), new Template(), new Config()); + $config = new Config(); + $this->designer = new Designer($dbi, new Relation($dbi), new Template($config), $config); $method = new ReflectionMethod(Designer::class, 'getPageIdsAndNames'); $result = $method->invokeArgs($this->designer, [$db]); @@ -104,7 +105,8 @@ class DesignerTest extends AbstractTestCase $this->mockDatabaseInteraction($db); $dbi = DatabaseInterface::getInstance(); - $this->designer = new Designer($dbi, new Relation($dbi), new Template(), new Config()); + $config = new Config(); + $this->designer = new Designer($dbi, new Relation($dbi), new Template($config), $config); $result = $this->designer->getHtmlForEditOrDeletePages($db, $operation); self::assertStringContainsString('', $result); @@ -125,7 +127,8 @@ class DesignerTest extends AbstractTestCase $this->mockDatabaseInteraction($db); $dbi = DatabaseInterface::getInstance(); - $this->designer = new Designer($dbi, new Relation($dbi), new Template(), new Config()); + $config = new Config(); + $this->designer = new Designer($dbi, new Relation($dbi), new Template($config), $config); $result = $this->designer->getHtmlForPageSaveAs($db); self::assertStringContainsString('', $result); @@ -156,7 +159,8 @@ class DesignerTest extends AbstractTestCase $page = 2; $dbi = DatabaseInterface::getInstance(); - $this->designer = new Designer($dbi, new Relation($dbi), new Template(), new Config()); + $config = new Config(); + $this->designer = new Designer($dbi, new Relation($dbi), new Template($config), $config); $result = $this->designer->getHtmlForSchemaExport($db, $page, null, null); // export type diff --git a/tests/unit/Database/SearchTest.php b/tests/unit/Database/SearchTest.php index 6be9097e1c..1d5182b793 100644 --- a/tests/unit/Database/SearchTest.php +++ b/tests/unit/Database/SearchTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Column; +use PhpMyAdmin\Config; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Search; use PhpMyAdmin\Dbal\DatabaseInterface; @@ -48,7 +49,7 @@ class SearchTest extends AbstractTestCase ->willReturnCallback(static fn (string $string): string => "'" . $string . "'"); DatabaseInterface::$instance = $dbi; - $this->object = new Search($dbi, 'pma_test', new Template()); + $this->object = new Search($dbi, 'pma_test', new Template(new Config())); // $this->object->setSearchParams(new \PhpMyAdmin\Http\ServerRequest()); } @@ -80,7 +81,7 @@ class SearchTest extends AbstractTestCase 'criteriaSearchOptionIncludeHex' => $includeHex, ]); - $this->object = new Search(DatabaseInterface::getInstance(), 'pma_test', new Template()); + $this->object = new Search(DatabaseInterface::getInstance(), 'pma_test', new Template(new Config())); $this->object->setSearchParams($request); self::assertSame( $expected, diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php index 1c473a4df9..9c0d8b555b 100644 --- a/tests/unit/Display/ResultsTest.php +++ b/tests/unit/Display/ResultsTest.php @@ -1215,7 +1215,7 @@ class ResultsTest extends AbstractTestCase self::assertNotFalse($dtResult); $actual = $object->getTable($dtResult, $displayParts, $statementInfo); - $template = new Template(); + $template = new Template($config); $tableHeadersForColumns = $template->render('display/results/table_headers_for_columns', [ 'is_sortable' => true, @@ -1507,7 +1507,7 @@ class ResultsTest extends AbstractTestCase self::assertNotFalse($dtResult); $actual = $object->getTable($dtResult, $displayParts, $statementInfo); - $template = new Template(); + $template = new Template($config); $tableHeadersForColumns = $template->render('display/results/table_headers_for_columns', [ 'is_sortable' => true, diff --git a/tests/unit/Error/ErrorReportTest.php b/tests/unit/Error/ErrorReportTest.php index df8217c67f..b3af821394 100644 --- a/tests/unit/Error/ErrorReportTest.php +++ b/tests/unit/Error/ErrorReportTest.php @@ -54,7 +54,7 @@ class ErrorReportTest extends AbstractTestCase $this->errorReport = new ErrorReport( new HttpRequest(), new Relation($this->dbi), - new Template(), + new Template($config), $config, ); $this->errorReport->setSubmissionUrl('http://localhost'); @@ -133,11 +133,12 @@ class ErrorReportTest extends AbstractTestCase ) ->willReturn($return); + $config = Config::getInstance(); $this->errorReport = new ErrorReport( $httpRequest, new Relation($this->dbi), - new Template(), - Config::getInstance(), + new Template($config), + $config, ); $this->errorReport->setSubmissionUrl($submissionUrl); diff --git a/tests/unit/FooterTest.php b/tests/unit/FooterTest.php index 0d8a093509..b15d61adeb 100644 --- a/tests/unit/FooterTest.php +++ b/tests/unit/FooterTest.php @@ -42,7 +42,7 @@ class FooterTest extends AbstractTestCase $config->selectedServer['DisableIS'] = false; $config->selectedServer['verbose'] = 'verbose host'; $_GET['reload_left_frame'] = '1'; - $this->object = new Footer(new Template(), $config); + $this->object = new Footer(new Template($config), $config); Current::$sqlQuery = ''; $_POST = []; } @@ -100,7 +100,8 @@ class FooterTest extends AbstractTestCase */ public function testGetScripts(): void { - $footer = new Footer(new Template(), Config::getInstance()); + $config = Config::getInstance(); + $footer = new Footer(new Template($config), $config); self::assertStringContainsString( '