From faf4f7c8baf053d4376e85f1e60a84dae74493e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:24:35 +0000 Subject: [PATCH 1/6] Bump symfony/process from 5.4.28 to 5.4.46 Bumps [symfony/process](https://github.com/symfony/process) from 5.4.28 to 5.4.46. - [Release notes](https://github.com/symfony/process/releases) - [Changelog](https://github.com/symfony/process/blob/7.1/CHANGELOG.md) - [Commits](https://github.com/symfony/process/compare/v5.4.28...v5.4.46) --- updated-dependencies: - dependency-name: symfony/process dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/composer.lock b/composer.lock index e73ef51..69628c9 100644 --- a/composer.lock +++ b/composer.lock @@ -2010,26 +2010,23 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2073,7 +2070,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2089,20 +2086,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v5.4.28", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" + "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "url": "https://api.github.com/repos/symfony/process/zipball/01906871cb9b5e3cf872863b91aba4ec9767daf4", + "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4", "shasum": "" }, "require": { @@ -2135,7 +2132,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.28" + "source": "https://github.com/symfony/process/tree/v5.4.46" }, "funding": [ { @@ -2151,7 +2148,7 @@ "type": "tidelift" } ], - "time": "2023-08-07T10:36:04+00:00" + "time": "2024-11-06T09:18:28+00:00" }, { "name": "symfony/service-contracts", @@ -2308,5 +2305,5 @@ "php": ">=7.1.3" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 055709a8cd1f150753babcd93feb3fed4b8d13e8 Mon Sep 17 00:00:00 2001 From: Touxten <156076965+Touxten@users.noreply.github.com> Date: Thu, 24 Jul 2025 10:19:55 +0200 Subject: [PATCH 2/6] Fix link since migration page --- classes/Form/ConfigurationForm.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php index 8622261..d16c97b 100644 --- a/classes/Form/ConfigurationForm.php +++ b/classes/Form/ConfigurationForm.php @@ -53,7 +53,7 @@ public function generate() $helper->module = $this->module; $helper->name_controller = $this->module->name; $helper->token = Tools::getAdminTokenLite('AdminModules'); - $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->module->name; + $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name; // Language $helper->default_form_language = $default_lang; @@ -67,11 +67,10 @@ public function generate() $helper->toolbar_btn = [ 'save' => [ 'desc' => $this->module->getTranslator()->trans('Save', [], 'Modules.Googleanalytics.Admin'), - 'href' => AdminController::$currentIndex . '&configure=' . $this->module->name . '&save=' . $this->module->name . - '&token=' . $helper->token, + 'href' => Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name . '&save=' . $this->module->name, ], 'back' => [ - 'href' => AdminController::$currentIndex . '&token=' . $helper->token, + 'href' => Context::getContext()->link->getAdminLink('AdminModules', true), 'desc' => $this->module->getTranslator()->trans('Back to list', [], 'Modules.Googleanalytics.Admin'), ], ]; From 768da35e4505eb56610651477e502b49c6e2becb Mon Sep 17 00:00:00 2001 From: Touxten <156076965+Touxten@users.noreply.github.com> Date: Fri, 25 Jul 2025 10:10:55 +0200 Subject: [PATCH 3/6] Update ConfigurationForm.php --- classes/Form/ConfigurationForm.php | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php index d16c97b..7a23ed7 100644 --- a/classes/Form/ConfigurationForm.php +++ b/classes/Form/ConfigurationForm.php @@ -20,7 +20,6 @@ namespace PrestaShop\Module\Ps_Googleanalytics\Form; -use AdminController; use Configuration; use Context; use HelperForm; From fde0accb6c9d79fb5967be4d76a6f19b98864f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Hlav=C3=A1=C4=8Dek?= Date: Wed, 29 Oct 2025 16:47:47 +0100 Subject: [PATCH 4/6] Update ConfigurationForm.php --- classes/Form/ConfigurationForm.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php index 7a23ed7..2c50f5d 100644 --- a/classes/Form/ConfigurationForm.php +++ b/classes/Form/ConfigurationForm.php @@ -52,7 +52,11 @@ public function generate() $helper->module = $this->module; $helper->name_controller = $this->module->name; $helper->token = Tools::getAdminTokenLite('AdminModules'); - $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name; + $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true, [], [ + 'configure' => $this->module->name, + 'tab_module' => $this->module->tab, + 'module_name' => $this->module->name, + ]); // Language $helper->default_form_language = $default_lang; @@ -60,13 +64,18 @@ public function generate() // Title and toolbar $helper->title = $this->module->displayName; - $helper->show_toolbar = true; // false -> remove toolbar - $helper->toolbar_scroll = true; // yes - > Toolbar is always visible on the top of the screen. + $helper->show_toolbar = true; // false -> remove toolbar + $helper->toolbar_scroll = true; // yes - > Toolbar is always visible on the top of the screen. $helper->submit_action = 'submit' . $this->module->name; $helper->toolbar_btn = [ 'save' => [ 'desc' => $this->module->getTranslator()->trans('Save', [], 'Modules.Googleanalytics.Admin'), - 'href' => Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name . '&save=' . $this->module->name, + 'href' => Context::getContext()->link->getAdminLink('AdminModules', true, [], [ + 'configure' => $this->module->name, + 'tab_module' => $this->module->tab, + 'module_name' => $this->module->name, + 'save' => $this->module->name, + ]), ], 'back' => [ 'href' => Context::getContext()->link->getAdminLink('AdminModules', true), From c92648c1cc072a521a37760462fd4b8d21216eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Hlav=C3=A1=C4=8Dek?= Date: Fri, 31 Oct 2025 15:04:18 +0100 Subject: [PATCH 5/6] Update ps_googleanalytics.php --- ps_googleanalytics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ps_googleanalytics.php b/ps_googleanalytics.php index 3325f7b..f2a48eb 100644 --- a/ps_googleanalytics.php +++ b/ps_googleanalytics.php @@ -47,7 +47,7 @@ public function __construct() { $this->name = 'ps_googleanalytics'; $this->tab = 'analytics_stats'; - $this->version = '5.0.2'; + $this->version = '5.0.3'; $this->ps_versions_compliancy = ['min' => '1.7.7', 'max' => _PS_VERSION_]; $this->author = 'PrestaShop'; $this->module_key = 'fd2aaefea84ac1bb512e6f1878d990b8'; From f50b64a0bb734a9848374c9f8638533270e67385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Hlav=C3=A1=C4=8Dek?= Date: Fri, 31 Oct 2025 15:05:18 +0100 Subject: [PATCH 6/6] Update version number to 5.0.3 --- config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.xml b/config.xml index 7d11231..8976d9a 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_googleanalytics - +