diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 53405c48fe6a9..9af849a4676d9 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@ https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull
| Questions | Answers
| ----------------- | -------------------------------------------------------
-| Branch? | develop / 8.2.x
+| Branch? | develop / 9.0.x / 8.2.x
| Description? | Please be specific when describing the PR.
Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
| Type? | bug fix / improvement / new feature / refacto
| Category? | FO / BO / CO / IN / WS / TE / LO / ME / PM / see explanations at https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#type--category
diff --git a/.github/workflows/cron_js_routing.yml b/.github/workflows/cron_js_routing.yml
index 5d970fa62a38f..ac835cc1f17a8 100644
--- a/.github/workflows/cron_js_routing.yml
+++ b/.github/workflows/cron_js_routing.yml
@@ -18,14 +18,16 @@ jobs:
matrix:
BRANCH:
- develop
+ - 9.0.x
+ - 8.2.x
- 8.1.x
- 8.0.x
include:
- BRANCH: develop
- node: 16
- - BRANCH: 8.1.x
- node: 16
- - BRANCH: 8.0.x
+ node: 20
+ - BRANCH: 9.0.x
+ node: 20
+ - BRANCH: 8.2.x
node: 16
env:
diff --git a/.github/workflows/cron_nightly_build.yml b/.github/workflows/cron_nightly_build.yml
index 44e66eaf29114..bb8449a9010f4 100644
--- a/.github/workflows/cron_nightly_build.yml
+++ b/.github/workflows/cron_nightly_build.yml
@@ -20,13 +20,16 @@ jobs:
matrix:
BRANCH:
- develop
+ - 9.0.x
- 8.2.x
- 8.1.x
- 8.0.x
- 1.7.8.x
include:
- BRANCH: develop
- node: 16
+ node: 20
+ - BRANCH: 9.0.x
+ node: 20
- BRANCH: 8.2.x
node: 16
- BRANCH: 8.1.x
diff --git a/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml b/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml
new file mode 100644
index 0000000000000..f4577936e8d5a
--- /dev/null
+++ b/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml
@@ -0,0 +1,21 @@
+# This workflow aim to run all UI tests on active branches
+# and upload the report on Google cloud platform storage
+name: Nightly tests and report - 9.0.x
+
+on:
+ workflow_run:
+ workflows: [ 'Nightly Build' ]
+ types:
+ - requested
+
+jobs:
+ test_9_0_x:
+ uses: ./.github/workflows/cron_nightly_tests_reusable.yml
+ with:
+ BRANCH: 9.0.x
+ PHP_VERSION: '8.1'
+ NODE_VERSION: '20'
+ DB_SERVER: 'mariadb'
+ secrets:
+ GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
+ GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
diff --git a/.github/workflows/cron_nightly_tests_9.0.x_mysql.yml b/.github/workflows/cron_nightly_tests_9.0.x_mysql.yml
new file mode 100644
index 0000000000000..ea1a63d3480a8
--- /dev/null
+++ b/.github/workflows/cron_nightly_tests_9.0.x_mysql.yml
@@ -0,0 +1,21 @@
+# This workflow aim to run all UI tests on active branches
+# and upload the report on Google cloud platform storage
+name: Nightly tests and report - 9.0.x
+
+on:
+ workflow_run:
+ workflows: [ 'Nightly Build' ]
+ types:
+ - requested
+
+jobs:
+ test_9_0_x:
+ uses: ./.github/workflows/cron_nightly_tests_reusable.yml
+ with:
+ BRANCH: 9.0.x
+ PHP_VERSION: '8.1'
+ NODE_VERSION: '20'
+ DB_SERVER: 'mysql'
+ secrets:
+ GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
+ GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
diff --git a/.github/workflows/cron_nightly_tests_reports.yml b/.github/workflows/cron_nightly_tests_reports.yml
index 096bf6f61ff81..3a2231839d6d2 100644
--- a/.github/workflows/cron_nightly_tests_reports.yml
+++ b/.github/workflows/cron_nightly_tests_reports.yml
@@ -26,6 +26,10 @@ jobs:
database: mysql
- branch: 8.2.x
database: mysql
+ - branch: 9.0.x
+ database: mysql
+ - branch: 9.0.x
+ database: mariadb
- branch: develop
database: mysql
- branch: develop
diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index d4a64f2455200..07b7b3f9be4b3 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -176,6 +176,17 @@ jobs:
CAMPAIGN: 'functional:FO:hummingbird:04-07'
- BRANCH: 8.2.x
CAMPAIGN: 'functional:FO:hummingbird:08-12'
+ ## 9.0.x
+ - BRANCH: 9.0.x
+ CAMPAIGN: 'functional:FO:01-03'
+ - BRANCH: 9.0.x
+ CAMPAIGN: 'functional:FO:04-07'
+ - BRANCH: 9.0.x
+ CAMPAIGN: 'functional:FO:08-12'
+ - BRANCH: 9.0.x
+ CAMPAIGN: 'sanity:productV2'
+ - BRANCH: 9.0.x
+ CAMPAIGN: 'functional:productV2'
## develop
- BRANCH: develop
CAMPAIGN: 'functional:FO:01-03'
diff --git a/.github/workflows/cron_php_update_modules.yml b/.github/workflows/cron_php_update_modules.yml
index bdb17fadefb19..c94696969b77d 100644
--- a/.github/workflows/cron_php_update_modules.yml
+++ b/.github/workflows/cron_php_update_modules.yml
@@ -19,6 +19,7 @@ jobs:
matrix:
BRANCH:
- develop
+ - 9.0.x
- 8.2.x
env:
GH_BRANCH: ${{ matrix.BRANCH }}
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 8110dda73e435..016428325be63 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -86,6 +86,10 @@ jobs:
- name: Run Tests
uses: ./.github/actions/ui-test
+ env:
+ ## Improve Webkit stability
+ ## Link : https://github.com/microsoft/playwright/issues/23899
+ GDK_BACKEND: x11
with:
TEST_CAMPAIGN: ${{ env.TEST_CAMPAIGN }}
BROWSER: ${{ matrix.browser }}
diff --git a/classes/Image.php b/classes/Image.php
index f0e726be9448e..8286358c0daaf 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -24,7 +24,6 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-use PrestaShop\PrestaShop\Adapter\ServiceLocator;
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
@@ -632,13 +631,8 @@ public function deleteImage($forceDelete = false)
// Delete auto-generated images
$image_types = ImageType::getImagesTypes();
-
- // Get image formats we will be deleting. It would probably be easier to use ImageFormatConfiguration::SUPPORTED_FORMATS,
- // but we want to avoid any behavior change in minor/patch version.
- $configuredImageFormats = ServiceLocator::get(ImageFormatConfiguration::class)->getGenerationFormats();
-
foreach ($image_types as $imageType) {
- foreach ($configuredImageFormats as $imageFormat) {
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
$filesToDelete = $this->deleteAutoGeneratedImage($imageType, $imageFormat, $filesToDelete);
}
}
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index dbe6ede12e727..9481fecccf999 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1854,18 +1854,14 @@ public function deleteImage($force_delete = false)
return false;
}
- // Get image formats we will be deleting. It would probably be easier to use ImageFormatConfiguration::SUPPORTED_FORMATS,
- // but we want to avoid any behavior change in minor/patch version.
- $configuredImageFormats = ServiceLocator::get(ImageFormatConfiguration::class)->getGenerationFormats();
$types = ImageType::getImagesTypes();
-
foreach ($types as $image_type) {
if (file_exists($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)
&& !unlink($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)) {
return false;
}
- foreach ($configuredImageFormats as $imageFormat) {
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
$file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $imageFormat;
if (file_exists($file)) {
unlink($file);
diff --git a/classes/Tools.php b/classes/Tools.php
index 05a86c645903e..7ae4a97f85849 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2282,7 +2282,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
if ($rewrite_settings) {
// Compatibility with the old image filesystem
- fwrite($write_fd, "# Images\n");
+ fwrite($write_fd, "# Rewrites for product images (support up to < 10 million images)\n");
// Rewrite product images < 10 millions
$path_components = [];
@@ -2293,12 +2293,14 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, 'RewriteRule ^(' . str_repeat('([\d])', $i) . '(?:\-[\w-]*)?)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/p/' . $path . '/$1$' . ($i + 2) . " [L]\n");
}
+
+ fwrite($write_fd, "# Rewrites for category images\n");
fwrite($write_fd, $media_domains);
fwrite($write_fd, $domain_rewrite_cond);
- fwrite($write_fd, 'RewriteRule ^c/([\d]+)(\-[\.*\w-]*)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]' . PHP_EOL);
+ fwrite($write_fd, 'RewriteRule ^c/([\d]+)(|_thumb)(\-[\.*\w-]*)/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3$4 [L]' . PHP_EOL);
fwrite($write_fd, $media_domains);
fwrite($write_fd, $domain_rewrite_cond);
- fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z_-]+)(-[\d]+)?/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3 [L]' . PHP_EOL);
+ fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z_-]+)(|_thumb)(-[\d]+)?/.+(\.(?:jpe?g|webp|png|avif))$ %{ENV:REWRITEBASE}img/c/$1$2$3$4 [L]' . PHP_EOL);
}
fwrite($write_fd, "# AlphaImageLoader for IE and fancybox\n");
@@ -2309,7 +2311,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
}
// Redirections to dispatcher
if ($rewrite_settings) {
- fwrite($write_fd, "\n# Dispatcher\n");
+ fwrite($write_fd, "\n# Send all other traffic to dispatcher\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
diff --git a/composer.json b/composer.json
index ce96b1a101e14..2c6707e4f9a6b 100644
--- a/composer.json
+++ b/composer.json
@@ -72,7 +72,7 @@
"prestashop/hummingbird": "dev-develop",
"prestashop/pagesnotfound": "^2",
"prestashop/productcomments": "^7.0",
- "prestashop/ps_apiresources": "dev-update-module",
+ "prestashop/ps_apiresources": "dev-reset-module",
"prestashop/ps_banner": "^2",
"prestashop/ps_bestsellers": "^1.0",
"prestashop/ps_brandlist": "^1.0",
@@ -257,7 +257,7 @@
"repositories": {
"ps_apiresources": {
"type": "vcs",
- "url": "https://github.com/jolelievre/ps_apiresources.git"
+ "url": "https://github.com/jinpresta/ps_apiresources.git"
}
},
"minimum-stability": "dev",
diff --git a/composer.lock b/composer.lock
index 6a9a141737caf..1d0075e11639f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c50df65a803d5e04ca56802fff8b6c92",
+ "content-hash": "51b0d194a4a0a2135a38b85d0f072e34",
"packages": [
{
"name": "api-platform/core",
@@ -4958,16 +4958,16 @@
},
{
"name": "prestashop/blockwishlist",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/blockwishlist.git",
- "reference": "75c39bc12648cba4e09d870479e7857fd06eee79"
+ "reference": "25fe641134ede5703397ae9a180694db18c8383a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/75c39bc12648cba4e09d870479e7857fd06eee79",
- "reference": "75c39bc12648cba4e09d870479e7857fd06eee79",
+ "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/25fe641134ede5703397ae9a180694db18c8383a",
+ "reference": "25fe641134ede5703397ae9a180694db18c8383a",
"shasum": ""
},
"require-dev": {
@@ -4997,9 +4997,9 @@
"description": "PrestaShop module blockwishlist",
"homepage": "https://github.com/PrestaShop/blockwishlist",
"support": {
- "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.1"
+ "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.2"
},
- "time": "2023-08-11T10:08:33+00:00"
+ "time": "2024-10-04T14:40:01+00:00"
},
{
"name": "prestashop/circuit-breaker",
@@ -5676,16 +5676,16 @@
},
{
"name": "prestashop/ps_apiresources",
- "version": "dev-update-module",
+ "version": "dev-reset-module",
"source": {
"type": "git",
- "url": "https://github.com/jolelievre/ps_apiresources.git",
- "reference": "5f9091dfda268c0b5250f4957196ddb05b7acb6f"
+ "url": "https://github.com/jinpresta/ps_apiresources.git",
+ "reference": "aec9dcfcd51f7766885bbe8143174abf1e9be77f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jolelievre/ps_apiresources/zipball/5f9091dfda268c0b5250f4957196ddb05b7acb6f",
- "reference": "5f9091dfda268c0b5250f4957196ddb05b7acb6f",
+ "url": "https://api.github.com/repos/jinpresta/ps_apiresources/zipball/aec9dcfcd51f7766885bbe8143174abf1e9be77f",
+ "reference": "aec9dcfcd51f7766885bbe8143174abf1e9be77f",
"shasum": ""
},
"require": {
@@ -5737,9 +5737,9 @@
"description": "PrestaShop - API Resources",
"homepage": "https://github.com/PrestaShop/ps_apiresources",
"support": {
- "source": "https://github.com/jolelievre/ps_apiresources/tree/update-module"
+ "source": "https://github.com/jinpresta/ps_apiresources/tree/reset-module"
},
- "time": "2024-10-03T12:59:06+00:00"
+ "time": "2024-10-21T16:46:05+00:00"
},
{
"name": "prestashop/ps_banner",
@@ -18161,7 +18161,7 @@
"ext-simplexml": "*",
"ext-zip": "*"
},
- "platform-dev": [],
+ "platform-dev": {},
"platform-overrides": {
"php": "8.1.0"
},
diff --git a/install-dev/controllers/http/database.php b/install-dev/controllers/http/database.php
index aa1e6e8bf369d..bfb54f0c97489 100644
--- a/install-dev/controllers/http/database.php
+++ b/install-dev/controllers/http/database.php
@@ -206,7 +206,7 @@ public function display(): void
$this->database_login = $parameters['parameters']['database_user'];
$this->database_password = $parameters['parameters']['database_password'];
$this->database_engine = $parameters['parameters']['database_engine'];
- $this->database_prefix = substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', mt_rand(1,10))), 0, 5).'_';
+ $this->database_prefix = substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyz', mt_rand(1,10))), 0, 5).'_';
$this->database_clear = true;
$this->use_smtp = false;
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index 0e534648b7c39..35f7165034cbd 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -897,5 +897,8 @@ Country
1
+
+ ;
+
diff --git a/phpstan-disallowed-calls.neon b/phpstan-disallowed-calls.neon
index b98eff356e61f..9046289443a9a 100644
--- a/phpstan-disallowed-calls.neon
+++ b/phpstan-disallowed-calls.neon
@@ -296,6 +296,8 @@ parameters:
- src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderStateController.php
- src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
- src/PrestaShopBundle/Controller/Admin/Improve/Design/MailThemeController.php
+ - src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
+ - src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
disallowedConstants:
-
constant:
diff --git a/src/Adapter/Backup/BackupRemover.php b/src/Adapter/Backup/BackupRemover.php
index c10d0ef150e2a..af9670480bed5 100644
--- a/src/Adapter/Backup/BackupRemover.php
+++ b/src/Adapter/Backup/BackupRemover.php
@@ -40,7 +40,7 @@ final class BackupRemover implements BackupRemoverInterface
/**
* {@inheritdoc}
*/
- public function remove(BackupInterface $backup)
+ public function remove(BackupInterface $backup): bool
{
$legacyBackup = new PrestaShopBackup($backup->getFileName());
diff --git a/src/Adapter/Backup/DatabaseBackupCreator.php b/src/Adapter/Backup/DatabaseBackupCreator.php
index 9572b0e815d5c..029120d4d3450 100644
--- a/src/Adapter/Backup/DatabaseBackupCreator.php
+++ b/src/Adapter/Backup/DatabaseBackupCreator.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Backup;
use PrestaShop\PrestaShop\Adapter\Entity\PrestaShopBackup;
+use PrestaShop\PrestaShop\Core\Backup\BackupInterface;
use PrestaShop\PrestaShop\Core\Backup\Exception\BackupException;
use PrestaShop\PrestaShop\Core\Backup\Exception\DirectoryIsNotWritableException;
use PrestaShop\PrestaShop\Core\Backup\Manager\BackupCreatorInterface;
@@ -41,7 +42,7 @@ final class DatabaseBackupCreator implements BackupCreatorInterface
/**
* {@inheritdoc}
*/
- public function createBackup()
+ public function createBackup(): BackupInterface
{
ini_set('max_execution_time', '0');
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
index be66382156d8b..3fb7b643ed702 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
@@ -35,6 +35,7 @@
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteImageException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
+use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
use Symfony\Component\Filesystem\Exception\IOException;
use Symfony\Component\Filesystem\Filesystem;
@@ -79,7 +80,6 @@ public function handle(DeleteCategoryCoverImageCommand $command)
$this->assertCategoryExists($categoryId, $category);
$this->deleteCoverImage($category);
- $this->deleteThumbnailImage($category);
$this->deleteTemporaryThumbnailImage($category);
$this->deleteImagesForAllTypes($category);
}
@@ -109,24 +109,6 @@ private function deleteCoverImage(Category $category)
}
}
- /**
- * @param Category $category
- *
- * @throws CannotDeleteImageException
- */
- private function deleteThumbnailImage(Category $category)
- {
- $thumbnailPath = $this->configuration->get('_PS_CAT_IMG_DIR_') . $category->id . '_thumb.jpg';
-
- try {
- if ($this->filesystem->exists($thumbnailPath)) {
- $this->filesystem->remove($thumbnailPath);
- }
- } catch (IOException $e) {
- throw new CannotDeleteImageException(sprintf('Cannot delete thumbnail image for category with id "%s"', $category->id), CannotDeleteImageException::THUMBNAIL_IMAGE, $e);
- }
- }
-
/**
* @param Category $category
*
@@ -153,17 +135,15 @@ private function deleteTemporaryThumbnailImage(Category $category)
private function deleteImagesForAllTypes(Category $category)
{
$imageTypes = ImageType::getImagesTypes('categories');
- $imageTypeFormattedName = ImageType::getFormattedName('small');
$categoryImageDir = $this->configuration->get('_PS_CAT_IMG_DIR_');
try {
foreach ($imageTypes as $imageType) {
- $imagePath = $categoryImageDir . $category->id . '-' . $imageType['name'] . '.jpg';
-
- if ($imageTypeFormattedName === $imageType['name']
- && $this->filesystem->exists($imagePath)
- ) {
- $this->filesystem->remove($imagePath);
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
+ $imagePath = $categoryImageDir . $category->id . '-' . $imageType['name'] . '.' . $imageFormat;
+ if ($this->filesystem->exists($imagePath)) {
+ $this->filesystem->remove($imagePath);
+ }
}
}
} catch (IOException $e) {
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryThumbnailImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryThumbnailImageHandler.php
new file mode 100644
index 0000000000000..4705f4caefd30
--- /dev/null
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryThumbnailImageHandler.php
@@ -0,0 +1,167 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
+
+use Category;
+use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\ConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryThumbnailImageCommand;
+use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryThumbnailImageHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteImageException;
+use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
+use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * Handles category thumbnail image deleting command.
+ *
+ * @internal
+ */
+#[AsCommandHandler]
+final class DeleteCategoryThumbnailImageHandler implements DeleteCategoryThumbnailImageHandlerInterface
+{
+ /**
+ * @var Filesystem
+ */
+ private $filesystem;
+
+ /**
+ * @var ConfigurationInterface
+ */
+ private $configuration;
+
+ /**
+ * @param Filesystem $filesystem
+ * @param ConfigurationInterface $configuration
+ */
+ public function __construct(
+ Filesystem $filesystem,
+ ConfigurationInterface $configuration
+ ) {
+ $this->filesystem = $filesystem;
+ $this->configuration = $configuration;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(DeleteCategoryThumbnailImageCommand $command)
+ {
+ $categoryId = $command->getCategoryId();
+ $category = new Category($categoryId->getValue());
+
+ $this->assertCategoryExists($categoryId, $category);
+
+ $this->deleteThumbnailImage($category);
+ $this->deleteTemporaryThumbnailImage($category);
+ $this->deleteImagesForAllTypes($category);
+ }
+
+ /**
+ * @param CategoryId $categoryId
+ * @param Category $category
+ *
+ * @throws CategoryNotFoundException
+ */
+ private function assertCategoryExists(CategoryId $categoryId, Category $category)
+ {
+ if ($category->id !== $categoryId->getValue()) {
+ throw new CategoryNotFoundException($categoryId, sprintf('Category with id "%s" was not found.', $categoryId->getValue()));
+ }
+ }
+
+ /**
+ * @param Category $category
+ *
+ * @throws CannotDeleteImageException
+ */
+ private function deleteThumbnailImage(Category $category)
+ {
+ $thumbnailPath = $this->configuration->get('_PS_CAT_IMG_DIR_') . $category->id . '_thumb.jpg';
+
+ try {
+ if ($this->filesystem->exists($thumbnailPath)) {
+ $this->filesystem->remove($thumbnailPath);
+ }
+ } catch (IOException $e) {
+ throw new CannotDeleteImageException(sprintf('Cannot delete thumbnail image for category with id "%s"', $category->id), CannotDeleteImageException::THUMBNAIL_IMAGE, $e);
+ }
+ }
+
+ /**
+ * @param Category $category
+ *
+ * @throws CannotDeleteImageException
+ */
+ private function deleteTemporaryThumbnailImage(Category $category)
+ {
+ $temporaryThumbnailPath = $this->configuration->get('_PS_TMP_IMG_DIR_') . 'category_' . $category->id . '-thumb.jpg';
+
+ try {
+ if ($this->filesystem->exists($temporaryThumbnailPath)) {
+ $this->filesystem->remove($temporaryThumbnailPath);
+ }
+ } catch (IOException $e) {
+ throw new CannotDeleteImageException(sprintf('Cannot delete thumbnail image for category with id "%s"', $category->id), CannotDeleteImageException::THUMBNAIL_IMAGE, $e);
+ }
+ }
+
+ /**
+ * @param Category $category
+ *
+ * @throws CannotDeleteImageException
+ */
+ private function deleteImagesForAllTypes(Category $category)
+ {
+ $imageTypes = ImageType::getImagesTypes('categories');
+ $categoryImageDir = $this->configuration->get('_PS_CAT_IMG_DIR_');
+
+ try {
+ foreach ($imageTypes as $imageType) {
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
+ $imagePath = $categoryImageDir . $category->id . '_thumb-' . $imageType['name'] . '.' . $imageFormat;
+ if ($this->filesystem->exists($imagePath)) {
+ $this->filesystem->remove($imagePath);
+ }
+ }
+ }
+ } catch (IOException $e) {
+ throw new CannotDeleteImageException(
+ sprintf(
+ 'Cannot delete image with type "%s" for category with id "%s"',
+ isset($imageType) ? $imageType['name'] : '',
+ $category->id
+ ),
+ CannotDeleteImageException::COVER_IMAGE,
+ $e
+ );
+ }
+ }
+}
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
index 56d6e2e04c9cc..e4d517da8336e 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
@@ -29,7 +29,6 @@
use Category;
use Db;
use ImageManager;
-use ImageType;
use PDO;
use PrestaShop\PrestaShop\Adapter\SEO\RedirectTargetProvider;
use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
@@ -153,55 +152,27 @@ private function getCoverImage(CategoryId $categoryId)
*/
private function getThumbnailImage(CategoryId $categoryId)
{
- $image = _PS_CAT_IMG_DIR_ . $categoryId->getValue() . '.jpg';
- $imageTypes = ImageType::getImagesTypes('categories');
-
- if (count($imageTypes) > 0) {
- $thumb = '';
- $imageTag = '';
- $formattedSmall = ImageType::getFormattedName('small');
- $imageType = new ImageType();
- foreach ($imageTypes as $k => $imageType) {
- if ($formattedSmall == $imageType['name']) {
- $thumb = _PS_CAT_IMG_DIR_ . $categoryId->getValue() . '-' . $imageType['name'] . '.jpg';
- if (is_file($thumb)) {
- $imageTag = ImageManager::thumbnail(
- $thumb,
- 'category_' . (int) $categoryId->getValue() . '-thumb.jpg',
- (int) $imageType['width'],
- 'jpg',
- true,
- true
- );
- }
- }
- }
-
- if (!is_file($thumb)) {
- $thumb = $image;
- $imageName = 'category_' . $categoryId->getValue() . '-thumb.jpg';
-
- $imageTag = ImageManager::thumbnail($image, $imageName, 125, 'jpg', true, true);
- ImageManager::resize(
- _PS_TMP_IMG_DIR_ . $imageName,
- _PS_TMP_IMG_DIR_ . $imageName,
- (int) $imageType['width'],
- (int) $imageType['height']
- );
- }
-
- $thumbSize = file_exists($thumb) ? filesize($thumb) / 1000 : false;
-
- if (empty($imageTag) || false === $thumbSize) {
- return null;
- }
-
- return [
- 'size' => sprintf('%skB', $thumbSize),
- 'path' => $this->imageTagSourceParser->parse($imageTag),
- ];
+ $imageType = 'jpg';
+ $image = _PS_CAT_IMG_DIR_ . $categoryId->getValue() . '_thumb.' . $imageType;
+
+ $imageTag = ImageManager::thumbnail(
+ $image,
+ 'category_' . $categoryId->getValue() . '_thumb.' . $imageType,
+ 350,
+ $imageType,
+ true,
+ true
+ );
+
+ $imageSize = file_exists($image) ? filesize($image) / 1000 : '';
+
+ if (empty($imageTag) || empty($imageSize)) {
+ return null;
}
- return null;
+ return [
+ 'size' => sprintf('%skB', $imageSize),
+ 'path' => $this->imageTagSourceParser->parse($imageTag),
+ ];
}
}
diff --git a/src/Adapter/Debug/DebugModeConfiguration.php b/src/Adapter/Debug/DebugModeConfiguration.php
index af3f9b89c4b54..898a59118e2a5 100644
--- a/src/Adapter/Debug/DebugModeConfiguration.php
+++ b/src/Adapter/Debug/DebugModeConfiguration.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Adapter\Cache\Clearer\ClassIndexCacheClearer;
use PrestaShop\PrestaShop\Adapter\Configuration;
+use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
use PrestaShop\PrestaShop\Core\Configuration\DataConfigurationInterface;
/**
@@ -36,49 +37,21 @@
class DebugModeConfiguration implements DataConfigurationInterface
{
/**
- * @var Configuration
- */
- private $configuration;
-
- /**
- * @var DebugMode Debug mode manager
- */
- private $debugMode;
-
- /**
- * @var string Path to the application defines path
- */
- private $configDefinesPath;
-
- /**
- * @var ClassIndexCacheClearer
- */
- private $classIndexCacheClearer;
-
- /**
- * @var DebugProfiling Debug profiling manager
- */
- private $debugProfiling;
-
- /**
- * @param DebugMode $debugMode
+ * @param DebugMode $debugMode Debug mode manager
* @param Configuration $configuration
- * @param string $configDefinesPath
+ * @param string $configDefinesPath Path to the application defines path
* @param ClassIndexCacheClearer $classIndexCacheClearer
- * @param DebugProfiling $debugProfiling
+ * @param DebugProfiling $debugProfiling Debug profiling manager
+ * @param CacheClearerInterface $cacheClearer
*/
public function __construct(
- DebugMode $debugMode,
- Configuration $configuration,
- $configDefinesPath,
- ClassIndexCacheClearer $classIndexCacheClearer,
- DebugProfiling $debugProfiling
+ private DebugMode $debugMode,
+ private Configuration $configuration,
+ private string $configDefinesPath,
+ private ClassIndexCacheClearer $classIndexCacheClearer,
+ private DebugProfiling $debugProfiling,
+ private CacheClearerInterface $cacheClearer,
) {
- $this->debugMode = $debugMode;
- $this->configuration = $configuration;
- $this->configDefinesPath = $configDefinesPath;
- $this->classIndexCacheClearer = $classIndexCacheClearer;
- $this->debugProfiling = $debugProfiling;
}
/**
@@ -212,7 +185,10 @@ private function updateDebugMode(array $configuration): ?int
$newDebugMode = $this->debugMode->createDebugModeFromConfiguration($configuration);
if ($newDebugMode !== $currentDebugMode) {
- return $this->debugMode->changePsModeDevValue($newDebugMode);
+ $updated = $this->debugMode->changePsModeDevValue($newDebugMode);
+ $this->cacheClearer->clear();
+
+ return $updated;
}
return null;
diff --git a/src/Adapter/Email/EmailLogEraser.php b/src/Adapter/Email/EmailLogEraser.php
index 792dcf62a06d4..62162baee53a3 100644
--- a/src/Adapter/Email/EmailLogEraser.php
+++ b/src/Adapter/Email/EmailLogEraser.php
@@ -40,7 +40,7 @@ final class EmailLogEraser implements EmailLogEraserInterface
/**
* {@inheritdoc}
*/
- public function erase(array $mailLogIds)
+ public function erase(array $mailLogIds): array
{
$errors = [];
@@ -78,7 +78,7 @@ public function erase(array $mailLogIds)
/**
* {@inheritdoc}
*/
- public function eraseAll()
+ public function eraseAll(): bool
{
return Mail::eraseAllLogs();
}
diff --git a/src/Adapter/Employee/EmployeeFormAccessChecker.php b/src/Adapter/Employee/EmployeeFormAccessChecker.php
index 9b24cbed46a43..fd6fc33bf4133 100644
--- a/src/Adapter/Employee/EmployeeFormAccessChecker.php
+++ b/src/Adapter/Employee/EmployeeFormAccessChecker.php
@@ -61,7 +61,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
- public function isRestrictedAccess($employeeId)
+ public function isRestrictedAccess(int $employeeId): bool
{
if (!is_int($employeeId)) {
throw new InvalidArgumentException(sprintf('Employee ID must be an integer, %s given', gettype($employeeId)));
@@ -73,7 +73,7 @@ public function isRestrictedAccess($employeeId)
/**
* {@inheritdoc}
*/
- public function canAccessEditFormFor($employeeId)
+ public function canAccessEditFormFor(int $employeeId): bool
{
// To access super admin edit form you must be a super admin.
if ($this->employeeDataProvider->isSuperAdmin($employeeId)) {
diff --git a/src/Adapter/Employee/FormLanguageChanger.php b/src/Adapter/Employee/FormLanguageChanger.php
index 11bf4c32f4873..0c703b2ba5dc7 100644
--- a/src/Adapter/Employee/FormLanguageChanger.php
+++ b/src/Adapter/Employee/FormLanguageChanger.php
@@ -54,7 +54,7 @@ public function __construct(LegacyContext $legacyContext)
/**
* {@inheritdoc}
*/
- public function changeLanguageInCookies($languageIsoCode)
+ public function changeLanguageInCookies(string $languageIsoCode): void
{
$this->legacyContext->getContext()->cookie->employee_form_lang = (int) Language::getIdByIso($languageIsoCode);
$this->legacyContext->getContext()->cookie->write();
diff --git a/src/Adapter/Employee/NavigationMenuToggler.php b/src/Adapter/Employee/NavigationMenuToggler.php
index e39f272292bd2..4a8008bed7025 100644
--- a/src/Adapter/Employee/NavigationMenuToggler.php
+++ b/src/Adapter/Employee/NavigationMenuToggler.php
@@ -50,7 +50,7 @@ public function __construct(LegacyContext $legacyContext)
/**
* {@inheritdoc}
*/
- public function toggleNavigationMenuInCookies($shouldCollapse)
+ public function toggleNavigationMenuInCookies(bool $shouldCollapse): void
{
$this->legacyContext->getContext()->cookie->collapse_menu = (int) $shouldCollapse;
$this->legacyContext->getContext()->cookie->write();
diff --git a/src/Adapter/Form/ChoiceProvider/CountryStateByIdChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/CountryStateByIdChoiceProvider.php
index ccc38cbe0a3eb..0dc2c7a876de9 100644
--- a/src/Adapter/Form/ChoiceProvider/CountryStateByIdChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/CountryStateByIdChoiceProvider.php
@@ -29,6 +29,7 @@
use Country;
use PrestaShop\PrestaShop\Core\Exception\CoreException;
use PrestaShop\PrestaShop\Core\Form\ConfigurableFormChoiceProviderInterface;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShopException;
use State;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -56,11 +57,11 @@ public function getChoices(array $options)
return [];
}
- $states = State::getStatesByIdCountry($countryId, $resolvedOptions['only_active'], 'name', 'asc');
-
- foreach ($states as $state) {
- $choices[$state['name']] = $state['id_state'];
- }
+ $choices = FormChoiceFormatter::formatFormChoices(
+ State::getStatesByIdCountry($countryId, $resolvedOptions['only_active'], 'name', 'asc'),
+ 'id_state',
+ 'name'
+ );
} catch (PrestaShopException $e) {
throw new CoreException(sprintf('An error occurred when getting states for country id "%s"', $countryId));
}
diff --git a/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php
index d4a5a5a9e4a41..fee04aeadfc84 100644
--- a/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
use PrestaShop\PrestaShop\Adapter\LegacyContext;
use PrestaShop\PrestaShop\Core\Form\ConfigurableFormChoiceProviderInterface;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
class FeatureValuesChoiceProvider implements ConfigurableFormChoiceProviderInterface
{
@@ -74,15 +75,16 @@ public function getChoices(array $options)
if (isset($options['custom'])) {
$filters['custom'] = $options['custom'];
}
- $cacheKey = md5(serialize($filters));
- if (!empty($this->cacheFeatureValueChoices[$cacheKey])) {
- return $this->cacheFeatureValueChoices[$cacheKey];
- }
- $featureValues = $this->featureValueRepository->getFeatureValuesByLang($this->contextLanguageId, $filters);
- $this->cacheFeatureValueChoices[$cacheKey] = [];
- foreach ($featureValues as $feature) {
- $this->cacheFeatureValueChoices[$cacheKey][$feature['value']] = (int) $feature['id_feature_value'];
+ // Get cache key and if this is the first time we are accessing it,
+ // we build the options
+ $cacheKey = md5(serialize($filters));
+ if (empty($this->cacheFeatureValueChoices[$cacheKey])) {
+ $this->cacheFeatureValueChoices[$cacheKey] = FormChoiceFormatter::formatFormChoices(
+ $this->featureValueRepository->getFeatureValuesByLang($this->contextLanguageId, $filters),
+ 'id_feature_value',
+ 'value'
+ );
}
return $this->cacheFeatureValueChoices[$cacheKey];
diff --git a/src/Adapter/Form/ChoiceProvider/ManufacturerNameByIdChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/ManufacturerNameByIdChoiceProvider.php
index 0c4635386bdfb..f56f676abcbf9 100644
--- a/src/Adapter/Form/ChoiceProvider/ManufacturerNameByIdChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/ManufacturerNameByIdChoiceProvider.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
/**
@@ -50,12 +51,10 @@ public function __construct(array $manufacturers)
*/
public function getChoices()
{
- $choices = [];
-
- foreach ($this->manufacturers as $manufacturer) {
- $choices[$manufacturer['name']] = (int) $manufacturer['id_manufacturer'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ $this->manufacturers,
+ 'id_manufacturer',
+ 'name'
+ );
}
}
diff --git a/src/Adapter/Form/ChoiceProvider/OrderCountriesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/OrderCountriesChoiceProvider.php
index 567b2822b441a..9804f4b4f7fb0 100644
--- a/src/Adapter/Form/ChoiceProvider/OrderCountriesChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/OrderCountriesChoiceProvider.php
@@ -29,6 +29,7 @@
use Context;
use Country;
use Db;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
use Shop;
@@ -46,7 +47,7 @@ public function getChoices()
return [];
}
- $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+ $countries = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT DISTINCT c.id_country, cl.`name`
FROM `' . _DB_PREFIX_ . 'orders` o
' . Shop::addSqlAssociation('orders', 'o') . '
@@ -60,12 +61,10 @@ public function getChoices()
ORDER BY cl.name ASC'
);
- $choices = [];
-
- foreach ($result as $row) {
- $choices[$row['name']] = $row['id_country'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ $countries,
+ 'id_country',
+ 'name'
+ );
}
}
diff --git a/src/Adapter/Form/ChoiceProvider/ProfileByIdChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/ProfileByIdChoiceProvider.php
index cf120c39de254..18e50997a0eae 100644
--- a/src/Adapter/Form/ChoiceProvider/ProfileByIdChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/ProfileByIdChoiceProvider.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
use Profile;
@@ -52,13 +53,11 @@ public function __construct($contextLangId)
*/
public function getChoices()
{
- $profiles = Profile::getProfiles($this->contextLangId);
- $choices = [];
-
- foreach ($profiles as $profile) {
- $choices[$profile['name']] = $profile['id_profile'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ Profile::getProfiles($this->contextLangId),
+ 'id_profile',
+ 'name',
+ false
+ );
}
}
diff --git a/src/Adapter/Form/ChoiceProvider/SupplierNameByIdChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/SupplierNameByIdChoiceProvider.php
index b9168af4f745c..4257b208fd204 100644
--- a/src/Adapter/Form/ChoiceProvider/SupplierNameByIdChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/SupplierNameByIdChoiceProvider.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
use Supplier;
@@ -41,33 +42,10 @@ final class SupplierNameByIdChoiceProvider implements FormChoiceProviderInterfac
*/
public function getChoices()
{
- $choices = [];
- $suppliers = Supplier::getSuppliers(false, 0, false);
- $hasDuplicated = $this->hasDuplicateSuppliers($suppliers);
-
- foreach ($suppliers as $supplier) {
- // Integrate the ID in the name so that suppliers with identical names don't override themselves (only when duplicate are detected)
- $supplierName = $supplier['name'];
- if ($hasDuplicated) {
- $supplierName = sprintf('%d - %s', $supplier['id_supplier'], $supplierName);
- }
- $choices[$supplierName] = (int) $supplier['id_supplier'];
- }
-
- return $choices;
- }
-
- private function hasDuplicateSuppliers(array $suppliers): bool
- {
- $names = [];
- foreach ($suppliers as $supplier) {
- if (in_array($supplier['name'], $names)) {
- return true;
- }
-
- $names[] = $supplier['name'];
- }
-
- return false;
+ return FormChoiceFormatter::formatFormChoices(
+ Supplier::getSuppliers(false, 0, false),
+ 'id_supplier',
+ 'name'
+ );
}
}
diff --git a/src/Adapter/Form/ChoiceProvider/ZoneByIdChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/ZoneByIdChoiceProvider.php
index f986239e5ced2..0e66f122ccbd7 100644
--- a/src/Adapter/Form/ChoiceProvider/ZoneByIdChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/ZoneByIdChoiceProvider.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider;
use PrestaShop\PrestaShop\Core\Form\ConfigurableFormChoiceProviderInterface;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Zone;
@@ -44,14 +45,11 @@ public function getChoices(array $options): array
{
$options = $this->resolveOptions($options);
- $zones = Zone::getZones($options['active'], $options['active_first']);
- $choices = [];
-
- foreach ($zones as $zone) {
- $choices[$zone['name']] = (int) $zone['id_zone'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ Zone::getZones($options['active'], $options['active_first']),
+ 'id_zone',
+ 'name'
+ );
}
private function resolveOptions(array $options): array
diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index 187536666a61e..7ef07c4d67a4e 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -186,14 +186,14 @@ public function getImage($object, $id_image)
$imageFolderPath = rtrim(_PS_CAT_IMG_DIR_, DIRECTORY_SEPARATOR);
}
- $urls = [];
-
// Get path of original uploaded image we will use to get thumbnails (original image extension is always .jpg)
$originalImagePath = implode(DIRECTORY_SEPARATOR, [
$imageFolderPath,
$id_image . '.jpg',
]);
+ $urls = [];
+
/*
* Let's resolve which formats we will use for image generation.
*
diff --git a/src/Adapter/Image/Uploader/CategoryThumbnailImageUploader.php b/src/Adapter/Image/Uploader/CategoryThumbnailImageUploader.php
index 7e152c45655c1..78aee528867c5 100644
--- a/src/Adapter/Image/Uploader/CategoryThumbnailImageUploader.php
+++ b/src/Adapter/Image/Uploader/CategoryThumbnailImageUploader.php
@@ -30,6 +30,7 @@
use ImageType;
use PrestaShop\PrestaShop\Core\Image\Exception\ImageOptimizationException;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\ImageUploadException;
+use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\MemoryLimitException;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\UploadedImageConstraintException;
use PrestaShop\PrestaShop\Core\Image\Uploader\ImageUploaderInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -42,50 +43,92 @@ final class CategoryThumbnailImageUploader extends AbstractImageUploader impleme
/**
* {@inheritdoc}
*
- * @throws UploadedImageConstraintException
- * @throws ImageUploadException
+ * @throws MemoryLimitException
* @throws ImageOptimizationException
+ * @throws ImageUploadException
+ * @throws UploadedImageConstraintException
*/
public function upload($id, UploadedFile $uploadedImage)
{
- $imagesTypes = ImageType::getImagesTypes('categories');
- $formattedName = ImageType::getFormattedName('small');
+ $this->checkImageIsAllowedForUpload($uploadedImage);
+ $this->deleteOldImage($id);
+ $this->uploadImage($id, $uploadedImage);
+ $this->generateDifferentTypes($id);
+ }
- foreach ($imagesTypes as $k => $imagesType) {
- if ($formattedName !== $imagesType['name']) {
- continue;
- }
+ /**
+ * Delete old category image.
+ *
+ * @param int $id
+ */
+ private function deleteOldImage($id)
+ {
+ if (file_exists(_PS_CAT_IMG_DIR_ . $id . '_thumb.jpg')) {
+ unlink(_PS_CAT_IMG_DIR_ . $id . '_thumb.jpg');
+ }
+ }
+
+ /**
+ * @param int $id
+ * @param UploadedFile $image
+ *
+ * @throws ImageOptimizationException
+ * @throws ImageUploadException
+ * @throws MemoryLimitException
+ */
+ private function uploadImage($id, UploadedFile $image)
+ {
+ $temporaryImageName = tempnam(_PS_TMP_IMG_DIR_, 'PS');
+ if (!$temporaryImageName) {
+ throw new ImageUploadException('Failed to create temporary category thumbnail image file');
+ }
+ // move_uploaded_file - also checks that the given file is a file that was uploaded via the POST,
+ // this prevents for example that a local file is moved
+ if (!move_uploaded_file($image->getPathname(), $temporaryImageName)) {
+ throw new ImageUploadException('Failed to upload category thumbnail image');
+ }
- $this->checkImageIsAllowedForUpload($uploadedImage);
+ if (!ImageManager::checkImageMemoryLimit($temporaryImageName)) {
+ throw new MemoryLimitException('Cannot upload category thumbnail image due to memory restrictions');
+ }
- $tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS');
- if (!$tmpName) {
- throw new ImageUploadException('Failed to create temporary category thumbnail image file');
- }
+ $optimizationSucceeded = ImageManager::resize(
+ $temporaryImageName,
+ _PS_IMG_DIR_ . 'c' . DIRECTORY_SEPARATOR . $id . '_thumb.jpg',
+ null,
+ null
+ );
- if (!move_uploaded_file($uploadedImage->getPathname(), $tmpName)) {
- throw new ImageUploadException('Failed to upload category thumbnail image');
- }
+ if (!$optimizationSucceeded) {
+ throw new ImageOptimizationException('Failed to optimize image after uploading');
+ }
- if (!ImageManager::resize(
- $tmpName,
- _PS_CAT_IMG_DIR_ . $id . '-' . stripslashes($imagesType['name']) . '.jpg',
- (int) $imagesType['width'],
- (int) $imagesType['height']
- )) {
- throw new ImageOptimizationException('Failed to optimize category thumbnail image after uploading');
- }
+ unlink($temporaryImageName);
+ }
- if (($imageSize = getimagesize($tmpName)) && is_array($imageSize)) {
- ImageManager::resize(
- $tmpName,
- _PS_CAT_IMG_DIR_ . $id . '_thumb.jpg',
- (int) $imageSize[0],
- (int) $imageSize[1]
- );
- }
+ /**
+ * @param int $id
+ *
+ * @throws ImageUploadException
+ */
+ private function generateDifferentTypes($id)
+ {
+ if (!file_exists(_PS_CAT_IMG_DIR_ . $id . '_thumb.jpg')) {
+ return;
+ }
+
+ $imagesTypes = ImageType::getImagesTypes('categories');
+ foreach ($imagesTypes as $k => $imageType) {
+ $generated = ImageManager::resize(
+ _PS_CAT_IMG_DIR_ . $id . '_thumb.jpg',
+ _PS_CAT_IMG_DIR_ . $id . '_thumb-' . stripslashes($imageType['name']) . '.jpg',
+ (int) $imageType['width'],
+ (int) $imageType['height']
+ );
- unlink($tmpName);
+ if (!$generated) {
+ throw new ImageUploadException('Error occurred when uploading category thumbnail image');
+ }
}
}
}
diff --git a/src/Adapter/ImageThumbnailsRegenerator.php b/src/Adapter/ImageThumbnailsRegenerator.php
index 85dc21e4e8ddf..0836310e9ba4c 100644
--- a/src/Adapter/ImageThumbnailsRegenerator.php
+++ b/src/Adapter/ImageThumbnailsRegenerator.php
@@ -28,7 +28,6 @@
use Db;
use ImageManager as LegacyImageManager;
-use ImageType as LegacyImageType;
use Module as LegacyModule;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
@@ -73,34 +72,40 @@ public function deletePreviousImages(string $dir, array $types, bool $isProduct
if (!is_dir($dir)) {
return false;
}
- $toDel = scandir($dir, SCANDIR_SORT_NONE);
- foreach ($toDel as $d) {
- foreach ($types as $imageType) {
- if (preg_match('/^[0-9]+\-' . ($isProduct ? '[0-9]+\-' : '') . $imageType->getName() . '(|2x)\.(jpg|png|webp|avif)$/', $d)
- || (count($types) > 1 && preg_match('/^[0-9]+\-[_a-zA-Z0-9-]*\.(jpg|png|webp|avif)$/', $d))
- || preg_match('/^([[:lower:]]{2})\-default\-' . $imageType->getName() . '(|2x)\.(jpg|png|webp|avif)$/', $d)) {
- if (file_exists($dir . $d)) {
- unlink($dir . $d);
- }
- }
+ // Prepare regular expression to use when deleting thumbnails
+ $regexTypes = [];
+ foreach ($types as $type) {
+ $regexTypes[] = $type->getName();
+ }
+ $regexStandard = '/^[0-9]+(|_thumb)\-(' . implode('|', $regexTypes) . ')(|2x)\.(' . implode('|', ImageFormatConfiguration::SUPPORTED_FORMATS) . ')$/';
+ $regexPlaceholders = '/^([[:lower:]]{2})\-default\-(' . implode('|', $regexTypes) . ')(|2x)\.(' . implode('|', ImageFormatConfiguration::SUPPORTED_FORMATS) . ')$/';
+ $regexProducts = '/^[0-9]+\-(' . implode('|', $regexTypes) . ')(|2x)\.(' . implode('|', ImageFormatConfiguration::SUPPORTED_FORMATS) . ')$/';
+
+ /*
+ * Scan all files in the given folder.
+ * We do this also in case of products, because it will take care of placeholder thumbnails, hence the second regex.
+ */
+ $filesToDelete = scandir($dir, SCANDIR_SORT_NONE);
+ foreach ($filesToDelete as $file) {
+ if ((preg_match($regexStandard, $file) || preg_match($regexPlaceholders, $file)) && file_exists($dir . $file)) {
+ unlink($dir . $file);
}
}
- // Delete product images using new filesystem.
+ // Delete product images
if ($isProduct) {
+ // Get all product images in the shop
$productsImages = $this->productImageRepository->getAllImages();
foreach ($productsImages as $image) {
- if (file_exists($dir . $image->getImgFolder())) {
- $toDel = scandir($dir . $image->getImgFolder(), SCANDIR_SORT_NONE);
- foreach ($toDel as $d) {
- foreach ($types as $imageType) {
- if (preg_match('/^[0-9]+\-' . $imageType->getName() . '(|2x)\.(jpg|png|webp|avif)$/', $d)
- || (count($types) > 1 && preg_match('/^[0-9]+\-[_a-zA-Z0-9-]*\.(jpg|png|webp|avif)$/', $d))) {
- if (file_exists($dir . $image->getImgFolder() . $d)) {
- unlink($dir . $image->getImgFolder() . $d);
- }
- }
+ // Get path to current image folder, example: /img/p/1/2/3
+ $pathToImageFolder = $dir . $image->getImgFolder();
+ if (file_exists($pathToImageFolder)) {
+ // Scan all files in the given folder
+ $filesToDelete = scandir($pathToImageFolder, SCANDIR_SORT_NONE);
+ foreach ($filesToDelete as $d) {
+ if (preg_match($regexProducts, $d) && file_exists($pathToImageFolder . $d)) {
+ unlink($pathToImageFolder . $d);
}
}
}
@@ -135,9 +140,12 @@ public function regenerateNewImages(string $dir, array $type, bool $productsImag
$configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
if (!$productsImages) {
- $formated_medium = LegacyImageType::getFormattedName('medium');
- foreach (scandir($dir, SCANDIR_SORT_NONE) as $image) {
- if (preg_match('/^[0-9]*\.jpg$/', $image)) {
+ foreach (scandir($dir, SCANDIR_SORT_NONE) as $originalImageName) {
+ /*
+ * Let's find all original image files in this folder.
+ * They are either ID.jpg or ID_thumb.jpg in case of category thumbnails
+ */
+ if (preg_match('/^[0-9]*(|_thumb)\.jpg$/', $originalImageName)) {
foreach ($type as $k => $imageType) {
// Customizable writing dir
$newDir = $dir;
@@ -145,25 +153,22 @@ public function regenerateNewImages(string $dir, array $type, bool $productsImag
continue;
}
- if (($dir == _PS_CAT_IMG_DIR_) && ($imageType->getName() == $formated_medium) && is_file(_PS_CAT_IMG_DIR_ . str_replace('.', '_thumb.', $image))) {
- $image = str_replace('.', '_thumb.', $image);
- }
-
foreach ($configuredImageFormats as $imageFormat) {
+ $thumbnailName = substr($originalImageName, 0, -4) . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat;
// If thumbnail does not exist
- if (!file_exists($newDir . substr($image, 0, -4) . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat)) {
+ if (!file_exists($newDir . $thumbnailName)) {
// Check if original image exists
- if (!file_exists($dir . $image) || !filesize($dir . $image)) {
- $errors[] = $this->translator->trans('Source file does not exist or is empty (%filepath%)', ['%filepath%' => $dir . $image], 'Admin.Design.Notification');
+ if (!file_exists($dir . $originalImageName) || !filesize($dir . $originalImageName)) {
+ $errors[] = $this->translator->trans('Source file does not exist or is empty (%filepath%)', ['%filepath%' => $dir . $originalImageName], 'Admin.Design.Notification');
} else {
if (!LegacyImageManager::resize(
- $dir . $image,
- $newDir . substr(str_replace('_thumb.', '.', $image), 0, -4) . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat,
+ $dir . $originalImageName,
+ $newDir . $thumbnailName,
(int) $imageType->getWidth(),
(int) $imageType->getHeight(),
$imageFormat
)) {
- $errors[] = $this->translator->trans('Failed to resize image file (%filepath%)', ['%filepath%' => $dir . $image], 'Admin.Design.Notification');
+ $errors[] = $this->translator->trans('Failed to resize image file (%filepath%)', ['%filepath%' => $dir . $originalImageName], 'Admin.Design.Notification');
}
}
}
@@ -178,14 +183,16 @@ public function regenerateNewImages(string $dir, array $type, bool $productsImag
}
} else {
foreach ($this->productImageRepository->getAllImages() as $imageObj) {
- $existing_img = $dir . $imageObj->getExistingImgPath() . '.jpg';
- if (file_exists($existing_img) && filesize($existing_img)) {
+ $originalImageName = $dir . $imageObj->getExistingImgPath() . '.jpg';
+ if (file_exists($originalImageName) && filesize($originalImageName)) {
foreach ($type as $imageType) {
foreach ($configuredImageFormats as $imageFormat) {
- if (!file_exists($dir . $imageObj->getExistingImgPath() . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat)) {
+ $thumbnailName = $imageObj->getExistingImgPath() . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat;
+
+ if (!file_exists($dir . $thumbnailName)) {
if (!LegacyImageManager::resize(
- $existing_img,
- $dir . $imageObj->getExistingImgPath() . '-' . stripslashes($imageType->getName()) . '.' . $imageFormat,
+ $originalImageName,
+ $dir . $thumbnailName,
(int) $imageType->getWidth(),
(int) $imageType->getHeight(),
$imageFormat
@@ -193,7 +200,7 @@ public function regenerateNewImages(string $dir, array $type, bool $productsImag
$errors[] = $this->translator->trans(
'Original image is corrupt (%filename%) for product ID %id% or bad permission on folder.',
[
- '%filename%' => $existing_img,
+ '%filename%' => $originalImageName,
'%id%' => (int) $imageObj->id_product,
],
'Admin.Design.Notification'
@@ -206,7 +213,7 @@ public function regenerateNewImages(string $dir, array $type, bool $productsImag
$errors[] = $this->translator->trans(
'Original image is missing or empty (%filename%) for product ID %id%',
[
- '%filename%' => $existing_img,
+ '%filename%' => $originalImageName,
'%id%' => (int) $imageObj->id_product,
],
'Admin.Design.Notification'
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
index 55bfb11b4f148..d6de63ae496ab 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
@@ -29,7 +29,6 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
use ImageType;
-use PrestaShop\PrestaShop\Adapter\ServiceLocator;
use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandlerInterface;
@@ -66,13 +65,8 @@ public function handle(DeleteManufacturerLogoImageCommand $command): void
$fs = new Filesystem();
$imageTypes = ImageType::getImagesTypes('manufacturers');
-
- // Get image formats we will be deleting. It would probably be easier to use ImageFormatConfiguration::SUPPORTED_FORMATS,
- // but we want to avoid any behavior change in minor/patch version.
- $configuredImageFormats = ServiceLocator::get(ImageFormatConfiguration::class)->getGenerationFormats();
-
foreach ($imageTypes as $imageType) {
- foreach ($configuredImageFormats as $imageFormat) {
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
$path = sprintf(
'%s%s-%s.' . $imageFormat,
$this->imageDir,
diff --git a/src/Adapter/Module/CommandHandler/ResetModuleHandler.php b/src/Adapter/Module/CommandHandler/ResetModuleHandler.php
new file mode 100644
index 0000000000000..ac2a260caf313
--- /dev/null
+++ b/src/Adapter/Module/CommandHandler/ResetModuleHandler.php
@@ -0,0 +1,61 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Module\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Module\Command\ResetModuleCommand;
+use PrestaShop\PrestaShop\Core\Domain\Module\CommandHandler\ResetModuleHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Module\Exception\CannotResetModuleException;
+use PrestaShop\PrestaShop\Core\Module\ModuleManager;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
+
+#[AsCommandHandler]
+class ResetModuleHandler implements ResetModuleHandlerInterface
+{
+ public function __construct(
+ protected ModuleManager $moduleManager,
+ protected ModuleRepository $moduleRepository,
+ ) {
+ }
+
+ public function handle(ResetModuleCommand $command): void
+ {
+ $module = $this->moduleRepository->getPresentModule($command->getTechnicalName()->getValue());
+
+ if (!$module->isInstalled()) {
+ throw new CannotResetModuleException('Cannot reset module that is not installed', CannotResetModuleException::NOT_INSTALLED);
+ }
+
+ if (!$module->isActive()) {
+ throw new CannotResetModuleException('Cannot reset module that is disabled', CannotResetModuleException::NOT_ACTIVE);
+ }
+
+ if (!$this->moduleManager->reset($command->getTechnicalName()->getValue(), $command->keepData())) {
+ throw new CannotResetModuleException('Technical error occurred while resetting module status.');
+ }
+ }
+}
diff --git a/src/Adapter/Module/CommandHandler/UpdateModuleStatusHandler.php b/src/Adapter/Module/CommandHandler/UpdateModuleStatusHandler.php
index 63ba2a2869830..d3d8571f8e39b 100644
--- a/src/Adapter/Module/CommandHandler/UpdateModuleStatusHandler.php
+++ b/src/Adapter/Module/CommandHandler/UpdateModuleStatusHandler.php
@@ -30,7 +30,6 @@
use PrestaShop\PrestaShop\Core\Domain\Module\Command\UpdateModuleStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Module\CommandHandler\UpdateModuleStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Module\Exception\CannotToggleModuleStatusException;
-use PrestaShop\PrestaShop\Core\Domain\Module\Exception\ModuleNotFoundException;
use PrestaShop\PrestaShop\Core\Module\ModuleManager;
use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
@@ -45,10 +44,7 @@ public function __construct(
public function handle(UpdateModuleStatusCommand $command): void
{
- $module = $this->moduleRepository->getModule($command->getTechnicalName()->getValue());
- if (!$module->disk->get('is_present')) {
- throw new ModuleNotFoundException();
- }
+ $this->moduleRepository->getPresentModule($command->getTechnicalName()->getValue());
if ($command->isEnabled()) {
$result = $this->moduleManager->enable($command->getTechnicalName()->getValue());
diff --git a/src/Adapter/Module/QueryHandler/GetModuleInfosHandler.php b/src/Adapter/Module/QueryHandler/GetModuleInfosHandler.php
index b230d774b3b4b..c5036e7dfd459 100644
--- a/src/Adapter/Module/QueryHandler/GetModuleInfosHandler.php
+++ b/src/Adapter/Module/QueryHandler/GetModuleInfosHandler.php
@@ -29,7 +29,6 @@
namespace PrestaShop\PrestaShop\Adapter\Module\QueryHandler;
use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
-use PrestaShop\PrestaShop\Core\Domain\Module\Exception\ModuleNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Module\Query\GetModuleInfos;
use PrestaShop\PrestaShop\Core\Domain\Module\QueryHandler\GetModuleInfosHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Module\QueryResult\ModuleInfos;
@@ -45,19 +44,14 @@ public function __construct(
public function handle(GetModuleInfos $query): ModuleInfos
{
- $module = $this->moduleRepository->getModule($query->getTechnicalName()->getValue());
- if (!$module->disk->get('is_present')) {
- throw new ModuleNotFoundException('Cannot find Module with name ' . $query->getTechnicalName()->getValue());
- }
-
- $moduleInstance = $module->getInstance();
+ $module = $this->moduleRepository->getPresentModule($query->getTechnicalName()->getValue());
return new ModuleInfos(
- $moduleInstance->id,
+ $module->database->get('id'),
$module->get('name'),
$module->get('version'),
- $module->database->get('active'),
- $module->database->get('installed'),
+ $module->isActive(),
+ $module->isInstalled(),
);
}
}
diff --git a/src/Adapter/Presenter/Category/CategoryLazyArray.php b/src/Adapter/Presenter/Category/CategoryLazyArray.php
index 781da0b8d2912..db4c866bdd771 100644
--- a/src/Adapter/Presenter/Category/CategoryLazyArray.php
+++ b/src/Adapter/Presenter/Category/CategoryLazyArray.php
@@ -85,48 +85,63 @@ public function getUrl()
}
/**
- * This method returns standardized category image array created from CATEGORYID.jpg, with one exception.
- * One thumbnail size - CATEGORYID-small_default.jpg is generated from CATEGORYID_thumb.jpg instead.
- * This must be resolved in the future.
- *
* @return array|null
*/
#[LazyArrayAttribute(arrayAccess: true)]
public function getImage()
{
- /*
- * Category is a bit different that other objects. It's image ID is defined by a special id_image property.
- * When constructing Category object model, this value is a numeric ID if image exists or false if it doesn't.
- * In case of getSubCategories method, this value is a numeric ID if image exists OR a default "not found" image if it doesn't.
- */
- if (empty($this->category['id_image'])) {
+ return $this->getCover();
+ }
+
+ /**
+ * This returns category cover image (miniatures of CATEGORYID.jpg).
+ * Used as a big image under category description.
+ *
+ * @return array|null
+ */
+ #[LazyArrayAttribute(arrayAccess: true)]
+ public function getCover()
+ {
+ // Get image identifier for the thumbnail and check if it exists
+ $imageIdentifier = $this->category['id'];
+ if (!$this->doesCategoryImageExist($imageIdentifier)) {
return null;
}
return $this->imageRetriever->getImage(
new Category($this->category['id'], $this->language->getId()),
- $this->category['id_image']
+ $imageIdentifier
);
}
/**
+ * This returns category thumbnail image (miniatures of CATEGORYID_thumb.jpg).
+ * Used for thumbnails in subcategories.
+ *
* @return array|null
*/
#[LazyArrayAttribute(arrayAccess: true)]
- public function getCover()
+ public function getThumbnail()
{
- return $this->getImage();
+ // Get image identifier for the thumbnail and check if it exists
+ $imageIdentifier = $this->category['id'] . '_thumb';
+ if (!$this->doesCategoryImageExist($imageIdentifier)) {
+ return null;
+ }
+
+ return $this->imageRetriever->getImage(
+ new Category($this->category['id'], $this->language->getId()),
+ $imageIdentifier
+ );
}
/**
- * @todo This should return category thumbnail image (miniatures of CATEGORYID_thumb.jpg) instead,
- * after support in ImageRetriever is implemented.
+ * Checks if given category image exists for our category.
*
- * @return array|null
+ * @return bool
*/
- #[LazyArrayAttribute(arrayAccess: true)]
- public function getThumbnail()
+ private function doesCategoryImageExist($idImage)
{
- return $this->getImage();
+ return file_exists(_PS_CAT_IMG_DIR_ . $idImage . '.jpg');
}
}
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
index 9b6b5427ce5ec..74dda91759013 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
@@ -32,6 +32,7 @@
use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\DeleteSupplierLogoImageHandlerInterface;
+use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
use Symfony\Component\Filesystem\Filesystem;
/**
@@ -66,14 +67,16 @@ public function handle(DeleteSupplierLogoImageCommand $command): void
$imageTypes = ImageType::getImagesTypes('suppliers');
foreach ($imageTypes as $imageType) {
- $path = sprintf(
- '%s%s-%s.jpg',
- $this->imageDir,
- $command->getSupplierId()->getValue(),
- stripslashes($imageType['name'])
- );
- if ($fs->exists($path)) {
- $fs->remove($path);
+ foreach (ImageFormatConfiguration::SUPPORTED_FORMATS as $imageFormat) {
+ $path = sprintf(
+ '%s%s-%s.' . $imageFormat,
+ $this->imageDir,
+ $command->getSupplierId()->getValue(),
+ stripslashes($imageType['name'])
+ );
+ if ($fs->exists($path)) {
+ $fs->remove($path);
+ }
}
}
diff --git a/src/Core/Backup/Manager/BackupCreatorInterface.php b/src/Core/Backup/Manager/BackupCreatorInterface.php
index 61d12630ff08e..604037ca498b6 100644
--- a/src/Core/Backup/Manager/BackupCreatorInterface.php
+++ b/src/Core/Backup/Manager/BackupCreatorInterface.php
@@ -38,5 +38,5 @@ interface BackupCreatorInterface
*
* @return BackupInterface
*/
- public function createBackup();
+ public function createBackup(): BackupInterface;
}
diff --git a/src/Core/Backup/Manager/BackupRemoverInterface.php b/src/Core/Backup/Manager/BackupRemoverInterface.php
index aaa83976268a2..bc8e47dbc3172 100644
--- a/src/Core/Backup/Manager/BackupRemoverInterface.php
+++ b/src/Core/Backup/Manager/BackupRemoverInterface.php
@@ -38,5 +38,5 @@ interface BackupRemoverInterface
*
* @return bool True if backup were removed successfully or False otherwise
*/
- public function remove(BackupInterface $backup);
+ public function remove(BackupInterface $backup): bool;
}
diff --git a/src/Core/Domain/Category/Command/DeleteCategoryThumbnailImageCommand.php b/src/Core/Domain/Category/Command/DeleteCategoryThumbnailImageCommand.php
new file mode 100644
index 0000000000000..61610b8c28105
--- /dev/null
+++ b/src/Core/Domain/Category/Command/DeleteCategoryThumbnailImageCommand.php
@@ -0,0 +1,56 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Category\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
+
+/**
+ * Deletes thumbnail image for given category.
+ */
+class DeleteCategoryThumbnailImageCommand
+{
+ /**
+ * @var CategoryId
+ */
+ private $categoryId;
+
+ /**
+ * @param int $categoryId
+ */
+ public function __construct($categoryId)
+ {
+ $this->categoryId = new CategoryId($categoryId);
+ }
+
+ /**
+ * @return CategoryId
+ */
+ public function getCategoryId()
+ {
+ return $this->categoryId;
+ }
+}
diff --git a/src/Core/Domain/Category/CommandHandler/DeleteCategoryThumbnailImageHandlerInterface.php b/src/Core/Domain/Category/CommandHandler/DeleteCategoryThumbnailImageHandlerInterface.php
new file mode 100644
index 0000000000000..7032459d42ef0
--- /dev/null
+++ b/src/Core/Domain/Category/CommandHandler/DeleteCategoryThumbnailImageHandlerInterface.php
@@ -0,0 +1,40 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryThumbnailImageCommand;
+
+/**
+ * Defines contract for service which handles thumbnail image delete command.
+ */
+interface DeleteCategoryThumbnailImageHandlerInterface
+{
+ /**
+ * @param DeleteCategoryThumbnailImageCommand $command
+ */
+ public function handle(DeleteCategoryThumbnailImageCommand $command);
+}
diff --git a/src/Core/Domain/Module/Command/ResetModuleCommand.php b/src/Core/Domain/Module/Command/ResetModuleCommand.php
new file mode 100644
index 0000000000000..a1645fefd5006
--- /dev/null
+++ b/src/Core/Domain/Module/Command/ResetModuleCommand.php
@@ -0,0 +1,51 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Module\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Module\ValueObject\ModuleTechnicalName;
+
+class ResetModuleCommand
+{
+ protected ModuleTechnicalName $technicalName;
+
+ public function __construct(
+ string $technicalName,
+ protected bool $keepData = true
+ ) {
+ $this->technicalName = new ModuleTechnicalName($technicalName);
+ }
+
+ public function getTechnicalName(): ModuleTechnicalName
+ {
+ return $this->technicalName;
+ }
+
+ public function keepData(): bool
+ {
+ return $this->keepData;
+ }
+}
diff --git a/src/Core/Domain/Module/CommandHandler/ResetModuleHandlerInterface.php b/src/Core/Domain/Module/CommandHandler/ResetModuleHandlerInterface.php
new file mode 100644
index 0000000000000..922d6b384a3ad
--- /dev/null
+++ b/src/Core/Domain/Module/CommandHandler/ResetModuleHandlerInterface.php
@@ -0,0 +1,34 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Module\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Module\Command\ResetModuleCommand;
+
+interface ResetModuleHandlerInterface
+{
+ public function handle(ResetModuleCommand $command): void;
+}
diff --git a/src/Core/Domain/Module/Exception/CannotResetModuleException.php b/src/Core/Domain/Module/Exception/CannotResetModuleException.php
new file mode 100644
index 0000000000000..ea8fe1f43269b
--- /dev/null
+++ b/src/Core/Domain/Module/Exception/CannotResetModuleException.php
@@ -0,0 +1,38 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Module\Exception;
+
+/**
+ * Is thrown when required module cannot be found
+ */
+class CannotResetModuleException extends ModuleException
+{
+ public const NOT_INSTALLED = 1;
+
+ public const NOT_ACTIVE = 1;
+}
diff --git a/src/Core/Domain/Module/QueryResult/ModuleInfos.php b/src/Core/Domain/Module/QueryResult/ModuleInfos.php
index 23e5e2ce3d2b6..4ac9bda8474bc 100644
--- a/src/Core/Domain/Module/QueryResult/ModuleInfos.php
+++ b/src/Core/Domain/Module/QueryResult/ModuleInfos.php
@@ -31,7 +31,7 @@
class ModuleInfos
{
public function __construct(
- private readonly int $moduleId,
+ private readonly ?int $moduleId,
private readonly string $technicalName,
private readonly string $version,
private readonly bool $enabled,
@@ -39,7 +39,7 @@ public function __construct(
) {
}
- public function getModuleId(): int
+ public function getModuleId(): ?int
{
return $this->moduleId;
}
diff --git a/src/Core/Domain/SqlManagement/Command/SaveSqlRequestSettingsCommand.php b/src/Core/Domain/SqlManagement/Command/SaveSqlRequestSettingsCommand.php
index a6dde5442aa7e..c9bf68fc8db40 100644
--- a/src/Core/Domain/SqlManagement/Command/SaveSqlRequestSettingsCommand.php
+++ b/src/Core/Domain/SqlManagement/Command/SaveSqlRequestSettingsCommand.php
@@ -35,40 +35,51 @@
*/
class SaveSqlRequestSettingsCommand
{
- /**
- * @var string
- */
- private $fileEncoding;
+ private string $fileEncoding;
+ private string $fileSeparator;
/**
* @param string $fileEncoding
+ * @param string $fileSeparator
*
* @throws SqlRequestSettingsConstraintException
*/
- public function __construct($fileEncoding)
+ public function __construct(string $fileEncoding, string $fileSeparator)
{
$this->setFileEncoding($fileEncoding);
+ $this->setFileSeparator($fileSeparator);
}
/**
* @return string
*/
- public function getFileEncoding()
+ public function getFileEncoding(): string
{
return $this->fileEncoding;
}
+ /**
+ * @return string
+ */
+ public function getFileSeparator(): string
+ {
+ return $this->fileSeparator;
+ }
+
/**
* @param string $fileEncoding
*
- * @return self
+ * @return void
*
* @throws SqlRequestSettingsConstraintException
*/
- private function setFileEncoding($fileEncoding)
+ private function setFileEncoding(string $fileEncoding): void
{
- if (!is_string($fileEncoding) || empty($fileEncoding)) {
- throw new SqlRequestSettingsConstraintException(sprintf('Invalid File Encoding %s supplied', var_export($fileEncoding, true)), SqlRequestSettingsConstraintException::INVALID_FILE_ENCODING);
+ if (empty($fileEncoding)) {
+ throw new SqlRequestSettingsConstraintException(
+ sprintf('Invalid File Encoding %s supplied', var_export($fileEncoding, true)),
+ SqlRequestSettingsConstraintException::INVALID_FILE_ENCODING
+ );
}
$supportedFileEncodings = [
@@ -76,12 +87,36 @@ private function setFileEncoding($fileEncoding)
CharsetEncoding::UTF_8,
];
- if (!in_array($fileEncoding, $supportedFileEncodings)) {
- throw new SqlRequestSettingsConstraintException(sprintf('Not supported File Encoding %s supplied. Supported encodings are %s', var_export($fileEncoding, true), var_export(implode(',', $supportedFileEncodings), true)), SqlRequestSettingsConstraintException::NOT_SUPPORTED_FILE_ENCODING);
+ if (!in_array($fileEncoding, $supportedFileEncodings, true)) {
+ throw new SqlRequestSettingsConstraintException(
+ sprintf(
+ 'Not supported File Encoding %s supplied. Supported encodings are %s',
+ var_export($fileEncoding, true),
+ var_export(implode(',', $supportedFileEncodings), true)
+ ),
+ SqlRequestSettingsConstraintException::NOT_SUPPORTED_FILE_ENCODING
+ );
}
$this->fileEncoding = $fileEncoding;
+ }
+
+ /**
+ * @param string $fileSeparator
+ *
+ * @return void
+ *
+ * @throws SqlRequestSettingsConstraintException
+ */
+ private function setFileSeparator(string $fileSeparator): void
+ {
+ if (empty($fileSeparator)) {
+ throw new SqlRequestSettingsConstraintException(
+ sprintf('Invalid File Separator %s supplied', var_export($fileSeparator, true)),
+ SqlRequestSettingsConstraintException::INVALID_FILE_SEPARATOR
+ );
+ }
- return $this;
+ $this->fileSeparator = $fileSeparator;
}
}
diff --git a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
index f4c43dc320804..6de92063bb90c 100644
--- a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
@@ -38,10 +38,7 @@
#[AsCommandHandler]
final class SaveSqlRequestSettingsHandler implements SaveSqlRequestSettingsHandlerInterface
{
- /**
- * @var ConfigurationInterface
- */
- private $configuration;
+ private ConfigurationInterface $configuration;
/**
* @param ConfigurationInterface $configuration
@@ -57,6 +54,7 @@ public function __construct(ConfigurationInterface $configuration)
public function handle(SaveSqlRequestSettingsCommand $command)
{
$this->configuration->set(SqlRequestSettings::FILE_ENCODING, $this->getEncodingFileValue($command));
+ $this->configuration->set(SqlRequestSettings::FILE_SEPARATOR, $command->getFileSeparator());
}
/**
@@ -66,7 +64,7 @@ public function handle(SaveSqlRequestSettingsCommand $command)
*
* @return int
*/
- private function getEncodingFileValue(SaveSqlRequestSettingsCommand $command)
+ private function getEncodingFileValue(SaveSqlRequestSettingsCommand $command): int
{
$valuesMapping = [
CharsetEncoding::UTF_8 => 1,
diff --git a/src/Core/Domain/SqlManagement/Exception/SqlRequestSettingsConstraintException.php b/src/Core/Domain/SqlManagement/Exception/SqlRequestSettingsConstraintException.php
index 7836f083edc97..d375eac510472 100644
--- a/src/Core/Domain/SqlManagement/Exception/SqlRequestSettingsConstraintException.php
+++ b/src/Core/Domain/SqlManagement/Exception/SqlRequestSettingsConstraintException.php
@@ -33,4 +33,5 @@ class SqlRequestSettingsConstraintException extends SqlRequestException
{
public const INVALID_FILE_ENCODING = 10;
public const NOT_SUPPORTED_FILE_ENCODING = 20;
+ public const INVALID_FILE_SEPARATOR = 30;
}
diff --git a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
index 5accb6c88c94a..dd3770c9fa691 100644
--- a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
@@ -38,10 +38,7 @@
#[AsQueryHandler]
final class GetSqlRequestSettingsHandler implements GetSqlRequestSettingsHandlerInterface
{
- /**
- * @var ConfigurationInterface
- */
- private $configuration;
+ private ConfigurationInterface $configuration;
/**
* @param ConfigurationInterface $configuration
@@ -54,12 +51,14 @@ public function __construct(ConfigurationInterface $configuration)
/**
* {@inheritdoc}
*/
- public function handle(GetSqlRequestSettings $query)
+ public function handle(GetSqlRequestSettings $query): SqlRequestSettings
{
$fileEncodingIntValue = $this->configuration->get(SqlRequestSettings::FILE_ENCODING);
+ $fileSeparatorValue = $this->configuration->get(SqlRequestSettings::FILE_SEPARATOR);
return new SqlRequestSettings(
- $this->getFileEncoding($fileEncodingIntValue)
+ $this->getFileEncoding($fileEncodingIntValue),
+ $fileSeparatorValue ?? ';'
);
}
@@ -70,7 +69,7 @@ public function handle(GetSqlRequestSettings $query)
*
* @return string
*/
- private function getFileEncoding($rawValue)
+ private function getFileEncoding(?int $rawValue): string
{
$valuesMapping = [
1 => CharsetEncoding::UTF_8,
diff --git a/src/Core/Domain/SqlManagement/SqlRequestSettings.php b/src/Core/Domain/SqlManagement/SqlRequestSettings.php
index d5a6746db2075..30386af72b544 100644
--- a/src/Core/Domain/SqlManagement/SqlRequestSettings.php
+++ b/src/Core/Domain/SqlManagement/SqlRequestSettings.php
@@ -36,32 +36,41 @@ class SqlRequestSettings
*/
public const FILE_ENCODING = 'PS_ENCODING_FILE_MANAGER_SQL';
+ /**
+ * Name of the setting for SqlRequest SQL query result file separator in configuration.
+ */
+ public const FILE_SEPARATOR = 'PS_SEPARATOR_FILE_MANAGER_SQL';
+
/**
* @var string Encoding in which downloaded SqlRequest SQL query result files will be encoded
*/
- private $fileEncoding;
+ private string $fileEncoding;
+
+ /**
+ * @var string Separator used in downloaded SqlRequest SQL query result files
+ */
+ private string $fileSeparator;
/**
* @param string $fileEncoding
+ * @param string $fileSeparator
*/
- public function __construct($fileEncoding)
+ public function __construct(string $fileEncoding, string $fileSeparator)
{
- $this->setFileEncoding($fileEncoding);
+ $this->fileEncoding = $fileEncoding;
+ $this->fileSeparator = $fileSeparator;
}
/**
* @return string
*/
- public function getFileEncoding()
+ public function getFileEncoding(): string
{
return $this->fileEncoding;
}
- /**
- * @param string $fileEncoding
- */
- private function setFileEncoding($fileEncoding)
+ public function getFileSeparator(): string
{
- $this->fileEncoding = $fileEncoding;
+ return $this->fileSeparator;
}
}
diff --git a/src/Core/Email/EmailLogEraserInterface.php b/src/Core/Email/EmailLogEraserInterface.php
index 09f36f51e326b..f56d543e49841 100644
--- a/src/Core/Email/EmailLogEraserInterface.php
+++ b/src/Core/Email/EmailLogEraserInterface.php
@@ -38,12 +38,12 @@ interface EmailLogEraserInterface
*
* @return array
*/
- public function erase(array $mailLogIds);
+ public function erase(array $mailLogIds): array;
/**
* Erase all email logs.
*
* @return bool TRUE if email logs where erased successfully or FALSE otherwise
*/
- public function eraseAll();
+ public function eraseAll(): bool;
}
diff --git a/src/Core/Employee/Access/EmployeeFormAccessCheckerInterface.php b/src/Core/Employee/Access/EmployeeFormAccessCheckerInterface.php
index 547e4c0c51d10..1229ce8ee33c1 100644
--- a/src/Core/Employee/Access/EmployeeFormAccessCheckerInterface.php
+++ b/src/Core/Employee/Access/EmployeeFormAccessCheckerInterface.php
@@ -42,7 +42,7 @@ interface EmployeeFormAccessCheckerInterface
*
* @return bool
*/
- public function isRestrictedAccess($employeeId);
+ public function isRestrictedAccess(int $employeeId): bool;
/**
* Check if context employee can access edit form for given employee.
@@ -51,5 +51,5 @@ public function isRestrictedAccess($employeeId);
*
* @return bool
*/
- public function canAccessEditFormFor($employeeId);
+ public function canAccessEditFormFor(int $employeeId): bool;
}
diff --git a/src/Core/Employee/FormLanguageChangerInterface.php b/src/Core/Employee/FormLanguageChangerInterface.php
index 53d85f4bf541a..9be62fbc52acc 100644
--- a/src/Core/Employee/FormLanguageChangerInterface.php
+++ b/src/Core/Employee/FormLanguageChangerInterface.php
@@ -36,5 +36,5 @@ interface FormLanguageChangerInterface
*
* @param string $languageIsoCode two letter iso code of the language
*/
- public function changeLanguageInCookies($languageIsoCode);
+ public function changeLanguageInCookies(string $languageIsoCode): void;
}
diff --git a/src/Core/Employee/NavigationMenuTogglerInterface.php b/src/Core/Employee/NavigationMenuTogglerInterface.php
index 79eb8da9d6931..b407789109fe7 100644
--- a/src/Core/Employee/NavigationMenuTogglerInterface.php
+++ b/src/Core/Employee/NavigationMenuTogglerInterface.php
@@ -36,5 +36,5 @@ interface NavigationMenuTogglerInterface
*
* @param bool $shouldCollapse if true - collapse the navigation, expand it otherwise
*/
- public function toggleNavigationMenuInCookies($shouldCollapse);
+ public function toggleNavigationMenuInCookies(bool $shouldCollapse): void;
}
diff --git a/src/Core/Export/FileWriter/ExportCsvFileWriter.php b/src/Core/Export/FileWriter/ExportCsvFileWriter.php
index f223d7a2686a5..ec2308b5a3318 100644
--- a/src/Core/Export/FileWriter/ExportCsvFileWriter.php
+++ b/src/Core/Export/FileWriter/ExportCsvFileWriter.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Core\Export\Data\ExportableDataInterface;
use PrestaShop\PrestaShop\Core\Export\Exception\FileWritingException;
use PrestaShop\PrestaShop\Core\Export\ExportDirectory;
+use SplFileInfo;
use SplFileObject;
/**
@@ -37,10 +38,7 @@
*/
final class ExportCsvFileWriter implements FileWriterInterface
{
- /**
- * @var ExportDirectory
- */
- private $exportDirectory;
+ private ExportDirectory $exportDirectory;
/**
* @param ExportDirectory $exportDirectory
@@ -55,20 +53,23 @@ public function __construct(ExportDirectory $exportDirectory)
*
* @throws FileWritingException
*/
- public function write($fileName, ExportableDataInterface $data)
+ public function write(string $fileName, ExportableDataInterface $data, $separator = ';'): SplFileInfo|SplFileObject
{
$filePath = $this->exportDirectory . $fileName;
try {
$exportFile = new SplFileObject($filePath, 'w');
- } catch (Exception $e) {
- throw new FileWritingException(sprintf('Cannot open export file for writing'), FileWritingException::CANNOT_OPEN_FILE_FOR_WRITING);
+ } catch (Exception) {
+ throw new FileWritingException(
+ 'Cannot open export file for writing',
+ FileWritingException::CANNOT_OPEN_FILE_FOR_WRITING
+ );
}
- $exportFile->fputcsv($data->getTitles(), ';');
+ $exportFile->fputcsv($data->getTitles(), $separator);
foreach ($data->getRows() as $row) {
- $exportFile->fputcsv($row, ';');
+ $exportFile->fputcsv($row, $separator);
}
return $exportFile;
diff --git a/src/Core/Export/FileWriter/FileWriterInterface.php b/src/Core/Export/FileWriter/FileWriterInterface.php
index 1d09c4737be4a..ac530b7e88ba1 100644
--- a/src/Core/Export/FileWriter/FileWriterInterface.php
+++ b/src/Core/Export/FileWriter/FileWriterInterface.php
@@ -39,8 +39,9 @@ interface FileWriterInterface
*
* @param string $fileName
* @param ExportableDataInterface $data
+ * @param string $separator
*
* @return SplFileInfo
*/
- public function write($fileName, ExportableDataInterface $data);
+ public function write(string $fileName, ExportableDataInterface $data, string $separator): SplFileInfo;
}
diff --git a/src/Core/Form/ChoiceProvider/CountryByIdChoiceProvider.php b/src/Core/Form/ChoiceProvider/CountryByIdChoiceProvider.php
index 9f2e4cda23bc8..6464d69c8ed88 100644
--- a/src/Core/Form/ChoiceProvider/CountryByIdChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/CountryByIdChoiceProvider.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Adapter\Country\CountryDataProvider;
use PrestaShop\PrestaShop\Core\Form\FormChoiceAttributeProviderInterface;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
/**
@@ -79,14 +80,11 @@ public function __construct(
*/
public function getChoices()
{
- $countries = $this->getCountries();
- $choices = [];
-
- foreach ($countries as $country) {
- $choices[$country['name']] = $country['id_country'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ $this->getCountries(),
+ 'id_country',
+ 'name'
+ );
}
/**
diff --git a/src/Core/Form/ChoiceProvider/CountryByIsoCodeChoiceProvider.php b/src/Core/Form/ChoiceProvider/CountryByIsoCodeChoiceProvider.php
index 4e9b204ea01e4..2a60df63b3876 100644
--- a/src/Core/Form/ChoiceProvider/CountryByIsoCodeChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/CountryByIsoCodeChoiceProvider.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Core\Form\ChoiceProvider;
use PrestaShop\PrestaShop\Adapter\Country\CountryDataProvider;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceFormatter;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
/**
@@ -63,13 +64,10 @@ public function __construct(
*/
public function getChoices()
{
- $choices = [];
- $countries = $this->countryDataProvider->getCountries($this->langId);
-
- foreach ($countries as $country) {
- $choices[$country['name']] = $country['iso_code'];
- }
-
- return $choices;
+ return FormChoiceFormatter::formatFormChoices(
+ $this->countryDataProvider->getCountries($this->langId),
+ 'iso_code',
+ 'name'
+ );
}
}
diff --git a/src/Core/Form/FormChoiceFormatter.php b/src/Core/Form/FormChoiceFormatter.php
new file mode 100644
index 0000000000000..cea295b64f1c5
--- /dev/null
+++ b/src/Core/Form/FormChoiceFormatter.php
@@ -0,0 +1,111 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Form;
+
+/**
+ * Class that formats choices for Symfony forms.
+ */
+class FormChoiceFormatter
+{
+ /**
+ * Returns a choice list in a format required for Symfony form.
+ * Symfony form choice fields accept array with options, where the item name
+ * is the key and item ID is the value.
+ *
+ * So, when there are two items with the same name, they get lost.
+ * This will automatically mark duplicate options with their ID.
+ *
+ * @param array $rawChoices Raw array with data to build the options from
+ * @param string $idKey Key name of the item IDs, id_carrier for example
+ * @param string $nameKey Key name of the item NAMEs, carrier_name for example
+ * @param bool $sortByName Should the list be automatically sorted by name
+ *
+ * @return array Formatted choices
+ */
+ public static function formatFormChoices(array $rawChoices, string $idKey, string $nameKey, bool $sortByName = true): array
+ {
+ // Final array with choices
+ $finalChoices = [];
+
+ // A slim array with just they keys we processed, so we know what are duplicates
+ $alreadyProcessedKeys = [];
+
+ foreach ($rawChoices as $rawChoiceKey => $rawChoice) {
+ // If we already came across this exact value name before, we will
+ // append the option ID before the name.
+ if (in_array($rawChoice[$nameKey], $alreadyProcessedKeys)) {
+ // We store it with ID prepended before the name.
+ $finalChoices[sprintf('%s (%d)', $rawChoice[$nameKey], $rawChoice[$idKey])] = $rawChoice[$idKey];
+
+ // And if it's the first duplicate (second occurence), we also modify the previous normal one.
+ if (isset($finalChoices[$rawChoice[$nameKey]])) {
+ $previousId = $finalChoices[$rawChoice[$nameKey]];
+ $finalChoices = self::replaceArrayKey(
+ $finalChoices,
+ $rawChoice[$nameKey],
+ sprintf('%s (%d)', $rawChoice[$nameKey], $previousId)
+ );
+ }
+ } else {
+ // We store it in the final array normally
+ $finalChoices[$rawChoice[$nameKey]] = $rawChoice[$idKey];
+ }
+
+ // For next time, we mark that we processed this option
+ $alreadyProcessedKeys[] = $rawChoice[$nameKey];
+
+ // And save some memory, we don't need it anymore
+ unset($rawChoices[$rawChoiceKey]);
+ }
+
+ // Order data by displayed value, if desired
+ if ($sortByName) {
+ ksort($finalChoices);
+ }
+
+ return $finalChoices;
+ }
+
+ /*
+ * Renames a given array key without modifying it's position in the array.
+ *
+ * @param array $array Array to work on
+ * @param string $oldKey Old array key
+ * @param string $newKey New array key
+ *
+ * @return array Array with changed key
+ */
+ public static function replaceArrayKey($array, $oldKey, $newKey): array
+ {
+ $keys = array_keys($array);
+ $keys[array_search($oldKey, $keys)] = $newKey;
+
+ return array_combine($keys, $array);
+ }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
index 1fe6b9ac1cb17..ce7598b7b3afd 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
@@ -76,8 +76,14 @@ public function getData($categoryId)
if ($thumbnailImage) {
$thumbnailImages[] =
[
- 'image_path' => $thumbnailImage['path'],
'size' => $thumbnailImage['size'],
+ 'image_path' => $thumbnailImage['path'],
+ 'delete_path' => $this->router->generate(
+ 'admin_categories_delete_thumbnail_image',
+ [
+ 'categoryId' => $categoryId,
+ ]
+ ),
];
}
diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index 063a8cbd01ce5..c7622a0d7b776 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -55,10 +55,10 @@
use PrestaShop\PrestaShop\Core\Grid\Filter\HiddenFilter;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShop\PrestaShop\Core\Shop\ShopConstraintContextInterface;
+use PrestaShopBundle\Form\Admin\Sell\Product\ProductSearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\IntegerMinMaxFilterType;
use PrestaShopBundle\Form\Admin\Type\NumberMinMaxFilterType;
use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
-use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\ShopSelectorType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -582,7 +582,7 @@ protected function getFilters()
->setAssociatedColumn('position')
)
->add(
- (new Filter('actions', SearchAndResetType::class))
+ (new Filter('actions', ProductSearchAndResetType::class))
->setTypeOptions([
'reset_route' => 'admin_products_reset_grid_search',
'redirect_route' => 'admin_products_index',
diff --git a/src/Core/Import/Configuration/ImportConfigFactory.php b/src/Core/Import/Configuration/ImportConfigFactory.php
index 2588e6e58a876..cc42504cd7122 100644
--- a/src/Core/Import/Configuration/ImportConfigFactory.php
+++ b/src/Core/Import/Configuration/ImportConfigFactory.php
@@ -37,7 +37,7 @@ final class ImportConfigFactory implements ImportConfigFactoryInterface
/**
* {@inheritdoc}
*/
- public function buildFromRequest(Request $request)
+ public function buildFromRequest(Request $request): ImportConfigInterface
{
$separator = $request->request->get(
'separator',
diff --git a/src/Core/Import/Configuration/ImportConfigFactoryInterface.php b/src/Core/Import/Configuration/ImportConfigFactoryInterface.php
index e8e4a388670a4..b0ba5e5c873d3 100644
--- a/src/Core/Import/Configuration/ImportConfigFactoryInterface.php
+++ b/src/Core/Import/Configuration/ImportConfigFactoryInterface.php
@@ -40,5 +40,5 @@ interface ImportConfigFactoryInterface
*
* @return ImportConfigInterface
*/
- public function buildFromRequest(Request $request);
+ public function buildFromRequest(Request $request): ImportConfigInterface;
}
diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index 03e915a63dbf4..e632c28628b41 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -35,6 +35,7 @@
use PrestaShop\PrestaShop\Adapter\Module\AdminModuleDataProvider;
use PrestaShop\PrestaShop\Adapter\Module\Module;
use PrestaShop\PrestaShop\Adapter\Module\ModuleDataProvider;
+use PrestaShop\PrestaShop\Core\Domain\Module\Exception\ModuleNotFoundException;
use Symfony\Component\Finder\Finder;
use Throwable;
@@ -123,6 +124,19 @@ public function getInstalledModules(): ModuleCollection
});
}
+ /**
+ * Returns an instance of a present module, if the module is not in the modules folder an exception is thrown.
+ */
+ public function getPresentModule(string $technicalName): Module
+ {
+ $module = $this->getModule($technicalName);
+ if (!$module->disk->get('is_present')) {
+ throw new ModuleNotFoundException();
+ }
+
+ return $module;
+ }
+
public function getMustBeConfiguredModules(): ModuleCollection
{
return $this->getList()->filter(static function (Module $module) {
diff --git a/src/Core/SqlManager/Configuration/SqlRequestConfiguration.php b/src/Core/SqlManager/Configuration/SqlRequestConfiguration.php
index 82d82184fd8cd..4787a75273768 100644
--- a/src/Core/SqlManager/Configuration/SqlRequestConfiguration.php
+++ b/src/Core/SqlManager/Configuration/SqlRequestConfiguration.php
@@ -42,15 +42,9 @@ final class SqlRequestConfiguration implements DataConfigurationInterface
private const CUSTOM_DEFINES_FILE = _PS_ROOT_DIR_ . '/config/defines_custom.inc.php';
private const PATTERN = '/(define\(\'_PS_ALLOW_MULTI_STATEMENTS_QUERIES_\', )([a-zA-Z]+)(\);)/Ui';
- /**
- * @var CommandBusInterface
- */
- private $commandBus;
+ private CommandBusInterface $commandBus;
- /**
- * @var CommandBusInterface
- */
- private $queryBus;
+ private CommandBusInterface $queryBus;
/**
* @param CommandBusInterface $commandBus
@@ -67,13 +61,14 @@ public function __construct(
/**
* {@inheritdoc}
*/
- public function getConfiguration()
+ public function getConfiguration(): array
{
/** @var SqlRequestSettings $sqlRequestSettings */
$sqlRequestSettings = $this->queryBus->handle(new GetSqlRequestSettings());
return [
'default_file_encoding' => $sqlRequestSettings->getFileEncoding(),
+ 'default_file_separator' => $sqlRequestSettings->getFileSeparator(),
'enable_multi_statements' => $this->getMultiStatementsStatus(),
];
}
@@ -81,14 +76,15 @@ public function getConfiguration()
/**
* {@inheritdoc}
*/
- public function updateConfiguration(array $configuration)
+ public function updateConfiguration(array $configuration): array
{
$errors = [];
if ($this->validateConfiguration($configuration)) {
try {
$command = new SaveSqlRequestSettingsCommand(
- $configuration['default_file_encoding']
+ $configuration['default_file_encoding'],
+ $configuration['default_file_separator']
);
$this->commandBus->handle($command);
@@ -113,9 +109,9 @@ public function updateConfiguration(array $configuration)
/**
* {@inheritdoc}
*/
- public function validateConfiguration(array $configuration)
+ public function validateConfiguration(array $configuration): bool
{
- return isset($configuration['default_file_encoding']);
+ return isset($configuration['default_file_encoding'], $configuration['default_file_separator']);
}
private function getMultiStatementsStatus(): bool
@@ -160,7 +156,7 @@ private function setMultiStatementsStatus(bool $status): bool
*
* @return array Array of errors
*/
- private function handleUpdateException(SqlRequestSettingsConstraintException $e)
+ private function handleUpdateException(SqlRequestSettingsConstraintException $e): array
{
$code = $e->getCode();
@@ -170,6 +166,11 @@ private function handleUpdateException(SqlRequestSettingsConstraintException $e)
'parameters' => ['default_file_encoding'],
'domain' => 'Admin.Notifications.Error',
],
+ SqlRequestSettingsConstraintException::INVALID_FILE_SEPARATOR => [
+ 'key' => 'The %s field is invalid.',
+ 'parameters' => ['default_file_separator'],
+ 'domain' => 'Admin.Notifications.Error',
+ ],
SqlRequestSettingsConstraintException::NOT_SUPPORTED_FILE_ENCODING => [
'key' => 'The %s field is invalid.',
'parameters' => ['default_file_encoding'],
diff --git a/src/Core/SqlManager/Exporter/SqlRequestExporter.php b/src/Core/SqlManager/Exporter/SqlRequestExporter.php
index c5fef12e9c138..7f4602f85c354 100644
--- a/src/Core/SqlManager/Exporter/SqlRequestExporter.php
+++ b/src/Core/SqlManager/Exporter/SqlRequestExporter.php
@@ -26,33 +26,36 @@
namespace PrestaShop\PrestaShop\Core\SqlManager\Exporter;
+use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestExecutionResult;
+use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\ValueObject\SqlRequestId;
use PrestaShop\PrestaShop\Core\Export\Data\ExportableData;
use PrestaShop\PrestaShop\Core\Export\FileWriter\FileWriterInterface;
+use SplFileInfo;
/**
* Class SqlRequestExporter exports SqlRequest query execution result into CSV file under export directory.
*/
final class SqlRequestExporter implements SqlRequestExporterInterface
{
- /**
- * @var FileWriterInterface
- */
- private $csvFileWriter;
+ private FileWriterInterface $csvFileWriter;
+ private ConfigurationInterface $configuration;
/**
* @param FileWriterInterface $csvFileWriter
+ * @param ConfigurationInterface $configuration
*/
- public function __construct(FileWriterInterface $csvFileWriter)
+ public function __construct(FileWriterInterface $csvFileWriter, ConfigurationInterface $configuration)
{
$this->csvFileWriter = $csvFileWriter;
+ $this->configuration = $configuration;
}
/**
* {@inheritdoc}
*/
- public function exportToFile(SqlRequestId $sqlRequestId, SqlRequestExecutionResult $result)
+ public function exportToFile(SqlRequestId $sqlRequestId, SqlRequestExecutionResult $result): SplFileInfo
{
$exportData = new ExportableData(
$result->getColumns(),
@@ -61,6 +64,10 @@ public function exportToFile(SqlRequestId $sqlRequestId, SqlRequestExecutionResu
$exportFileName = sprintf('request_sql_%s.csv', $sqlRequestId->getValue());
- return $this->csvFileWriter->write($exportFileName, $exportData);
+ return $this->csvFileWriter->write(
+ $exportFileName,
+ $exportData,
+ $this->configuration->get(SqlRequestSettings::FILE_SEPARATOR)
+ );
}
}
diff --git a/src/Core/Team/Employee/Configuration/OptionsChecker.php b/src/Core/Team/Employee/Configuration/OptionsChecker.php
index 60dcdfe8c1ec5..2cd15bedc26be 100644
--- a/src/Core/Team/Employee/Configuration/OptionsChecker.php
+++ b/src/Core/Team/Employee/Configuration/OptionsChecker.php
@@ -59,7 +59,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
- public function canBeChanged()
+ public function canBeChanged(): bool
{
if (!$this->multistoreFeature->isUsed()
&& $this->multistoreContextChecker->isSingleShopContext()
diff --git a/src/Core/Team/Employee/Configuration/OptionsCheckerInterface.php b/src/Core/Team/Employee/Configuration/OptionsCheckerInterface.php
index fbb451bb59a72..21d704d87cfff 100644
--- a/src/Core/Team/Employee/Configuration/OptionsCheckerInterface.php
+++ b/src/Core/Team/Employee/Configuration/OptionsCheckerInterface.php
@@ -36,5 +36,5 @@ interface OptionsCheckerInterface
*
* @return bool
*/
- public function canBeChanged();
+ public function canBeChanged(): bool;
}
diff --git a/src/Core/Webservice/ServerRequirementsChecker.php b/src/Core/Webservice/ServerRequirementsChecker.php
index a01b9f8d3705f..74ded4907724b 100644
--- a/src/Core/Webservice/ServerRequirementsChecker.php
+++ b/src/Core/Webservice/ServerRequirementsChecker.php
@@ -86,7 +86,7 @@ public function __construct(
*
* @return array empty if no errors
*/
- public function checkForErrors()
+ public function checkForErrors(): array
{
$issues = $this->lookForIssues();
diff --git a/src/Core/Webservice/ServerRequirementsCheckerInterface.php b/src/Core/Webservice/ServerRequirementsCheckerInterface.php
index cb46eea93782e..db7612f274d00 100644
--- a/src/Core/Webservice/ServerRequirementsCheckerInterface.php
+++ b/src/Core/Webservice/ServerRequirementsCheckerInterface.php
@@ -36,5 +36,5 @@ interface ServerRequirementsCheckerInterface
*
* @return array Errors if any
*/
- public function checkForErrors();
+ public function checkForErrors(): array;
}
diff --git a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
index 32709a4702cd1..2f9097137f3e7 100644
--- a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
+++ b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
@@ -75,6 +75,7 @@ class LegacyLinkLinterCommand extends Command
'admin_carts_set_delivery_settings',
'admin_catalog_price_rules_list_for_product',
'admin_categories_get_ajax_categories',
+ 'admin_categories_delete_thumbnail_image',
'admin_categories_get_categories_tree',
'admin_country_states',
'admin_currencies_update_live_exchange_rates',
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdminAPIController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdminAPIController.php
index 2c247d1f2ce04..ce3455587a304 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdminAPIController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdminAPIController.php
@@ -29,7 +29,6 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use Exception;
-use PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature;
use PrestaShop\PrestaShop\Core\Domain\ApiClient\ApiClientSettings;
use PrestaShop\PrestaShop\Core\Domain\ApiClient\Command\DeleteApiClientCommand;
use PrestaShop\PrestaShop\Core\Domain\ApiClient\Command\EditApiClientCommand;
@@ -41,40 +40,46 @@
use PrestaShop\PrestaShop\Core\Domain\ApiClient\Query\GetApiClientForEditing;
use PrestaShop\PrestaShop\Core\Domain\ApiClient\QueryResult\EditableApiClient;
use PrestaShop\PrestaShop\Core\Domain\ApiClient\ValueObject\CreatedApiClient;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\ApiClientFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* Manages the "Configure > Advanced Parameters > Admin API" page.
*/
-class AdminAPIController extends FrameworkBundleAdminController
+class AdminAPIController extends PrestaShopAdminController
{
- public function __construct(
- private readonly FeatureFlagManager $featureFlagManager,
- private readonly MultistoreFeature $multiStoreFeature,
- ) {
- }
-
#[AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller')) || is_granted('delete', request.get('_legacy_controller')) || is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(ApiClientFilters $apiClientFilters, Request $request): Response
- {
- return $this->renderIndex($apiClientFilters, $request);
+ public function indexAction(
+ ApiClientFilters $apiClientFilters,
+ #[Autowire(service: 'prestashop.adapter.admin_api.form_handler')]
+ ConfigurationFormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.core.grid.factory.api_client')]
+ GridFactoryInterface $gridFactory,
+ ): Response {
+ return $this->renderIndex($apiClientFilters, $formHandler->getForm(), $gridFactory);
}
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function processConfigurationAction(ApiClientFilters $apiClientFilters, Request $request): Response
- {
- $formHandler = $this->getConfigurationFormHandler();
+ public function processConfigurationAction(
+ ApiClientFilters $apiClientFilters,
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.admin_api.form_handler')]
+ ConfigurationFormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.core.grid.factory.api_client')]
+ GridFactoryInterface $gridFactory,
+ ): Response {
$configurationForm = $formHandler->getForm();
$configurationForm->handleRequest($request);
@@ -83,34 +88,39 @@ public function processConfigurationAction(ApiClientFilters $apiClientFilters, R
$configurationErrors = $formHandler->save($data);
if (empty($configurationErrors)) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_api_index');
}
- $this->flashErrors($configurationErrors);
+ $this->addFlashErrors($configurationErrors);
}
- return $this->renderIndex($apiClientFilters, $request, $configurationForm);
+ return $this->renderIndex($apiClientFilters, $configurationForm, $gridFactory);
}
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_api_index')]
- public function createAction(Request $request): Response
- {
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.api_client_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.api_client_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
if ($this->isAdminAPIMultistoreDisabled()) {
return $this->redirectToRoute('admin_api_index');
}
- $apiClientForm = $this->getFormBuilder()->getForm();
+ $apiClientForm = $formBuilder->getForm();
$apiClientForm->handleRequest($request);
try {
- $handlerResult = $this->getFormHandler()->handle($apiClientForm);
+ $handlerResult = $formHandler->handle($apiClientForm);
if (null !== $handlerResult->getIdentifiableObjectId()) {
/** @var CreatedApiClient $createdApiClient */
$createdApiClient = $handlerResult->getIdentifiableObjectId();
$this->displayTemporarySecret(
- $this->trans('The API Client and client secret have been generated successfully.', 'Admin.Notifications.Success'),
+ $this->trans('The API Client and client secret have been generated successfully.', [], 'Admin.Notifications.Success'),
$createdApiClient->getSecret()
);
@@ -123,42 +133,33 @@ public function createAction(Request $request): Response
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/AdminAPI/ApiClient/create.html.twig',
[
- 'layoutTitle' => $this->trans('New API Client', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New API Client', [], 'Admin.Navigation.Menu'),
'apiClientForm' => $apiClientForm->createView(),
]
);
}
- private function displayTemporarySecret(string $successMessage, string $secret): void
- {
- $this->addFlash(
- 'info',
- sprintf(
- '%s %s',
- $successMessage,
- $this->trans('This secret value will only be displayed once. Don\'t forget to make a copy in a secure location.', 'Admin.Notifications.Info'),
- )
- );
-
- // Pass generated secret via flash message
- $this->addFlash('client_secret', $secret);
- }
-
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_api_index')]
- public function editAction(Request $request, int $apiClientId): Response
- {
+ public function editAction(
+ Request $request,
+ int $apiClientId,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.api_client_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.api_client_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
if ($this->isAdminAPIMultistoreDisabled()) {
return $this->redirectToRoute('admin_api_index');
}
- $apiClientForm = $this->getFormBuilder()->getFormFor($apiClientId);
+ $apiClientForm = $formBuilder->getFormFor($apiClientId);
$apiClientForm->handleRequest($request);
try {
- $handlerResult = $this->getFormHandler()->handleFor($apiClientId, $apiClientForm);
+ $handlerResult = $formHandler->handleFor($apiClientId, $apiClientForm);
if (null !== $handlerResult->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_api_clients_edit', ['apiClientId' => $apiClientId]);
}
@@ -169,18 +170,18 @@ public function editAction(Request $request, int $apiClientId): Response
$formData = $apiClientForm->getData();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/AdminAPI/ApiClient/edit.html.twig', [
- 'layoutTitle' => $this->trans('Editing API Client "%name%"', 'Admin.Navigation.Menu', ['%name%' => $formData['client_name']]),
+ 'layoutTitle' => $this->trans('Editing API Client "%name%"', ['%name%' => $formData['client_name']], 'Admin.Navigation.Menu'),
'apiClientForm' => $apiClientForm->createView(),
]);
}
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_api_clients_edit')]
- public function regenerateSecretAction(Request $request, int $apiClientId): Response
+ public function regenerateSecretAction(int $apiClientId): RedirectResponse
{
try {
- $newSecret = $this->getCommandBus()->handle(new GenerateApiClientSecretCommand($apiClientId));
+ $newSecret = $this->dispatchCommand(new GenerateApiClientSecretCommand($apiClientId));
$this->displayTemporarySecret(
- $this->trans('Your new client secret has been generated successfully. Your former client secret is now obsolete.', 'Admin.Notifications.Success'),
+ $this->trans('Your new client secret has been generated successfully. Your former client secret is now obsolete.', [], 'Admin.Notifications.Success'),
$newSecret
);
} catch (Exception $e) {
@@ -190,21 +191,16 @@ public function regenerateSecretAction(Request $request, int $apiClientId): Resp
return $this->redirectToRoute('admin_api_clients_edit', ['apiClientId' => $apiClientId]);
}
- /**
- * @param int $apiClientId
- *
- * @return JsonResponse
- */
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_api_index')]
public function toggleStatusAction(int $apiClientId): JsonResponse
{
/** @var EditableApiClient $editableApiClient */
- $editableApiClient = $this->getQueryBus()->handle(new GetApiClientForEditing($apiClientId));
+ $editableApiClient = $this->dispatchQuery(new GetApiClientForEditing($apiClientId));
try {
$command = new EditApiClientCommand($apiClientId);
$command->setEnabled(!$editableApiClient->isEnabled());
- $this->getCommandBus()->handle($command);
+ $this->dispatchCommand($command);
} catch (Exception $e) {
return $this->json([
'status' => false,
@@ -214,23 +210,18 @@ public function toggleStatusAction(int $apiClientId): JsonResponse
return $this->json([
'status' => true,
- 'message' => $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success'),
+ 'message' => $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success'),
]);
}
- /**
- * @param int $apiClientId
- *
- * @return Response
- */
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.', redirectRoute: 'admin_api_index')]
- public function deleteAction(int $apiClientId): Response
+ public function deleteAction(int $apiClientId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteApiClientCommand($apiClientId));
+ $this->dispatchCommand(new DeleteApiClientCommand($apiClientId));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -239,39 +230,34 @@ public function deleteAction(int $apiClientId): Response
return $this->redirectToRoute('admin_api_index');
}
- private function renderIndex(ApiClientFilters $apiClientFilters, Request $request, ?FormInterface $configurationForm = null): Response
+ private function renderIndex(ApiClientFilters $apiClientFilters, FormInterface $configurationForm, GridFactoryInterface $gridFactory): Response
{
- $apiClientGridFactory = $this->get('prestashop.core.grid.factory.api_client');
- $apiClientGrid = $apiClientGridFactory->getGrid($apiClientFilters);
+ $apiClientGrid = $gridFactory->getGrid($apiClientFilters);
$isAdminAPIMultistoreDisabled = $this->isAdminAPIMultistoreDisabled();
- if (null === $configurationForm) {
- $configurationForm = $this->getConfigurationFormHandler()->getForm();
- }
-
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/AdminAPI/index.html.twig', [
'apiClientGrid' => $this->presentGrid($apiClientGrid),
'help_link' => $this->generateSidebarLink('AdminAdminAPI'),
- 'layoutTitle' => $this->trans('Admin API', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Admin API', [], 'Admin.Navigation.Menu'),
'layoutHeaderToolbarBtn' => $this->getApiClientsToolbarButtons(),
'isAdminAPIMultistoreDisabled' => $isAdminAPIMultistoreDisabled,
'configurationForm' => $configurationForm,
]);
}
- private function getFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.core.form.identifiable_object.api_client_form_handler');
- }
-
- private function getFormBuilder(): FormBuilderInterface
+ private function displayTemporarySecret(string $successMessage, string $secret): void
{
- return $this->get('prestashop.core.form.identifiable_object.builder.api_client_form_builder');
- }
+ $this->addFlash(
+ 'info',
+ sprintf(
+ '%s %s',
+ $successMessage,
+ $this->trans('This secret value will only be displayed once. Don\'t forget to make a copy in a secure location.', [], 'Admin.Notifications.Info'),
+ )
+ );
- private function getConfigurationFormHandler(): ConfigurationFormHandlerInterface
- {
- return $this->get('prestashop.adapter.admin_api.form_handler');
+ // Pass generated secret via flash message
+ $this->addFlash('client_secret', $secret);
}
/**
@@ -283,7 +269,7 @@ private function getApiClientsToolbarButtons(): array
$toolbarButtons['addApiClient'] = [
'href' => $this->generateUrl('admin_api_clients_create'),
- 'desc' => $this->trans('Add new API Client', 'Admin.Actions'),
+ 'desc' => $this->trans('Add new API Client', [], 'Admin.Actions'),
'icon' => 'add_circle_outline',
'class' => 'btn-primary',
];
@@ -301,65 +287,68 @@ private function getErrorMessages()
return [
ApiClientNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
ApiClientConstraintException::class => [
ApiClientConstraintException::CLIENT_ID_ALREADY_USED => $this->trans(
'This value for "%field%" is already used and must be unique.',
+ ['%field%' => $this->trans('Client ID', [], 'Admin.Advparameters.Feature')],
'Admin.Notifications.Error',
- ['%field%' => $this->trans('Client ID', 'Admin.Advparameters.Feature')]
),
ApiClientConstraintException::CLIENT_NAME_ALREADY_USED => $this->trans(
'This value for "%field%" is already used and must be unique.',
+ ['%field%' => $this->trans('Client Name', [], 'Admin.Advparameters.Feature')],
'Admin.Notifications.Error',
- ['%field%' => $this->trans('Client Name', 'Admin.Advparameters.Feature')]
),
ApiClientConstraintException::INVALID_CLIENT_ID => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('Client ID', [], 'Admin.Advparameters.Feature'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Client ID', 'Admin.Advparameters.Feature'))]
),
ApiClientConstraintException::INVALID_CLIENT_NAME => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('Client Name', [], 'Admin.Advparameters.Feature'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Client Name', 'Admin.Advparameters.Feature'))]
),
ApiClientConstraintException::INVALID_DESCRIPTION => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('Description', [], 'Admin.Global'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Description', 'Admin.Global'))]
),
ApiClientConstraintException::CLIENT_ID_TOO_LARGE => $this->trans(
'The field "%field%" cannot be longer than %limit% characters.',
- 'Admin.Notifications.Error',
[
- '%field%' => $this->trans('Client ID', 'Admin.Advparameters.Feature'),
+ '%field%' => $this->trans('Client ID', [], 'Admin.Advparameters.Feature'),
'%limit%' => ApiClientSettings::MAX_CLIENT_ID_LENGTH,
- ]
+ ],
+ 'Admin.Notifications.Error',
),
ApiClientConstraintException::CLIENT_NAME_TOO_LARGE => $this->trans(
'The field "%field%" cannot be longer than %limit% characters.',
- 'Admin.Notifications.Error',
[
- '%field%' => $this->trans('Client Name', 'Admin.Advparameters.Feature'),
+ '%field%' => $this->trans('Client Name', [], 'Admin.Advparameters.Feature'),
'%limit%' => ApiClientSettings::MAX_CLIENT_NAME_LENGTH,
- ]
+ ],
+ 'Admin.Notifications.Error',
),
ApiClientConstraintException::DESCRIPTION_TOO_LARGE => $this->trans(
'The field "%field%" cannot be longer than %limit% characters.',
- 'Admin.Notifications.Error',
[
- '%field%' => $this->trans('Description', 'Admin.Global'),
+ '%field%' => $this->trans('Description', [], 'Admin.Global'),
'%limit%' => ApiClientSettings::MAX_DESCRIPTION_LENGTH,
- ]
+ ],
+ 'Admin.Notifications.Error',
),
],
CannotAddApiClientException::class => $this->trans(
'An error occurred while creating the API Client.',
+ [],
'Admin.Advparameters.Notification'
),
CannotUpdateApiClientException::class => $this->trans(
'An error occurred while creating the API Client.',
+ [],
'Admin.Advparameters.Notification'
),
];
@@ -367,7 +356,8 @@ private function getErrorMessages()
private function isAdminAPIMultistoreDisabled(): bool
{
- return !$this->featureFlagManager->isEnabled(FeatureFlagSettings::FEATURE_FLAG_ADMIN_API_MULTISTORE)
- && $this->multiStoreFeature->isActive();
+ return !$this->getFeatureFlagStateChecker()->isEnabled(FeatureFlagSettings::FEATURE_FLAG_ADMIN_API_MULTISTORE)
+ && $this->getShopContext()->isMultiShopEnabled()
+ ;
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
index 82962e8611a05..8218247bf7ff2 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
@@ -28,7 +28,7 @@
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
use PrestaShop\PrestaShop\Core\Http\CookieOptions;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Exception\FieldNotFoundException;
use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Administration\FormDataProvider;
use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Administration\GeneralType;
@@ -38,33 +38,32 @@
use PrestaShopBundle\Form\Exception\InvalidConfigurationDataErrorCollection;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Administration" page display.
+ * Responsible for "Configure > Advanced Parameters > Administration" page display.
*/
-class AdministrationController extends FrameworkBundleAdminController
+class AdministrationController extends PrestaShopAdminController
{
- public const CONTROLLER_NAME = 'AdminAdminPreferences';
-
- /**
- * Show Administration page.
- *
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction()
- {
- $generalForm = $this->getGeneralFormHandler()->getForm();
- $uploadQuotaForm = $this->getUploadQuotaFormHandler()->getForm();
- $notificationsForm = $this->getNotificationsFormHandler()->getForm();
- $isDebug = $this->get('prestashop.adapter.environment')->isDebug();
+ public function indexAction(
+ #[Autowire(service: 'prestashop.adapter.administration.general.form_handler')]
+ FormHandlerInterface $generalFormHandler,
+ #[Autowire(service: 'prestashop.adapter.administration.upload_quota.form_handler')]
+ FormHandlerInterface $uploadQuotaFormHandler,
+ #[Autowire(service: 'prestashop.adapter.administration.notifications.form_handler')]
+ FormHandlerInterface $notificationsFormHandler,
+ ): Response {
+ $generalForm = $generalFormHandler->getForm();
+ $uploadQuotaForm = $uploadQuotaFormHandler->getForm();
+ $notificationsForm = $notificationsFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/administration.html.twig', [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Administration', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Administration', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'enableSidebar' => true,
@@ -73,7 +72,7 @@ public function indexAction()
'generalForm' => $generalForm->createView(),
'uploadQuotaForm' => $uploadQuotaForm->createView(),
'notificationsForm' => $notificationsForm->createView(),
- 'isDebug' => $isDebug,
+ 'isDebug' => $this->getEnvironment()->isDebug(),
]);
}
@@ -86,47 +85,42 @@ public function indexAction()
*/
#[DemoRestricted(redirectRoute: 'admin_administration')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_administration')]
- public function processGeneralFormAction(Request $request)
- {
+ public function processGeneralFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.administration.general.form_handler')]
+ FormHandlerInterface $generalFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getGeneralFormHandler(),
+ $generalFormHandler,
'General'
);
}
- /**
- * Process the Administration upload quota configuration form.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_administration')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_administration')]
- public function processUploadQuotaFormAction(Request $request)
- {
+ public function processUploadQuotaFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.administration.upload_quota.form_handler')]
+ FormHandlerInterface $uploadQuotaFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getUploadQuotaFormHandler(),
+ $uploadQuotaFormHandler,
'UploadQuota'
);
}
- /**
- * Process the Administration notifications configuration form.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_administration')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_administration')]
- public function processNotificationsFormAction(Request $request)
- {
+ public function processNotificationsFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.administration.notifications.form_handler')]
+ FormHandlerInterface $notificationsFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getNotificationsFormHandler(),
+ $notificationsFormHandler,
'Notifications'
);
}
@@ -140,14 +134,14 @@ public function processNotificationsFormAction(Request $request)
*
* @return RedirectResponse
*/
- protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName)
+ protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName): RedirectResponse
{
- $this->dispatchHook(
+ $this->dispatchHookWithParameters(
'actionAdminAdministrationControllerPostProcess' . $hookName . 'Before',
['controller' => $this]
);
- $this->dispatchHook('actionAdminAdministrationControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminAdministrationControllerPostProcessBefore', ['controller' => $this]);
$form = $formHandler->getForm();
$form->handleRequest($request);
@@ -157,41 +151,17 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
try {
$formHandler->save($data);
} catch (DataProviderException $e) {
- $this->flashErrors($this->getErrorMessages($e->getInvalidConfigurationDataErrors()));
+ $this->addFlashErrors($this->getErrorMessages($e->getInvalidConfigurationDataErrors()));
return $this->redirectToRoute('admin_administration');
}
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
}
return $this->redirectToRoute('admin_administration');
}
- /**
- * @return FormHandlerInterface
- */
- protected function getGeneralFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.administration.general.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getUploadQuotaFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.administration.upload_quota.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getNotificationsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.administration.notifications.form_handler');
- }
-
/**
* @param InvalidConfigurationDataErrorCollection $errors
*
@@ -221,32 +191,33 @@ private function getErrorMessage(InvalidConfigurationDataError $error): string
case FormDataProvider::ERROR_NOT_NUMERIC_OR_LOWER_THAN_ZERO:
return $this->trans(
'%s is invalid. Please enter an integer greater than or equal to 0.',
+ [$this->getFieldLabel($error->getFieldName())],
'Admin.Notifications.Error',
- [$this->getFieldLabel($error->getFieldName())]
);
case FormDataProvider::ERROR_COOKIE_LIFETIME_MAX_VALUE_EXCEEDED:
return $this->trans(
'%s is invalid. Please enter an integer lower than %s.',
- 'Admin.Notifications.Error',
[
$this->getFieldLabel($error->getFieldName()),
CookieOptions::MAX_COOKIE_VALUE,
- ]
+ ],
+ 'Admin.Notifications.Error',
);
case FormDataProvider::ERROR_COOKIE_SAMESITE_NONE:
return $this->trans(
'The SameSite=None attribute is only available in secure mode.',
+ [],
'Admin.Advparameters.Notification'
);
}
return $this->trans(
'%s is invalid.',
- 'Admin.Notifications.Error',
[
$this->getFieldLabel($error->getFieldName()),
CookieOptions::MAX_COOKIE_VALUE,
- ]
+ ],
+ 'Admin.Notifications.Error',
);
}
@@ -267,26 +238,31 @@ private function getFieldLabel(string $fieldName): string
case UploadQuotaType::FIELD_MAX_SIZE_ATTACHED_FILES:
return $this->trans(
'Maximum size for attached files',
+ [],
'Admin.Advparameters.Feature'
);
case UploadQuotaType::FIELD_MAX_SIZE_DOWNLOADABLE_FILE:
return $this->trans(
'Maximum size for a downloadable product',
+ [],
'Admin.Advparameters.Feature'
);
case UploadQuotaType::FIELD_MAX_SIZE_PRODUCT_IMAGE:
return $this->trans(
'Maximum size for a product\'s image',
+ [],
'Admin.Advparameters.Feature'
);
case GeneralType::FIELD_FRONT_COOKIE_LIFETIME:
return $this->trans(
'Lifetime of front office cookies',
+ [],
'Admin.Advparameters.Feature'
);
case GeneralType::FIELD_BACK_COOKIE_LIFETIME:
return $this->trans(
'Lifetime of back office cookies',
+ [],
'Admin.Advparameters.Feature'
);
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
index e269c1057a04d..51df4a6c482af 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
@@ -27,37 +27,37 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use PrestaShop\PrestaShop\Adapter\Backup\Backup;
-use PrestaShop\PrestaShop\Core\Backup\BackupInterface;
use PrestaShop\PrestaShop\Core\Backup\Exception\BackupException;
use PrestaShop\PrestaShop\Core\Backup\Exception\DirectoryIsNotWritableException;
+use PrestaShop\PrestaShop\Core\Backup\Manager\BackupCreatorInterface;
use PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\BackupFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Class BackupController is responsible of "Configure > Advanced Parameters > Database > Backup" page.
+ * Class BackupController is responsible for "Configure > Advanced Parameters > Database > Backup" page.
*/
-class BackupController extends FrameworkBundleAdminController
+class BackupController extends PrestaShopAdminController
{
- /**
- * Show backup page.
- *
- * @param Request $request
- * @param BackupFilters $filters
- *
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_products_index')]
- public function indexAction(Request $request, BackupFilters $filters)
- {
- $backupForm = $this->getBackupFormHandler()->getForm();
+ public function indexAction(
+ Request $request,
+ BackupFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.backup')]
+ GridFactoryInterface $backupsGridFactory,
+ #[Autowire(service: 'prestashop.admin.backup.form_handler')]
+ FormHandlerInterface $backupFormHandler,
+ ): Response {
+ $backupForm = $backupFormHandler->getForm();
$configuration = $this->getConfiguration();
$hasDownloadFile = false;
@@ -72,7 +72,6 @@ public function indexAction(Request $request, BackupFilters $filters)
];
}
- $backupsGridFactory = $this->get('prestashop.core.grid.factory.backup');
$backupGrid = $backupsGridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/Backup/index.html.twig', [
@@ -85,23 +84,16 @@ public function indexAction(Request $request, BackupFilters $filters)
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'multistoreInfoTip' => $this->trans(
'Note that this feature is only available in the "all stores" context. It will be added to all your stores.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
]);
}
- /**
- * Show file download view.
- *
- * @param Request $request
- * @param string $downloadFileName
- *
- * @return Response
- */
#[DemoRestricted(redirectRoute: 'admin_backups_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function downloadViewAction(Request $request, $downloadFileName)
+ public function downloadViewAction(Request $request, string $downloadFileName): Response
{
$backup = new Backup($downloadFileName);
@@ -110,41 +102,28 @@ public function downloadViewAction(Request $request, $downloadFileName)
'url' => $backup->getUrl(),
'size' => $backup->getSize(),
],
- 'layoutTitle' => $this->trans('Downloading backup %s', 'Admin.Navigation.Menu', [$downloadFileName]),
+ 'layoutTitle' => $this->trans('Downloading backup %s', [$downloadFileName], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
]);
}
- /**
- * Return a backup content as a download.
- *
- * @param string $downloadFileName
- *
- * @return BinaryFileResponse
- */
#[DemoRestricted(redirectRoute: 'admin_backup')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function downloadContentAction($downloadFileName)
+ public function downloadContentAction(string $downloadFileName): BinaryFileResponse
{
$backup = new Backup($downloadFileName);
return new BinaryFileResponse($backup->getFilePath());
}
- /**
- * Process backup options saving.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_backups_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_backups_index')]
- public function saveOptionsAction(Request $request)
- {
- $backupFormHandler = $this->getBackupFormHandler();
-
+ public function saveOptionsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.backup.form_handler')]
+ FormHandlerInterface $backupFormHandler,
+ ): RedirectResponse {
$backupForm = $backupFormHandler->getForm();
$backupForm->handleRequest($request);
@@ -152,32 +131,28 @@ public function saveOptionsAction(Request $request)
$errors = $backupFormHandler->save($backupForm->getData());
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
}
}
return $this->redirectToRoute('admin_backups_index');
}
- /**
- * Create new backup.
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_backups_index')]
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", message: 'You do not have permission to create this.', redirectRoute: 'admin_backups_index')]
- public function createAction()
- {
+ public function createAction(
+ BackupCreatorInterface $backupCreator,
+ ): RedirectResponse {
try {
- $backupCreator = $this->get(BackupInterface::class);
$backup = $backupCreator->createBackup();
$this->addFlash(
'success',
$this->trans(
'It appears the backup was successful, however you must download and carefully verify the backup file before proceeding.',
+ [],
'Admin.Advparameters.Notification'
)
);
@@ -188,36 +163,31 @@ public function createAction()
'error',
$this->trans(
'The "Backups" directory located in the admin directory must be writable (CHMOD 755 / 777).',
+ [],
'Admin.Advparameters.Notification'
)
);
} catch (BackupException $e) {
- $this->addFlash('error', $this->trans('The backup file does not exist', 'Admin.Advparameters.Notification'));
+ $this->addFlash('error', $this->trans('The backup file does not exist', [], 'Admin.Advparameters.Notification'));
}
return $this->redirectToRoute('admin_backups_index');
}
- /**
- * Process backup file deletion.
- *
- * @param string $deleteFileName
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_backups_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.', redirectRoute: 'admin_backups_index')]
- public function deleteAction($deleteFileName)
- {
+ public function deleteAction(
+ string $deleteFileName,
+ BackupRemoverInterface $backupRemover,
+ ): RedirectResponse {
$backup = new Backup($deleteFileName);
- $backupRemover = $this->get(BackupRemoverInterface::class);
if (!$backupRemover->remove($backup)) {
$this->addFlash(
'error',
sprintf(
'%s "%s"',
- $this->trans('Error deleting', 'Admin.Advparameters.Notification'),
+ $this->trans('Error deleting', [], 'Admin.Advparameters.Notification'),
$backup->getFileName()
)
);
@@ -225,36 +195,29 @@ public function deleteAction($deleteFileName)
return $this->redirectToRoute('admin_backups_index');
}
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_backups_index');
}
- /**
- * Process bulk backup deletion.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_backups_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.', redirectRoute: 'admin_backups_index')]
- public function bulkDeleteAction(Request $request)
- {
+ public function bulkDeleteAction(
+ Request $request,
+ BackupRemoverInterface $backupRemover,
+ ): RedirectResponse {
$backupsToDelete = $request->request->all('backup_backup_bulk_file_names');
if (empty($backupsToDelete)) {
$this->addFlash(
'error',
- $this->trans('You must select at least one element to delete.', 'Admin.Notifications.Error')
+ $this->trans('You must select at least one element to delete.', [], 'Admin.Notifications.Error')
);
return $this->redirectToRoute('admin_backups_index');
}
- $backupRemover = $this->get(BackupRemoverInterface::class);
$failedBackups = [];
-
foreach ($backupsToDelete as $backupFileName) {
$backup = new Backup($backupFileName);
@@ -266,13 +229,13 @@ public function bulkDeleteAction(Request $request)
if (!empty($failedBackups)) {
$this->addFlash(
'error',
- $this->trans('An error occurred while deleting this selection.', 'Admin.Notifications.Error')
+ $this->trans('An error occurred while deleting this selection.', [], 'Admin.Notifications.Error')
);
foreach ($failedBackups as $backupFileName) {
$this->addFlash(
'error',
- $this->trans('Can\'t delete #%id%', 'Admin.Notifications.Error', ['%id%' => $backupFileName])
+ $this->trans('Can\'t delete #%id%', ['%id%' => $backupFileName], 'Admin.Notifications.Error')
);
}
@@ -281,19 +244,9 @@ public function bulkDeleteAction(Request $request)
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
return $this->redirectToRoute('admin_backups_index');
}
-
- /**
- * Get backup form handler.
- *
- * @return FormHandlerInterface
- */
- protected function getBackupFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.backup.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
index a4fbba585861a..adbce2f4f0641 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
@@ -26,14 +26,19 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
+use PrestaShop\PrestaShop\Core\Configuration\PhpExtensionCheckerInterface;
+use PrestaShop\PrestaShop\Core\Email\EmailConfigurationTesterInterface;
+use PrestaShop\PrestaShop\Core\Email\EmailLogEraserInterface;
use PrestaShop\PrestaShop\Core\Email\MailOption;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\EmailLogsFilter;
use PrestaShop\PrestaShop\Core\Security\Permission;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Email\TestEmailSendingType;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -41,23 +46,21 @@
/**
* Class EmailController is responsible for handling "Configure > Advanced Parameters > E-mail" page.
*/
-class EmailController extends FrameworkBundleAdminController
+class EmailController extends PrestaShopAdminController
{
- /**
- * Show email configuration page.
- *
- * @param Request $request
- * @param EmailLogsFilter $filters
- *
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(Request $request, EmailLogsFilter $filters)
- {
+ public function indexAction(
+ Request $request,
+ EmailLogsFilter $filters,
+ PhpExtensionCheckerInterface $phpExtensionChecker,
+ #[Autowire(service: 'prestashop.core.grid.factory.email_logs')]
+ GridFactoryInterface $emailLogsGridFactory,
+ #[Autowire(service: 'prestashop.admin.email_configuration.form_handler')]
+ FormHandlerInterface $emailConfigurationFormHandler,
+ ): Response {
$configuration = $this->getConfiguration();
- $emailConfigurationForm = $this->getEmailConfigurationFormHandler()->getForm();
- $extensionChecker = $this->get('prestashop.core.configuration.php_extension_checker');
+ $emailConfigurationForm = $emailConfigurationFormHandler->getForm();
$testEmailSendingForm = $this->createForm(TestEmailSendingType::class, [
'send_email_to' => $configuration->get('PS_SHOP_EMAIL'),
@@ -66,19 +69,19 @@ public function indexAction(Request $request, EmailLogsFilter $filters)
$isEmailLogsEnabled = $configuration->get('PS_LOG_EMAILS');
if ($isEmailLogsEnabled) {
- $emailLogsGrid = $this->get('prestashop.core.grid.factory.email_logs')->getGrid($filters);
+ $emailLogsGrid = $emailLogsGridFactory->getGrid($filters);
$presentedEmailLogsGrid = $this->presentGrid($emailLogsGrid);
}
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/Email/index.html.twig', [
'emailConfigurationForm' => $emailConfigurationForm->createView(),
- 'isOpenSslExtensionLoaded' => $extensionChecker->loaded('openssl'),
+ 'isOpenSslExtensionLoaded' => $phpExtensionChecker->loaded('openssl'),
'smtpMailMethod' => MailOption::METHOD_SMTP,
'testEmailSendingForm' => $testEmailSendingForm->createView(),
'emailLogsGrid' => $presentedEmailLogsGrid ?? null,
'isEmailLogsEnabled' => $isEmailLogsEnabled,
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('E-mail', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('E-mail', [], 'Admin.Navigation.Menu'),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
]);
}
@@ -92,21 +95,23 @@ public function indexAction(Request $request, EmailLogsFilter $filters)
*/
#[DemoRestricted(redirectRoute: 'admin_emails_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function saveOptionsAction(Request $request)
- {
- $formHandler = $this->getEmailConfigurationFormHandler();
- $emailConfigurationForm = $formHandler->getForm();
+ public function saveOptionsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.email_configuration.form_handler')]
+ FormHandlerInterface $emailConfigurationFormHandler,
+ ): RedirectResponse {
+ $emailConfigurationForm = $emailConfigurationFormHandler->getForm();
$emailConfigurationForm->handleRequest($request);
if ($emailConfigurationForm->isSubmitted()) {
- $errors = $formHandler->save($emailConfigurationForm->getData());
+ $errors = $emailConfigurationFormHandler->save($emailConfigurationForm->getData());
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The settings have been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The settings have been successfully updated.', [], 'Admin.Notifications.Success')
);
}
}
@@ -114,72 +119,54 @@ public function saveOptionsAction(Request $request)
return $this->redirectToRoute('admin_emails_index');
}
- /**
- * Delete selected email logs.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_emails_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function deleteBulkAction(Request $request)
- {
+ public function deleteBulkAction(
+ Request $request,
+ EmailLogEraserInterface $emailLogEraser,
+ ): RedirectResponse {
$mailLogsToDelete = $request->request->all('email_logs_delete_email_logs');
- $mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
- $errors = $mailLogsEraser->erase($mailLogsToDelete);
+ $errors = $emailLogEraser->erase($mailLogsToDelete);
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
}
return $this->redirectToRoute('admin_emails_index');
}
- /**
- * Delete all email logs.
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_emails_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function deleteAllAction()
- {
- $mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
-
- if ($mailLogsEraser->eraseAll()) {
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ public function deleteAllAction(
+ EmailLogEraserInterface $emailLogEraser,
+ ): RedirectResponse {
+ if ($emailLogEraser->eraseAll()) {
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
}
return $this->redirectToRoute('admin_emails_index');
}
- /**
- * Delete single email log.
- *
- * @param int $mailId
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_emails_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function deleteAction($mailId)
- {
- $mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
- $errors = $mailLogsEraser->erase([$mailId]);
+ public function deleteAction(
+ int $mailId,
+ EmailLogEraserInterface $emailLogEraser,
+ ): RedirectResponse {
+ $errors = $emailLogEraser->erase([$mailId]);
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
}
@@ -193,8 +180,10 @@ public function deleteAction($mailId)
*
* @return Response
*/
- public function sendTestAction(Request $request)
- {
+ public function sendTestAction(
+ Request $request,
+ EmailConfigurationTesterInterface $emailConfigurationTester,
+ ): Response {
if ($this->isDemoModeEnabled()) {
return $this->json([
'errors' => [
@@ -204,7 +193,7 @@ public function sendTestAction(Request $request)
}
if (!in_array(
- $this->authorizationLevel($request->attributes->get('_legacy_controller')),
+ $this->getAuthorizationLevel($request->attributes->get('_legacy_controller')),
[
Permission::LEVEL_READ,
Permission::LEVEL_UPDATE,
@@ -214,7 +203,7 @@ public function sendTestAction(Request $request)
)) {
return $this->json([
'errors' => [
- $this->trans('Access denied.', 'Admin.Notifications.Error'),
+ $this->trans('Access denied.', [], 'Admin.Notifications.Error'),
],
]);
}
@@ -225,20 +214,9 @@ public function sendTestAction(Request $request)
$result = [];
if ($testEmailSendingForm->isSubmitted()) {
- $emailConfigurationTester = $this->get('prestashop.adapter.email.email_configuration_tester');
$result['errors'] = $emailConfigurationTester->testConfiguration($testEmailSendingForm->getData());
}
return $this->json($result);
}
-
- /**
- * Get email configuration form handler.
- *
- * @return FormHandlerInterface
- */
- protected function getEmailConfigurationFormHandler()
- {
- return $this->get('prestashop.admin.email_configuration.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
index bf2eb372ce6eb..576933f2c067c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
@@ -29,7 +29,6 @@
use Exception;
use ImageManager;
use PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider;
-use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand;
@@ -47,16 +46,23 @@
use PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ValueObject\ShowcaseCard;
+use PrestaShop\PrestaShop\Core\Employee\Access\EmployeeFormAccessCheckerInterface;
+use PrestaShop\PrestaShop\Core\Employee\FormLanguageChangerInterface;
+use PrestaShop\PrestaShop\Core\Employee\NavigationMenuTogglerInterface;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
-use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\UploadedImageConstraintException;
use PrestaShop\PrestaShop\Core\Search\Filters\EmployeeFilters;
use PrestaShop\PrestaShop\Core\Security\Permission;
+use PrestaShop\PrestaShop\Core\Team\Employee\Configuration\OptionsCheckerInterface;
use PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProviderInterface;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Entity\Employee\Employee;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -65,39 +71,24 @@
/**
* Class EmployeeController handles pages under "Configure > Advanced Parameters > Team > Employees".
*/
-class EmployeeController extends FrameworkBundleAdminController
+class EmployeeController extends PrestaShopAdminController
{
- public static function getSubscribedServices(): array
- {
- return parent::getSubscribedServices() + [
- TabDataProvider::class => TabDataProvider::class,
- ];
- }
-
- /**
- * Show employees list & options page.
- *
- * @param Request $request
- * @param EmployeeFilters $filters
- *
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, EmployeeFilters $filters)
- {
- $employeeOptionsFormHandler = $this->get('prestashop.admin.employee_options.form_handler');
+ public function indexAction(
+ Request $request,
+ EmployeeFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.employee')]
+ GridFactoryInterface $employeeGridFactory,
+ #[Autowire(service: 'prestashop.admin.employee_options.form_handler')]
+ ConfigurationFormHandlerInterface $employeeOptionsFormHandler,
+ OptionsCheckerInterface $employeeOptionsChecker,
+ DocumentationLinkProviderInterface $helperCardDocumentationLinkProvider,
+ ): Response {
$employeeOptionsForm = $employeeOptionsFormHandler->getForm();
-
- $employeeOptionsChecker = $this->get('prestashop.core.team.employee.configuration.options_checker');
-
- $employeeGridFactory = $this->get('prestashop.core.grid.factory.employee');
$employeeGrid = $employeeGridFactory->getGrid($filters);
- $helperCardDocumentationLinkProvider =
- $this->get(DocumentationLinkProviderInterface::class);
-
- $showcaseCardIsClosed = $this->getQueryBus()->handle(
- new GetShowcaseCardIsClosed((int) $this->getContext()->employee->id, ShowcaseCard::EMPLOYEES_CARD)
+ $showcaseCardIsClosed = $this->dispatchQuery(
+ new GetShowcaseCardIsClosed($this->getEmployeeContext()->getEmployee()->getId(), ShowcaseCard::EMPLOYEES_CARD)
);
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/Employee/index.html.twig', [
@@ -121,9 +112,11 @@ public function indexAction(Request $request, EmployeeFilters $filters)
*/
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))")]
- public function saveOptionsAction(Request $request)
- {
- $employeeOptionsFormHandler = $this->get('prestashop.admin.employee_options.form_handler');
+ public function saveOptionsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.employee_options.form_handler')]
+ ConfigurationFormHandlerInterface $employeeOptionsFormHandler,
+ ): RedirectResponse {
$employeeOptionsForm = $employeeOptionsFormHandler->getForm();
$employeeOptionsForm->handleRequest($request);
@@ -131,34 +124,27 @@ public function saveOptionsAction(Request $request)
$errors = $employeeOptionsFormHandler->save($employeeOptionsForm->getData());
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
return $this->redirectToRoute('admin_employees_index');
}
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
}
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Toggle given employee status.
- *
- * @param int $employeeId
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_employees_index')]
- public function toggleStatusAction($employeeId)
+ public function toggleStatusAction(int $employeeId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new ToggleEmployeeStatusCommand((int) $employeeId));
+ $this->dispatchCommand(new ToggleEmployeeStatusCommand((int) $employeeId));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (EmployeeException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -167,27 +153,20 @@ public function toggleStatusAction($employeeId)
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Bulk enables employee status action.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function bulkStatusEnableAction(Request $request)
+ public function bulkStatusEnableAction(Request $request): RedirectResponse
{
$employeeIds = $request->request->all('employee_employee_bulk');
try {
- $this->getCommandBus()->handle(
+ $this->dispatchCommand(
new BulkUpdateEmployeeStatusCommand($employeeIds, true)
);
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (EmployeeException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -196,27 +175,20 @@ public function bulkStatusEnableAction(Request $request)
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Bulk disables employee status action.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function bulkStatusDisableAction(Request $request)
+ public function bulkStatusDisableAction(Request $request): RedirectResponse
{
$employeeIds = $request->request->all('employee_employee_bulk');
try {
- $this->getCommandBus()->handle(
+ $this->dispatchCommand(
new BulkUpdateEmployeeStatusCommand($employeeIds, false)
);
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (EmployeeException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -225,21 +197,14 @@ public function bulkStatusDisableAction(Request $request)
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Delete employee.
- *
- * @param int $employeeId
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")]
- public function deleteAction($employeeId)
+ public function deleteAction(int $employeeId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteEmployeeCommand((int) $employeeId));
+ $this->dispatchCommand(new DeleteEmployeeCommand((int) $employeeId));
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (EmployeeException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -247,25 +212,18 @@ public function deleteAction($employeeId)
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Delete employees in bulk actions.
- *
- * @param Request $request
- *
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function bulkDeleteAction(Request $request)
+ public function bulkDeleteAction(Request $request): RedirectResponse
{
$employeeIds = $request->request->all('employee_employee_bulk');
try {
- $this->getCommandBus()->handle(new BulkDeleteEmployeeCommand($employeeIds));
+ $this->dispatchCommand(new BulkDeleteEmployeeCommand($employeeIds));
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
} catch (EmployeeException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -274,25 +232,23 @@ public function bulkDeleteAction(Request $request)
return $this->redirectToRoute('admin_employees_index');
}
- /**
- * Show employee creation form page and handle it's submit.
- *
- * @param Request $request
- *
- * @return Response
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function createAction(Request $request)
- {
- $employeeForm = $this->getEmployeeFormBuilder()->getForm();
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.employee_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.employee_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
+ $employeeForm = $formBuilder->getForm();
$employeeForm->handleRequest($request);
try {
- $result = $this->getEmployeeFormHandler()->handle($employeeForm);
+ $result = $formHandler->handle($employeeForm);
if (null !== $result->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_employees_index');
}
@@ -304,7 +260,7 @@ public function createAction(Request $request)
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'employeeForm' => $employeeForm->createView(),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('New employee', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New employee', [], 'Admin.Navigation.Menu'),
];
return $this->render(
@@ -313,24 +269,24 @@ public function createAction(Request $request)
);
}
- /**
- * Show Employee edit page.
- *
- * @param int $employeeId
- * @param Request $request
- *
- * @return Response
- */
#[DemoRestricted(redirectRoute: 'admin_employees_index')]
- public function editAction(int $employeeId, Request $request, EmployeeContext $employeeContext)
- {
+ public function editAction(
+ int $employeeId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.employee_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.employee_form_handler')]
+ FormHandlerInterface $formHandler,
+ EmployeeFormAccessCheckerInterface $formAccessChecker,
+ ): Response {
// If employee is editing his own profile - he doesn't need to have access to the edit form.
- if ($employeeContext->getEmployee()->getId() != $employeeId) {
+ if ($this->getEmployeeContext()->getEmployee()->getId() != $employeeId) {
if (!$this->isGranted(Permission::UPDATE, $request->get('_legacy_controller'))) {
$this->addFlash(
'error',
$this->trans(
'You do not have permission to update this.',
+ [],
'Admin.Notifications.Error'
)
);
@@ -339,12 +295,10 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
}
}
- $formAccessChecker = $this->get('prestashop.adapter.employee.form_access_checker');
-
if (!$formAccessChecker->canAccessEditFormFor($employeeId)) {
$this->addFlash(
'error',
- $this->trans('You cannot edit the SuperAdmin profile.', 'Admin.Advparameters.Notification')
+ $this->trans('You cannot edit the SuperAdmin profile.', [], 'Admin.Advparameters.Notification')
);
return $this->redirectToRoute('admin_employees_index');
@@ -353,7 +307,7 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
$isRestrictedAccess = $formAccessChecker->isRestrictedAccess((int) $employeeId);
try {
- $employeeForm = $this->getEmployeeFormBuilder()->getFormFor((int) $employeeId, [], [
+ $employeeForm = $formBuilder->getFormFor((int) $employeeId, [], [
'is_restricted_access' => $isRestrictedAccess,
'is_for_editing' => true,
]);
@@ -365,10 +319,10 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
try {
$employeeForm->handleRequest($request);
- $result = $this->getEmployeeFormHandler()->handleFor((int) $employeeId, $employeeForm);
+ $result = $formHandler->handleFor($employeeId, $employeeForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_employees_edit', ['employeeId' => $employeeId]);
}
@@ -377,7 +331,7 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
}
try {
- $editableEmployee = $this->getQueryBus()->handle(new GetEmployeeForEditing((int) $employeeId));
+ $editableEmployee = $this->dispatchQuery(new GetEmployeeForEditing((int) $employeeId));
} catch (EmployeeNotFoundException $e) {
return $this->redirectToRoute('admin_employees_index');
}
@@ -390,11 +344,11 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
'enableSidebar' => true,
'layoutTitle' => $this->trans(
'Editing %lastname% %firstname%\'s profile',
- 'Admin.Navigation.Menu',
[
'%firstname%' => $editableEmployee->getFirstname()->getValue(),
'%lastname%' => $editableEmployee->getLastName()->getValue(),
- ]
+ ],
+ 'Admin.Navigation.Menu',
),
];
@@ -404,35 +358,21 @@ public function editAction(int $employeeId, Request $request, EmployeeContext $e
);
}
- /**
- * Change navigation menu status for employee.
- *
- * @param Request $request
- *
- * @return Response
- */
- public function toggleNavigationMenuAction(Request $request)
- {
- $navigationToggler = $this->get('prestashop.adapter.employee.navigation_menu_toggler');
- $navigationToggler->toggleNavigationMenuInCookies($request->request->getBoolean('shouldCollapse'));
+ public function toggleNavigationMenuAction(
+ Request $request,
+ NavigationMenuTogglerInterface $navigationMenuToggler,
+ ): Response {
+ $navigationMenuToggler->toggleNavigationMenuInCookies($request->request->getBoolean('shouldCollapse'));
return new Response('', Response::HTTP_NO_CONTENT);
}
- /**
- * Change employee form language.
- *
- * @param Request $request
- *
- * @return Response
- */
- public function changeFormLanguageAction(Request $request)
- {
- $configuration = $this->getConfiguration();
-
- if ($configuration->getBoolean('PS_BO_ALLOW_EMPLOYEE_FORM_LANG')) {
- $languageChanger = $this->get('prestashop.adapter.employee.form_language_changer');
- $languageChanger->changeLanguageInCookies($request->request->get('language_iso_code'));
+ public function changeFormLanguageAction(
+ Request $request,
+ FormLanguageChangerInterface $formLanguageChanger,
+ ): Response {
+ if ((bool) $this->getConfiguration()->get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG')) {
+ $formLanguageChanger->changeLanguageInCookies($request->request->get('language_iso_code'));
}
return new Response('', Response::HTTP_NO_CONTENT);
@@ -446,33 +386,15 @@ public function changeFormLanguageAction(Request $request)
* @return JsonResponse
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_employees_index')]
- public function getAccessibleTabsAction(Request $request)
- {
- $profileId = $request->query->get('profileId');
- $tabsDataProvider = $this->get(TabDataProvider::class);
- $contextEmployeeProvider = $this->get('prestashop.adapter.data_provider.employee');
-
+ public function getAccessibleTabsAction(
+ Request $request,
+ TabDataProvider $tabDataProvider,
+ ): JsonResponse {
return $this->json(
- $tabsDataProvider->getViewableTabs($profileId, $contextEmployeeProvider->getLanguageId())
+ $tabDataProvider->getViewableTabs($request->query->get('profileId'), $this->getEmployeeContext()->getEmployee()->getLanguageId())
);
}
- /**
- * @return FormBuilderInterface
- */
- protected function getEmployeeFormBuilder()
- {
- return $this->get('prestashop.core.form.identifiable_object.builder.employee_form_builder');
- }
-
- /**
- * @return FormHandler
- */
- protected function getEmployeeFormHandler()
- {
- return $this->get('prestashop.core.form.identifiable_object.handler.employee_form_handler');
- }
-
/**
* Get human readable error messages.
*
@@ -480,55 +402,62 @@ protected function getEmployeeFormHandler()
*
* @return array
*/
- protected function getErrorMessages(Exception $e)
+ protected function getErrorMessages(Exception $e): array
{
return [
UploadedImageConstraintException::class => $this->trans(
'Image format not recognized, allowed formats are: %s',
- 'Admin.Notifications.Error',
[
implode(', ', ImageManager::MIME_TYPE_SUPPORTED),
- ]
+ ],
+ 'Admin.Notifications.Error',
),
InvalidEmployeeIdException::class => $this->trans(
'The object cannot be loaded (the identifier is missing or invalid)',
+ [],
'Admin.Notifications.Error'
),
EmployeeNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
AdminEmployeeException::class => [
AdminEmployeeException::CANNOT_CHANGE_LAST_ADMIN => $this->trans(
'You cannot disable or delete the administrator account.',
+ [],
'Admin.Advparameters.Notification'
),
],
EmployeeCannotChangeItselfException::class => [
EmployeeCannotChangeItselfException::CANNOT_CHANGE_STATUS => $this->trans(
'You cannot disable or delete your own account.',
+ [],
'Admin.Advparameters.Notification'
),
],
CannotDeleteEmployeeException::class => $this->trans(
'Can\'t delete #%id%',
- 'Admin.Notifications.Error',
[
'%id%' => $e instanceof CannotDeleteEmployeeException ? $e->getEmployeeId()->getValue() : 0,
- ]
+ ],
+ 'Admin.Notifications.Error',
),
MissingShopAssociationException::class => $this->trans(
'The employee must be associated with at least one shop.',
+ [],
'Admin.Advparameters.Notification'
),
InvalidProfileException::class => $this->trans(
'The provided profile is invalid',
+ [],
'Admin.Advparameters.Notification'
),
EmailAlreadyUsedException::class => sprintf(
'%s %s',
$this->trans(
'An account already exists for this email address:',
+ [],
'Admin.Orderscustomers.Notification'
),
$e instanceof EmailAlreadyUsedException ? $e->getEmail() : ''
@@ -536,29 +465,32 @@ protected function getErrorMessages(Exception $e)
EmployeeConstraintException::class => [
EmployeeConstraintException::INCORRECT_PASSWORD => $this->trans(
'Your current password is invalid.',
+ [],
'Admin.Advparameters.Notification'
),
EmployeeConstraintException::INVALID_EMAIL => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('Email', [], 'Admin.Global'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Email', 'Admin.Global'))]
),
EmployeeConstraintException::INVALID_FIRST_NAME => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('First name', [], 'Admin.Global'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('First name', 'Admin.Global'))]
),
EmployeeConstraintException::INVALID_LAST_NAME => $this->trans(
'The %s field is invalid.',
+ [sprintf('"%s"', $this->trans('Last name', [], 'Admin.Global'))],
'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Last name', 'Admin.Global'))]
),
EmployeeConstraintException::INVALID_PASSWORD => $this->trans(
'The password doesn\'t meet the password policy requirements.',
+ [],
'Admin.Notifications.Error'
),
EmployeeConstraintException::INVALID_HOMEPAGE => $this->trans(
'The selected default page is not accessible by the selected profile.',
+ [],
'Admin.Notifications.Error'
),
],
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
index acae7e6d155ec..2c571b11c37ce 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
@@ -29,9 +29,11 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -40,15 +42,16 @@
* Manages the "Configure > Advanced Parameters > Experimental Features" page.
*/
#[AllShopContext]
-class FeatureFlagController extends FrameworkBundleAdminController
+class FeatureFlagController extends PrestaShopAdminController
{
- /**
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(Request $request): Response
- {
- $stableFormHandler = $this->get('prestashop.admin.feature_flags.stable_form_handler');
+ public function indexAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.feature_flags.stable_form_handler')]
+ FormHandlerInterface $stableFormHandler,
+ #[Autowire(service: 'prestashop.admin.feature_flags.beta_form_handler')]
+ FormHandlerInterface $betaFormHandler,
+ ): Response {
$stableFeatureFlagsForm = $stableFormHandler->getForm();
$stableFeatureFlagsForm->handleRequest($request);
@@ -61,15 +64,14 @@ public function indexAction(Request $request): Response
}
if (empty($errors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
}
return $this->redirectToRoute('admin_feature_flags_index');
}
- $betaFormHandler = $this->get('prestashop.admin.feature_flags.beta_form_handler');
$betaFeatureFlagsForm = $betaFormHandler->getForm();
$betaFeatureFlagsForm->handleRequest($request);
@@ -82,9 +84,9 @@ public function indexAction(Request $request): Response
}
if (empty($errors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
}
return $this->redirectToRoute('admin_feature_flags_index');
@@ -94,7 +96,7 @@ public function indexAction(Request $request): Response
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('New & experimental features', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New & experimental features', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'stableFeatureFlagsForm' => $this->isFormEmpty($stableFeatureFlagsForm)
@@ -105,10 +107,10 @@ public function indexAction(Request $request): Response
: $betaFeatureFlagsForm->createView(),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => ($this->get('prestashop.adapter.multistore_feature')->isUsed()
- && $this->get('prestashop.adapter.shop.context')->isShopContext()),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed() && $this->getShopContext()->getShopConstraint()->getShopId() !== null,
]);
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
index 4d01b95c11779..3b7aeef84dda5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
@@ -26,14 +26,27 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Import\Configuration\ImportConfigFactoryInterface;
+use PrestaShop\PrestaShop\Core\Import\Configuration\ImportRuntimeConfigFactoryInterface;
+use PrestaShop\PrestaShop\Core\Import\EntityField\Provider\EntityFieldsProviderFinder;
use PrestaShop\PrestaShop\Core\Import\Exception\NotSupportedImportEntityException;
use PrestaShop\PrestaShop\Core\Import\Exception\UnavailableImportFileException;
+use PrestaShop\PrestaShop\Core\Import\File\FileFinder;
+use PrestaShop\PrestaShop\Core\Import\File\FileRemoval;
+use PrestaShop\PrestaShop\Core\Import\File\FileUploader;
+use PrestaShop\PrestaShop\Core\Import\Handler\ImportHandlerFinderInterface;
use PrestaShop\PrestaShop\Core\Import\ImportDirectory;
+use PrestaShop\PrestaShop\Core\Import\ImporterInterface;
+use PrestaShop\PrestaShop\Core\Import\Sample\SampleFileProvider;
+use PrestaShop\PrestaShop\Core\Import\Validator\ImportRequestValidatorInterface;
use PrestaShop\PrestaShop\Core\Security\Permission;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Exception\FileUploadException;
+use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Import\ImportFormHandlerInterface;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -43,24 +56,29 @@
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
/**
- * Responsible of "Configure > Advanced Parameters > Import" page display.
+ * Responsible for "Configure > Advanced Parameters > Import" page display.
*/
-class ImportController extends FrameworkBundleAdminController
+class ImportController extends PrestaShopAdminController
{
/**
* Show import form & handle forwarding to legacy controller.
*
* @param Request $request
*
- * @return array|RedirectResponse|Response
+ * @return RedirectResponse|Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function importAction(Request $request)
- {
+ public function importAction(
+ Request $request,
+ ImportDirectory $importDir,
+ #[Autowire(service: 'prestashop.admin.import.form_handler')]
+ ImportFormHandlerInterface $formHandler,
+ FileFinder $finder,
+ ImportConfigFactoryInterface $importConfigFactory,
+ LegacyContext $legacyContext,
+ ): RedirectResponse|Response {
$legacyController = $request->attributes->get('_legacy_controller');
- $importDir = $this->get('prestashop.core.import.dir');
-
if (!$this->checkImportDirectory($importDir)) {
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/ImportPage/import.html.twig',
@@ -68,11 +86,6 @@ public function importAction(Request $request)
);
}
- $formHandler = $this->get('prestashop.admin.import.form_handler');
- $finder = $this->get('prestashop.core.import.file_finder');
- $iniConfiguration = $this->get('prestashop.core.configuration.ini_configuration');
- $importConfigFactory = $this->get('prestashop.core.import.config_factory');
-
$importConfig = $importConfigFactory->buildFromRequest($request);
$form = $formHandler->getForm($importConfig);
$form->handleRequest($request);
@@ -83,7 +96,6 @@ public function importAction(Request $request)
}
$data = $form->getData();
-
if (!$errors = $formHandler->save($data)) {
// WIP import page 2 redirect
/*return $this->redirectToRoute(
@@ -91,10 +103,10 @@ public function importAction(Request $request)
[],
Response::HTTP_TEMPORARY_REDIRECT
);*/
- return $this->forwardRequestToLegacyResponse($request);
+ return $this->forwardRequestToLegacyResponse($request, $legacyContext);
}
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
}
$params = [
@@ -102,7 +114,7 @@ public function importAction(Request $request)
'importFileUploadUrl' => $this->generateUrl('admin_import_file_upload'),
'importFileNames' => $finder->getImportFileNames(),
'importDirectory' => $importDir->getDir(),
- 'maxFileUploadSize' => $iniConfiguration->getPostMaxSizeInBytes(),
+ 'maxFileUploadSize' => $this->getIniConfiguration()->getPostMaxSizeInBytes(),
];
return $this->render(
@@ -118,35 +130,36 @@ public function importAction(Request $request)
*
* @return JsonResponse
*/
- public function uploadAction(Request $request)
- {
+ public function uploadAction(
+ Request $request,
+ FileUploader $fileUploader,
+ ): JsonResponse {
$legacyController = $request->attributes->get('_legacy_controller');
if ($this->isDemoModeEnabled()) {
return $this->json([
- 'error' => $this->trans('This functionality has been disabled.', 'Admin.Notifications.Error'),
+ 'error' => $this->trans('This functionality has been disabled.', [], 'Admin.Notifications.Error'),
]);
}
- if (!in_array($this->authorizationLevel($legacyController), [
+ if (!in_array($this->getAuthorizationLevel($legacyController), [
Permission::LEVEL_CREATE,
Permission::LEVEL_UPDATE,
Permission::LEVEL_DELETE,
])) {
return $this->json([
- 'error' => $this->trans('You do not have permission to update this.', 'Admin.Notifications.Error'),
+ 'error' => $this->trans('You do not have permission to update this.', [], 'Admin.Notifications.Error'),
]);
}
$uploadedFile = $request->files->get('file');
if (!$uploadedFile instanceof UploadedFile) {
return $this->json([
- 'error' => $this->trans('No file was uploaded.', 'Admin.Advparameters.Notification'),
+ 'error' => $this->trans('No file was uploaded.', [], 'Admin.Advparameters.Notification'),
]);
}
try {
- $fileUploader = $this->get('prestashop.core.import.file_uploader');
$file = $fileUploader->upload($uploadedFile);
} catch (FileUploadException $e) {
return $this->json(['error' => $e->getMessage()]);
@@ -169,11 +182,12 @@ public function uploadAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_import')]
- public function deleteAction(Request $request)
- {
+ public function deleteAction(
+ Request $request,
+ FileRemoval $fileRemoval,
+ ): RedirectResponse {
$filename = $request->query->get('filename', $request->query->get('csvfilename'));
if ($filename) {
- $fileRemoval = $this->get('prestashop.core.import.file_removal');
$fileRemoval->remove($filename);
}
@@ -185,15 +199,15 @@ public function deleteAction(Request $request)
*
* @param Request $request
*
- * @return Response
+ * @return RedirectResponse|BinaryFileResponse
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_import')]
- public function downloadAction(Request $request)
- {
+ public function downloadAction(
+ Request $request,
+ ImportDirectory $importDirectory,
+ ): RedirectResponse|BinaryFileResponse {
if ($filename = $request->query->get('filename')) {
- $importDirectory = $this->get('prestashop.core.import.dir');
-
$response = new BinaryFileResponse($importDirectory . $filename);
$response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $filename);
@@ -208,12 +222,13 @@ public function downloadAction(Request $request)
*
* @param string $sampleName
*
- * @return Response
+ * @return RedirectResponse|BinaryFileResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute: 'admin_import')]
- public function downloadSampleAction($sampleName)
- {
- $sampleFileProvider = $this->get('prestashop.core.import.sample.file_provider');
+ public function downloadSampleAction(
+ string $sampleName,
+ SampleFileProvider $sampleFileProvider,
+ ): RedirectResponse|BinaryFileResponse {
$sampleFile = $sampleFileProvider->getFile($sampleName);
if (null === $sampleFile) {
@@ -234,14 +249,15 @@ public function downloadSampleAction($sampleName)
* @return JsonResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute: 'admin_import')]
- public function getAvailableEntityFieldsAction(Request $request)
- {
- $fieldsProviderFinder = $this->get('prestashop.core.import.fields_provider_finder');
+ public function getAvailableEntityFieldsAction(
+ Request $request,
+ EntityFieldsProviderFinder $fieldsProviderFinder,
+ ): JsonResponse {
try {
$fieldsProvider = $fieldsProviderFinder->find($request->get('entity'));
$fieldsCollection = $fieldsProvider->getCollection();
$entityFields = $fieldsCollection->toArray();
- } catch (NotSupportedImportEntityException $e) {
+ } catch (NotSupportedImportEntityException) {
$entityFields = [];
}
@@ -257,15 +273,19 @@ public function getAvailableEntityFieldsAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_import')]
- public function processImportAction(Request $request)
- {
+ public function processImportAction(
+ Request $request,
+ ImportRequestValidatorInterface $requestValidator,
+ ImporterInterface $importer,
+ ImportConfigFactoryInterface $importConfigFactory,
+ ImportRuntimeConfigFactoryInterface $runtimeConfigFactory,
+ ImportHandlerFinderInterface $importHandlerFinder,
+ ): JsonResponse {
$errors = [];
- $requestValidator = $this->get('prestashop.core.import.request_validator');
-
try {
$requestValidator->validate($request);
- } catch (UnavailableImportFileException $e) {
- $errors[] = $this->trans('To proceed, please upload a file first.', 'Admin.Advparameters.Notification');
+ } catch (UnavailableImportFileException) {
+ $errors[] = $this->trans('To proceed, please upload a file first.', [], 'Admin.Advparameters.Notification');
}
if (!empty($errors)) {
@@ -275,11 +295,6 @@ public function processImportAction(Request $request)
]);
}
- $importer = $this->get('prestashop.core.import.importer');
- $importConfigFactory = $this->get('prestashop.core.import.config_factory');
- $runtimeConfigFactory = $this->get('prestashop.core.import.runtime_config_factory');
- $importHandlerFinder = $this->get('prestashop.adapter.import.handler_finder');
-
$importConfig = $importConfigFactory->buildFromRequest($request);
$runtimeConfig = $runtimeConfigFactory->buildFromRequest($request);
@@ -299,13 +314,13 @@ public function processImportAction(Request $request)
*
* @return array
*/
- protected function getTemplateParams(Request $request)
+ protected function getTemplateParams(Request $request): array
{
$legacyController = $request->attributes->get('_legacy_controller');
return [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Import', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Import', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'enableSidebar' => true,
@@ -320,13 +335,14 @@ protected function getTemplateParams(Request $request)
*
* @return bool
*/
- private function checkImportFormSubmitPermissions($legacyController)
+ private function checkImportFormSubmitPermissions($legacyController): bool
{
if ($this->isDemoModeEnabled()) {
$this->addFlash(
'error',
$this->trans(
'This functionality has been disabled.',
+ [],
'Admin.Notifications.Error'
)
);
@@ -334,7 +350,7 @@ private function checkImportFormSubmitPermissions($legacyController)
return false;
}
- if (!in_array($this->authorizationLevel($legacyController), [
+ if (!in_array($this->getAuthorizationLevel($legacyController), [
Permission::LEVEL_CREATE,
Permission::LEVEL_UPDATE,
Permission::LEVEL_DELETE,
@@ -343,6 +359,7 @@ private function checkImportFormSubmitPermissions($legacyController)
'error',
$this->trans(
'You do not have permission to update this.',
+ [],
'Admin.Notifications.Error'
)
);
@@ -360,13 +377,14 @@ private function checkImportFormSubmitPermissions($legacyController)
*
* @return bool
*/
- private function checkImportDirectory(ImportDirectory $importDir)
+ private function checkImportDirectory(ImportDirectory $importDir): bool
{
if (!$importDir->exists()) {
$this->addFlash(
'error',
$this->trans(
'The import directory doesn\'t exist. Please check your file path.',
+ [],
'Admin.Advparameters.Notification'
)
);
@@ -379,6 +397,7 @@ private function checkImportDirectory(ImportDirectory $importDir)
'warning',
$this->trans(
'The import directory must be writable (CHMOD 755 / 777).',
+ [],
'Admin.Advparameters.Notification'
)
);
@@ -395,11 +414,9 @@ private function checkImportDirectory(ImportDirectory $importDir)
*
* @return RedirectResponse
*/
- private function forwardRequestToLegacyResponse(Request $request)
+ private function forwardRequestToLegacyResponse(Request $request, LegacyContext $legacyContext): RedirectResponse
{
$legacyController = $request->attributes->get('_legacy_controller');
- $legacyContext = $this->get('prestashop.adapter.legacy.context');
-
$legacyImportUrl = $legacyContext->getLegacyAdminLink($legacyController);
return $this->redirect($legacyImportUrl, Response::HTTP_TEMPORARY_REDIRECT);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
index c03bbbc9b20fd..de6f57a33b130 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
@@ -26,21 +26,29 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
+use PrestaShop\PrestaShop\Core\Import\Configuration\ImportConfigFactoryInterface;
+use PrestaShop\PrestaShop\Core\Import\EntityField\Provider\EntityFieldsProviderFinder;
use PrestaShop\PrestaShop\Core\Import\Exception\UnreadableFileException;
+use PrestaShop\PrestaShop\Core\Import\File\DataRow\DataRowCollectionPresenterInterface;
+use PrestaShop\PrestaShop\Core\Import\File\DataRow\Factory\DataRowCollectionFactoryInterface;
+use PrestaShop\PrestaShop\Core\Import\ImportDirectory;
use PrestaShop\PrestaShop\Core\Import\ImportSettings;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
+use PrestaShopBundle\Entity\Repository\ImportMatchRepository;
+use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Import\ImportFormHandlerInterface;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
use SplFileInfo;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Import" step 2 page display.
+ * Responsible for "Configure > Advanced Parameters > Import" step 2 page display.
*/
-class ImportDataConfigurationController extends FrameworkBundleAdminController
+class ImportDataConfigurationController extends PrestaShopAdminController
{
/**
* Shows import data page where the configuration of importable data and the final step of import is handled.
@@ -51,15 +59,16 @@ class ImportDataConfigurationController extends FrameworkBundleAdminController
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request)
- {
- $importDirectory = $this->get('prestashop.core.import.dir');
- $dataRowCollectionFactory = $this->get('prestashop.core.import.factory.data_row.collection_factory');
- $dataRowCollectionPresenter = $this->get('prestashop.core.import.data_row.collection_presenter');
- $entityFieldsProviderFinder = $this->get('prestashop.core.import.fields_provider_finder');
- $formHandler = $this->get('prestashop.admin.import_data_configuration.form_handler');
- $importConfigFactory = $this->get('prestashop.core.import.config_factory');
-
+ public function indexAction(
+ Request $request,
+ ImportDirectory $importDirectory,
+ DataRowCollectionFactoryInterface $dataRowCollectionFactory,
+ DataRowCollectionPresenterInterface $dataRowCollectionPresenter,
+ EntityFieldsProviderFinder $entityFieldsProviderFinder,
+ #[Autowire(service: 'prestashop.admin.import_data_configuration.form_handler')]
+ ImportFormHandlerInterface $formHandler,
+ ImportConfigFactoryInterface $importConfigFactory,
+ ): Response|RedirectResponse {
$importFile = new SplFileInfo($importDirectory . $request->getSession()->get('csv'));
$importConfig = $importConfigFactory->buildFromRequest($request);
$form = $formHandler->getForm($importConfig);
@@ -69,10 +78,10 @@ public function indexAction(Request $request)
$importFile,
ImportSettings::MAX_VISIBLE_ROWS
);
- } catch (UnreadableFileException $e) {
+ } catch (UnreadableFileException) {
$this->addFlash(
'error',
- $this->trans('The import file cannot be read.', 'Admin.Advparameters.Notification')
+ $this->trans('The import file cannot be read.', [], 'Admin.Advparameters.Notification')
);
return $this->redirectToRoute('admin_import');
@@ -87,7 +96,7 @@ public function indexAction(Request $request)
'importDataConfigurationForm' => $form->createView(),
'dataRowCollection' => $presentedDataRowCollection,
'maxVisibleColumns' => ImportSettings::MAX_VISIBLE_COLUMNS,
- 'layoutTitle' => $this->trans('Import', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Import', [], 'Admin.Navigation.Menu'),
'showPagingArrows' => $presentedDataRowCollection['row_size'] > ImportSettings::MAX_VISIBLE_COLUMNS,
'requiredFields' => $entityFieldsProvider->getCollection()->getRequiredFields(),
]
@@ -103,11 +112,13 @@ public function indexAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_import')]
- public function createAction(Request $request)
- {
- $formHandler = $this->get('prestashop.admin.import_data_configuration.form_handler');
- $importConfigFactory = $this->get('prestashop.core.import.config_factory');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.import_data_configuration.form_handler')]
+ ImportFormHandlerInterface $formHandler,
+ ImportConfigFactoryInterface $importConfigFactory,
+ ImportMatchRepository $importMatchRepository,
+ ): JsonResponse {
$importConfig = $importConfigFactory->buildFromRequest($request);
$form = $formHandler->getForm($importConfig);
$form->setData([
@@ -120,7 +131,6 @@ public function createAction(Request $request)
$matches = [];
if (!$errors) {
- $importMatchRepository = $this->get('prestashop.core.admin.import_match.repository');
$matches = $importMatchRepository->findAll();
}
@@ -139,9 +149,10 @@ public function createAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_import')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_import')]
- public function deleteAction(Request $request)
- {
- $importMatchRepository = $this->get('prestashop.core.admin.import_match.repository');
+ public function deleteAction(
+ Request $request,
+ ImportMatchRepository $importMatchRepository,
+ ): JsonResponse {
$importMatchRepository->deleteById($request->get('import_match_id'));
return $this->json([]);
@@ -155,9 +166,10 @@ public function deleteAction(Request $request)
* @return JsonResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute: 'admin_import')]
- public function getAction(Request $request)
- {
- $importMatchRepository = $this->get('prestashop.core.admin.import_match.repository');
+ public function getAction(
+ Request $request,
+ ImportMatchRepository $importMatchRepository,
+ ): JsonResponse {
$importMatch = $importMatchRepository->findOneById($request->get('import_match_id'));
return $this->json($importMatch);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
index 1fa155df4cf71..55be0667482f4 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
@@ -27,42 +27,43 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LogGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\LogsFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Entity\Repository\LogRepository;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Logs" page display.
+ * Responsible for "Configure > Advanced Parameters > Logs" page display.
*/
-class LogsController extends FrameworkBundleAdminController
+class LogsController extends PrestaShopAdminController
{
- /**
- * @var string the controller name for routing
- */
- public const CONTROLLER_NAME = 'AdminLogs';
-
/**
* @param LogsFilters $filters the list of filters from the request
*
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(LogsFilters $filters)
- {
- $gridLogFactory = $this->get('prestashop.core.grid.log_factory');
+ public function indexAction(
+ LogsFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.log_factory')]
+ GridFactoryInterface $gridLogFactory,
+ #[Autowire(service: 'prestashop.adapter.logs.form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
$grid = $gridLogFactory->getGrid($filters);
-
- $logsByEmailForm = $this->getFormHandler()->getForm();
+ $logsByEmailForm = $formHandler->getForm();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/LogsPage/index.html.twig', [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Logs', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Logs', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'enableSidebar' => true,
@@ -79,17 +80,18 @@ public function indexAction(LogsFilters $filters)
*/
#[DemoRestricted(redirectRoute: 'admin_logs_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_logs_index')]
- public function searchAction(Request $request)
- {
- $this->dispatchHook('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
-
- $responseBuilder = $this->get('prestashop.bundle.grid.response_builder');
-
- return $responseBuilder->buildSearchResponse(
- $this->get('prestashop.core.grid.definition.factory.logs'),
+ public function searchAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.grid.definition.factory.logs')]
+ GridDefinitionFactoryInterface $definitionFactory
+ ): RedirectResponse {
+ $this->dispatchHookWithParameters('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
+
+ return $this->buildSearchResponse(
+ $definitionFactory,
$request,
LogGridDefinitionFactory::GRID_ID,
- 'admin_logs_index'
+ 'admin_logs_index',
);
}
@@ -100,25 +102,28 @@ public function searchAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_logs_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_logs_index')]
- public function saveSettingsAction(Request $request)
- {
- $logsByEmailForm = $this->getFormHandler()->getForm();
+ public function saveSettingsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.logs.form_handler')]
+ FormHandlerInterface $formHandler,
+ ) {
+ $logsByEmailForm = $formHandler->getForm();
$logsByEmailForm->handleRequest($request);
- $this->dispatchHook('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
if ($logsByEmailForm->isSubmitted()) {
$data = $logsByEmailForm->getData();
- $saveErrors = $this->getFormHandler()->save($data);
+ $saveErrors = $formHandler->save($data);
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_logs_index');
}
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
return $this->redirectToRoute('admin_logs_index');
@@ -130,28 +135,13 @@ public function saveSettingsAction(Request $request)
* @throws \Doctrine\DBAL\Exception\InvalidArgumentException
*/
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_logs_index')]
- public function deleteAllAction()
- {
- $this->getLogRepository()->deleteAll();
+ public function deleteAllAction(
+ LogRepository $logRepository,
+ ): RedirectResponse {
+ $logRepository->deleteAll();
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_logs_index');
}
-
- /**
- * @return FormHandlerInterface the form handler to set the severity level
- */
- private function getFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.logs.form_handler');
- }
-
- /**
- * @return LogRepository the repository to retrieve logs from database
- */
- private function getLogRepository()
- {
- return $this->get('prestashop.core.admin.log.repository');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
index b469bfa2a1d50..cef3077f85622 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
@@ -28,42 +28,40 @@
use PrestaShop\PrestaShop\Adapter\Cache\MemcacheServerManager;
use PrestaShop\PrestaShop\Core\Security\Permission;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Performance" servers block management.
+ * Responsible for "Configure > Advanced Parameters > Performance" servers block management.
*/
-class MemcacheServerController extends FrameworkBundleAdminController
+class MemcacheServerController extends PrestaShopAdminController
{
public const CONTROLLER_NAME = 'AdminPerformance';
- /**
- * @return JsonResponse
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function listAction()
- {
- return new JsonResponse($this->getMemcacheManager()->getServers());
+ public function listAction(
+ #[Autowire(service: 'prestashop.adapter.memcache_server.manager')]
+ MemcacheServerManager $memcacheServerManager,
+ ): JsonResponse {
+ return new JsonResponse($memcacheServerManager->getServers());
}
- /**
- * @param Request $request
- *
- * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_servers_test')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function testAction(Request $request)
- {
+ public function testAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.memcache_server.manager')]
+ MemcacheServerManager $memcacheServerManager,
+ ): JsonResponse {
$queryValues = $request->query;
if ($queryValues->has('server_ip') && $queryValues->has('server_port')) {
- $isValid = $this->getMemcacheManager()
+ $isValid = $memcacheServerManager
->testConfiguration(
$queryValues->get('server_ip'),
$queryValues->getInt('server_port')
@@ -75,17 +73,15 @@ public function testAction(Request $request)
return new JsonResponse(['errors' => 'error'], Response::HTTP_BAD_REQUEST);
}
- /**
- * @param Request $request
- *
- * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_servers_test')]
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function addAction(Request $request)
- {
+ public function addAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.memcache_server.manager')]
+ MemcacheServerManager $memcacheServerManager,
+ ): JsonResponse {
if (!in_array(
- $this->authorizationLevel($this::CONTROLLER_NAME),
+ $this->getAuthorizationLevel($this::CONTROLLER_NAME),
[
Permission::LEVEL_READ,
Permission::LEVEL_UPDATE,
@@ -96,7 +92,7 @@ public function addAction(Request $request)
return new JsonResponse(
[
'errors' => [
- $this->trans('You do not have permission to create this.', 'Admin.Notifications.Error'),
+ $this->trans('You do not have permission to create this.', [], 'Admin.Notifications.Error'),
],
],
Response::HTTP_BAD_REQUEST
@@ -108,12 +104,12 @@ public function addAction(Request $request)
if ($postValues->has('server_ip')
&& $postValues->has('server_port')
&& $postValues->has('server_weight')
- && $this->getMemcacheManager()->testConfiguration(
+ && $memcacheServerManager->testConfiguration(
$postValues->get('server_ip'),
$postValues->getInt('server_port')
)
) {
- $server = $this->getMemcacheManager()
+ $server = $memcacheServerManager
->addServer(
$postValues->get('server_ip'),
$postValues->getInt('server_port'),
@@ -126,24 +122,22 @@ public function addAction(Request $request)
return new JsonResponse(
[
'errors' => [
- $this->trans('The Memcached server cannot be added.', 'Admin.Advparameters.Notification'),
+ $this->trans('The Memcached server cannot be added.', [], 'Admin.Advparameters.Notification'),
],
],
Response::HTTP_BAD_REQUEST
);
}
- /**
- * @param Request $request
- *
- * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_servers_test')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function deleteAction(Request $request)
- {
+ public function deleteAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.memcache_server.manager')]
+ MemcacheServerManager $memcacheServerManager,
+ ): JsonResponse {
if (!in_array(
- $this->authorizationLevel($this::CONTROLLER_NAME),
+ $this->getAuthorizationLevel($this::CONTROLLER_NAME),
[
Permission::LEVEL_READ,
Permission::LEVEL_UPDATE,
@@ -154,7 +148,7 @@ public function deleteAction(Request $request)
return new JsonResponse(
[
'errors' => [
- $this->trans('You do not have permission to delete this.', 'Admin.Notifications.Error'),
+ $this->trans('You do not have permission to delete this.', [], 'Admin.Notifications.Error'),
],
],
Response::HTTP_BAD_REQUEST
@@ -162,7 +156,7 @@ public function deleteAction(Request $request)
}
if ($request->request->has('server_id')) {
- $this->getMemcacheManager()->deleteServer($request->request->get('server_id'));
+ $memcacheServerManager->deleteServer($request->request->get('server_id'));
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
@@ -172,6 +166,7 @@ public function deleteAction(Request $request)
'errors' => [
$this->trans(
'There was an error when attempting to delete the Memcached server.',
+ [],
'Admin.Advparameters.Notification'
),
],
@@ -179,12 +174,4 @@ public function deleteAction(Request $request)
Response::HTTP_BAD_REQUEST
);
}
-
- /**
- * @return MemcacheServerManager
- */
- private function getMemcacheManager()
- {
- return $this->get('prestashop.adapter.memcache_server.manager');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
index ede2955c75b3b..4a0c0d26d1809 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
@@ -27,50 +27,68 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use Exception;
+use PrestaShop\PrestaShop\Adapter\Cache\MemcacheServerManager;
+use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
+use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
use PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Performance" page display.
+ * Responsible for "Configure > Advanced Parameters > Performance" page display.
*/
-class PerformanceController extends FrameworkBundleAdminController
+class PerformanceController extends PrestaShopAdminController
{
- public const CONTROLLER_NAME = 'AdminAdvancedParametersPerformance';
-
/**
* Displays the Performance main page.
*
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(): Response
- {
+ public function indexAction(
+ #[Autowire(service: 'prestashop.adapter.memcache_server.manager')]
+ MemcacheServerManager $memcacheServerManager,
+ #[Autowire(service: 'prestashop.adapter.performance.smarty.form_handler')]
+ FormHandlerInterface $smartyFormHandler,
+ #[Autowire(service: 'prestashop.adapter.performance.debug_mode.form_handler')]
+ FormHandlerInterface $debugModeFormHandler,
+ #[Autowire(service: 'prestashop.adapter.performance.optional_features.form_handler')]
+ FormHandlerInterface $optionalFeaturesFormHandler,
+ #[Autowire(service: 'prestashop.adapter.performance.ccc.form_handler')]
+ FormHandlerInterface $combineCompressCacheFormHandler,
+ #[Autowire(service: 'prestashop.adapter.performance.media_servers.form_handler')]
+ FormHandlerInterface $mediaServersFormHandler,
+ #[Autowire(service: 'prestashop.adapter.performance.caching.form_handler')]
+ FormHandlerInterface $cachingFormHandler,
+ #[Autowire(service: 'prestashop.admin.advanced_parameters.performance.memcache.form_builder')]
+ FormBuilderInterface $memcacheFormBuilder,
+ ): Response {
$toolbarButtons = [
'clear_cache' => [
'href' => $this->generateUrl('admin_clear_cache'),
- 'desc' => $this->trans('Clear cache', 'Admin.Advparameters.Feature'),
+ 'desc' => $this->trans('Clear cache', [], 'Admin.Advparameters.Feature'),
'icon' => 'delete',
],
];
- $smartyForm = $this->getSmartyFormHandler()->getForm();
- $debugModeForm = $this->getDebugModeFormHandler()->getForm();
- $optionalFeaturesForm = $this->getOptionalFeaturesFormHandler()->getForm();
- $combineCompressCacheForm = $this->getCombineCompressCacheFormHandler()->getForm();
- $mediaServersForm = $this->getMediaServersFormHandler()->getForm();
- $cachingForm = $this->getCachingFormHandler()->getForm();
- $memcacheForm = $this->getMemcacheFormBuilder()->getForm();
+ $smartyForm = $smartyFormHandler->getForm();
+ $debugModeForm = $debugModeFormHandler->getForm();
+ $optionalFeaturesForm = $optionalFeaturesFormHandler->getForm();
+ $combineCompressCacheForm = $combineCompressCacheFormHandler->getForm();
+ $mediaServersForm = $mediaServersFormHandler->getForm();
+ $cachingForm = $cachingFormHandler->getForm();
+ $memcacheForm = $memcacheFormBuilder->getForm();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/performance.html.twig', [
'layoutHeaderToolbarBtn' => $toolbarButtons,
- 'layoutTitle' => $this->trans('Performance', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Performance', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'enableSidebar' => true,
@@ -83,7 +101,7 @@ public function indexAction(): Response
'mediaServersForm' => $mediaServersForm->createView(),
'cachingForm' => $cachingForm->createView(),
'memcacheForm' => $memcacheForm->createView(),
- 'servers' => $this->get('prestashop.adapter.memcache_server.manager')->getServers(),
+ 'servers' => $memcacheServerManager->getServers(),
]);
}
@@ -96,11 +114,14 @@ public function indexAction(): Response
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processSmartyFormAction(Request $request)
- {
+ public function processSmartyFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.smarty.form_handler')]
+ FormHandlerInterface $smartyFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getSmartyFormHandler(),
+ $smartyFormHandler,
'Smarty'
);
}
@@ -114,11 +135,14 @@ public function processSmartyFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processDebugModeFormAction(Request $request)
- {
+ public function processDebugModeFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.debug_mode.form_handler')]
+ FormHandlerInterface $debugModeFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getDebugModeFormHandler(),
+ $debugModeFormHandler,
'DebugMode'
);
}
@@ -132,11 +156,14 @@ public function processDebugModeFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processOptionalFeaturesFormAction(Request $request)
- {
+ public function processOptionalFeaturesFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.optional_features.form_handler')]
+ FormHandlerInterface $optionalFeaturesFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getOptionalFeaturesFormHandler(),
+ $optionalFeaturesFormHandler,
'OptionalFeatures'
);
}
@@ -150,11 +177,14 @@ public function processOptionalFeaturesFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processCombineCompressCacheFormAction(Request $request)
- {
+ public function processCombineCompressCacheFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.ccc.form_handler')]
+ FormHandlerInterface $combineCompressCacheFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getCombineCompressCacheFormHandler(),
+ $combineCompressCacheFormHandler,
'CombineCompressCache'
);
}
@@ -168,11 +198,14 @@ public function processCombineCompressCacheFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processMediaServersFormAction(Request $request)
- {
+ public function processMediaServersFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.media_servers.form_handler')]
+ FormHandlerInterface $mediaServersFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getMediaServersFormHandler(),
+ $mediaServersFormHandler,
'MediaServers'
);
}
@@ -186,11 +219,14 @@ public function processMediaServersFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.')]
- public function processCachingFormAction(Request $request)
- {
+ public function processCachingFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.performance.caching.form_handler')]
+ FormHandlerInterface $cachingFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getCachingFormHandler(),
+ $cachingFormHandler,
'Caching'
);
}
@@ -204,14 +240,14 @@ public function processCachingFormAction(Request $request)
*
* @return RedirectResponse
*/
- protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName)
+ protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName): RedirectResponse
{
- $this->dispatchHook(
+ $this->dispatchHookWithParameters(
'actionAdminAdvancedParametersPerformanceControllerPostProcess' . $hookName . 'Before',
['controller' => $this]
);
- $this->dispatchHook('actionAdminAdvancedParametersPerformanceControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminAdvancedParametersPerformanceControllerPostProcessBefore', ['controller' => $this]);
$form = $formHandler->getForm();
$form->handleRequest($request);
@@ -221,31 +257,28 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
$saveErrors = $formHandler->save($data);
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
}
return $this->redirectToRoute('admin_performance');
}
- /**
- * @return RedirectResponse
- */
#[DemoRestricted(redirectRoute: 'admin_performance')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function disableNonBuiltInAction(): RedirectResponse
+ public function disableNonBuiltInAction(ModuleRepository $moduleRepository): RedirectResponse
{
try {
$bulkToggleModuleStatusCommand = new BulkToggleModuleStatusCommand(
- $this->get('prestashop.adapter.module.repository.module_repository')->getNonNativeModules(),
+ $moduleRepository->getNonNativeModules(),
false
);
- $this->getCommandBus()->handle($bulkToggleModuleStatusCommand);
+ $this->dispatchCommand($bulkToggleModuleStatusCommand);
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} catch (Exception $e) {
$this->addFlash('error', $e->getMessage());
}
@@ -253,71 +286,14 @@ public function disableNonBuiltInAction(): RedirectResponse
return $this->redirectToRoute('admin_performance');
}
- /**
- * @return RedirectResponse
- */
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to update this.', redirectRoute: 'admin_performance')]
- public function clearCacheAction()
- {
- $this->get('prestashop.core.cache.clearer.cache_clearer_chain')->clear();
- $this->addFlash('success', $this->trans('All caches cleared successfully', 'Admin.Advparameters.Notification'));
+ public function clearCacheAction(
+ #[Autowire(service: 'prestashop.core.cache.clearer.cache_clearer_chain')]
+ CacheClearerInterface $cacheClearer
+ ): RedirectResponse {
+ $cacheClearer->clear();
+ $this->addFlash('success', $this->trans('All caches cleared successfully', [], 'Admin.Advparameters.Notification'));
return $this->redirectToRoute('admin_performance');
}
-
- /**
- * @return FormHandlerInterface
- */
- protected function getSmartyFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.smarty.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getDebugModeFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.debug_mode.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getOptionalFeaturesFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.optional_features.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getCombineCompressCacheFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.ccc.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getMediaServersFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.media_servers.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getCachingFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.performance.caching.form_handler');
- }
-
- /**
- * @return FormBuilderInterface
- */
- protected function getMemcacheFormBuilder(): FormBuilderInterface
- {
- return $this->get('prestashop.admin.advanced_parameters.performance.memcache.form_builder');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PermissionController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PermissionController.php
index b7bc0bf5dfff2..76cd6f55ddca7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PermissionController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PermissionController.php
@@ -33,7 +33,7 @@
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\QueryResult\ConfigurablePermissions;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -44,7 +44,7 @@
* Allows permissions configuration for employee profiles in "Configure > Advanced Parameters > Team > Permissions"
*/
#[AllShopContext]
-class PermissionController extends FrameworkBundleAdminController
+class PermissionController extends PrestaShopAdminController
{
/**
* Show permissions configuration page
@@ -55,9 +55,9 @@ class PermissionController extends FrameworkBundleAdminController
public function indexAction(): Response
{
/** @var ConfigurablePermissions $configurablePermissions */
- $configurablePermissions = $this->getQueryBus()->handle(
+ $configurablePermissions = $this->dispatchQuery(
new GetPermissionsForConfiguration(
- (int) $this->getContext()->employee->id_profile
+ $this->getEmployeeContext()->getEmployee()->getProfileId()
)
);
@@ -66,14 +66,14 @@ public function indexAction(): Response
[
'help_link' => $this->generateSidebarLink('AdminAccess'),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('Permissions', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Permissions', [], 'Admin.Navigation.Menu'),
'configurablePermissions' => $configurablePermissions,
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => ($this->get('prestashop.adapter.multistore_feature')->isUsed()
- && $this->get('prestashop.adapter.shop.context')->isShopContext()),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed() && $this->getShopContext()->getShopConstraint()->getShopId() !== null,
]
);
}
@@ -93,7 +93,7 @@ public function updateTabPermissionsAction(Request $request): JsonResponse
}
try {
- $this->getQueryBus()->handle(
+ $this->dispatchCommand(
new UpdateTabPermissionsCommand(
$request->request->getInt('profile_id'),
$request->request->getInt('tab_id'),
@@ -127,7 +127,7 @@ public function updateModulePermissionsAction(Request $request): JsonResponse
}
try {
- $this->getQueryBus()->handle(
+ $this->dispatchCommand(
new UpdateModulePermissionsCommand(
$request->request->getInt('profile_id'),
$request->request->getInt('id_module'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
index 41d1eb8e91f84..bd82b5cfa2dcb 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
@@ -38,12 +38,18 @@
use PrestaShop\PrestaShop\Core\Domain\Profile\ProfileSettings;
use PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing;
use PrestaShop\PrestaShop\Core\Domain\Profile\QueryResult\EditableProfile;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactory;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\UploadedImageConstraintException;
use PrestaShop\PrestaShop\Core\Search\Filters\ProfileFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -53,39 +59,34 @@
* "Configure > Advanced parameters > Team > Roles" page.
*/
#[AllShopContext]
-class ProfileController extends FrameworkBundleAdminController
+class ProfileController extends PrestaShopAdminController
{
- /**
- * Show profiles listing page.
- *
- * @param ProfileFilters $filters
- *
- * @return Response
- */
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(ProfileFilters $filters)
- {
- $profilesGridFactory = $this->get('prestashop.core.grid.factory.profiles');
-
+ public function indexAction(
+ ProfileFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.profiles')]
+ GridFactoryInterface $profilesGridFactory,
+ ): Response {
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/Profiles/index.html.twig',
[
'layoutHeaderToolbarBtn' => [
'add' => [
'href' => $this->generateUrl('admin_profiles_create'),
- 'desc' => $this->trans('Add new role', 'Admin.Advparameters.Feature'),
+ 'desc' => $this->trans('Add new role', [], 'Admin.Advparameters.Feature'),
'icon' => 'add_circle_outline',
],
],
'help_link' => $this->generateSidebarLink('AdminProfiles'),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('Roles', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Roles', [], 'Admin.Navigation.Menu'),
'grid' => $this->presentGrid($profilesGridFactory->getGrid($filters)),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
]
);
}
@@ -98,12 +99,13 @@ public function indexAction(ProfileFilters $filters)
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function searchAction(Request $request)
- {
- $definitionFactory = $this->get('prestashop.core.grid.definition.factory.profile');
+ public function searchAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.grid.definition.factory.profile')]
+ GridDefinitionFactoryInterface $definitionFactory,
+ GridFilterFormFactory $gridFilterFormFactory,
+ ): RedirectResponse {
$definitionFactory = $definitionFactory->getDefinition();
-
- $gridFilterFormFactory = $this->get('prestashop.core.grid.filter.form_factory');
$searchParametersForm = $gridFilterFormFactory->create($definitionFactory);
$searchParametersForm->handleRequest($request);
@@ -125,17 +127,21 @@ public function searchAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_profiles_index')]
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function createAction(Request $request)
- {
- $form = $this->get('prestashop.core.form.identifiable_object.builder.profile_form_builder')->getForm();
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.profile_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.profile_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
+ $form = $formBuilder->getForm();
$form->handleRequest($request);
try {
- $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.profile_form_handler');
$handlerResult = $formHandler->handle($form);
if (null !== $handlerResult->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_profiles_index');
}
@@ -145,14 +151,15 @@ public function createAction(Request $request)
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/Profiles/create.html.twig', [
'profileForm' => $form->createView(),
- 'layoutTitle' => $this->trans('New role', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New role', [], 'Admin.Navigation.Menu'),
'help_link' => $this->generateSidebarLink('AdminProfiles'),
'enableSidebar' => true,
'multistoreInfoTip' => $this->trans(
'Note that this feature is only available in the "all stores" context. It will be added to all your stores.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
]);
}
@@ -166,11 +173,14 @@ public function createAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_profiles_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function editAction($profileId, Request $request)
- {
- $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.profile_form_handler');
- $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.profile_form_builder');
-
+ public function editAction(
+ int $profileId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.profile_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.profile_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response {
try {
$form = $formBuilder->getFormFor((int) $profileId);
} catch (Exception $exception) {
@@ -187,7 +197,7 @@ public function editAction($profileId, Request $request)
$handlerResult = $formHandler->handleFor((int) $profileId, $form);
if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_profiles_index');
}
@@ -200,16 +210,16 @@ public function editAction($profileId, Request $request)
}
/** @var EditableProfile $editableProfile */
- $editableProfile = $this->getQueryBus()->handle(new GetProfileForEditing((int) $profileId));
+ $editableProfile = $this->dispatchQuery(new GetProfileForEditing($profileId));
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/Profiles/edit.html.twig', [
'profileForm' => $form->createView(),
'layoutTitle' => $this->trans(
'Editing %role_name% role',
- 'Admin.Navigation.Menu',
[
- '%role_name%' => $editableProfile->getLocalizedNames()[$this->getContextLangId()],
- ]
+ '%role_name%' => $editableProfile->getLocalizedNames()[$this->getLanguageContext()->getId()],
+ ],
+ 'Admin.Navigation.Menu',
),
'help_link' => $this->generateSidebarLink('AdminProfiles'),
'enableSidebar' => true,
@@ -225,14 +235,14 @@ public function editAction($profileId, Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_profiles_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function deleteAction($profileId)
+ public function deleteAction(int $profileId): RedirectResponse
{
try {
$deleteProfileCommand = new DeleteProfileCommand($profileId);
- $this->getCommandBus()->handle($deleteProfileCommand);
+ $this->dispatchCommand($deleteProfileCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (ProfileException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
}
@@ -249,14 +259,14 @@ public function deleteAction($profileId)
*/
#[DemoRestricted(redirectRoute: 'admin_profiles_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function bulkDeleteAction(Request $request)
+ public function bulkDeleteAction(Request $request): RedirectResponse
{
$profileIds = $request->request->all('profile_bulk');
try {
- $this->getCommandBus()->handle(new BulkDeleteProfileCommand($profileIds));
+ $this->dispatchCommand(new BulkDeleteProfileCommand($profileIds));
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (ProfileException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
}
@@ -265,44 +275,49 @@ public function bulkDeleteAction(Request $request)
}
/**
- * Get human readable error for exception.
+ * Get human-readable error for exception.
*
* @return array
*/
- protected function getErrorMessages()
+ protected function getErrorMessages(): array
{
return [
UploadedImageConstraintException::class => $this->trans(
'Image format not recognized, allowed formats are: %s',
+ [implode(', ', ImageManager::EXTENSIONS_SUPPORTED)],
'Admin.Notifications.Error',
- [implode(', ', ImageManager::EXTENSIONS_SUPPORTED)]
),
ProfileConstraintException::class => [
ProfileConstraintException::INVALID_NAME => $this->trans(
'This field cannot be longer than %limit% characters (incl. HTML tags)',
+ ['%limit%' => ProfileSettings::NAME_MAX_LENGTH],
'Admin.Notifications.Error',
- ['%limit%' => ProfileSettings::NAME_MAX_LENGTH]
),
],
ProfileNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CannotDeleteSuperAdminProfileException::class => $this->trans(
'For security reasons, you cannot delete the Administrator\'s role.',
+ [],
'Admin.Advparameters.Notification'
),
FailedToDeleteProfileException::class => [
FailedToDeleteProfileException::UNEXPECTED_ERROR => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
FailedToDeleteProfileException::PROFILE_IS_ASSIGNED_TO_EMPLOYEE => $this->trans(
'Role(s) assigned to employee cannot be deleted',
+ [],
'Admin.Notifications.Error'
),
FailedToDeleteProfileException::PROFILE_IS_ASSIGNED_TO_CONTEXT_EMPLOYEE => $this->trans(
'You cannot delete your own role',
+ [],
'Admin.Notifications.Error'
),
],
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SecurityController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SecurityController.php
index ec56887390177..59bcbd54be7ed 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SecurityController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SecurityController.php
@@ -44,11 +44,13 @@
use PrestaShop\PrestaShop\Core\Domain\Security\Exception\SessionNotFoundException;
use PrestaShop\PrestaShop\Core\Exception\CoreException;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\Security\Session\CustomerFilters;
use PrestaShop\PrestaShop\Core\Search\Filters\Security\Session\EmployeeFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -58,7 +60,7 @@
* "Configure > Advanced parameters > Security" page.
*/
#[AllShopContext]
-class SecurityController extends FrameworkBundleAdminController
+class SecurityController extends PrestaShopAdminController
{
/**
* Show sessions listing page.
@@ -66,26 +68,31 @@ class SecurityController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request): Response
- {
- $generalForm = $this->getGeneralFormHandler()->getForm();
- $passwordPolicyForm = $this->getPasswordPolicyFormHandler()->getForm();
+ public function indexAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.security.general.form_handler')]
+ FormHandlerInterface $generalFormHandler,
+ #[Autowire(service: 'prestashop.adapter.security.password_policy.form_handler')]
+ FormHandlerInterface $passwordPolicyFormHandler,
+ ): Response {
+ $generalForm = $generalFormHandler->getForm();
+ $passwordPolicyForm = $passwordPolicyFormHandler->getForm();
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/Security/index.html.twig',
[
'enableSidebar' => true,
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Security', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Security', [], 'Admin.Navigation.Menu'),
'passwordPolicyForm' => $passwordPolicyForm->createView(),
'generalForm' => $generalForm->createView(),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
- 'multistoreIsUsed' => ($this->get('prestashop.adapter.multistore_feature')->isUsed()
- && $this->get('prestashop.adapter.shop.context')->isShopContext()),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed() && $this->getShopContext()->getShopConstraint()->getShopId() !== null,
]
);
}
@@ -98,11 +105,14 @@ public function indexAction(Request $request): Response
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))")]
- public function processGeneralFormAction(Request $request): RedirectResponse
- {
+ public function processGeneralFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.security.general.form_handler')]
+ FormHandlerInterface $generalFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getGeneralFormHandler(),
+ $generalFormHandler,
'actionAdminSecurityControllerPostProcessGeneralBefore'
);
}
@@ -115,11 +125,14 @@ public function processGeneralFormAction(Request $request): RedirectResponse
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))")]
- public function processPasswordPolicyFormAction(Request $request): RedirectResponse
- {
+ public function processPasswordPolicyFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.security.password_policy.form_handler')]
+ FormHandlerInterface $passwordPolicyFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getPasswordPolicyFormHandler(),
+ $passwordPolicyFormHandler,
'actionAdminSecurityControllerPostProcessPasswordPolicyBefore'
);
}
@@ -135,12 +148,12 @@ public function processPasswordPolicyFormAction(Request $request): RedirectRespo
*/
protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName): RedirectResponse
{
- $this->dispatchHook(
+ $this->dispatchHookWithParameters(
$hookName,
['controller' => $this]
);
- $this->dispatchHook('actionAdminSecurityControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminSecurityControllerPostProcessBefore', ['controller' => $this]);
$form = $formHandler->getForm();
$form->handleRequest($request);
@@ -150,9 +163,9 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
$saveErrors = $formHandler->save($data);
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
}
@@ -167,23 +180,25 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function employeeSessionAction(Request $request, EmployeeFilters $filters): Response
- {
- $sessionsEmployeesGridFactory = $this->get('prestashop.core.grid.factory.security.session.employee');
-
+ public function employeeSessionAction(
+ Request $request,
+ EmployeeFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.security.session.employee')]
+ GridFactoryInterface $sessionsEmployeesGridFactory,
+ ): Response {
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/Security/employees.html.twig',
[
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
- 'layoutTitle' => $this->trans('Employee sessions', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Employee sessions', [], 'Admin.Navigation.Menu'),
'grid' => $this->presentGrid($sessionsEmployeesGridFactory->getGrid($filters)),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => ($this->get('prestashop.adapter.multistore_feature')->isUsed()
- && $this->get('prestashop.adapter.shop.context')->isShopContext()),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed() && $this->getShopContext()->getShopConstraint()->getShopId() !== null,
]
);
}
@@ -196,23 +211,25 @@ public function employeeSessionAction(Request $request, EmployeeFilters $filters
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function customerSessionAction(Request $request, CustomerFilters $filters): Response
- {
- $sessionsCustomersGridFactory = $this->get('prestashop.core.grid.factory.security.session.customer');
-
+ public function customerSessionAction(
+ Request $request,
+ CustomerFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.security.session.customer')]
+ GridFactoryInterface $sessionsCustomersGridFactory,
+ ): Response {
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/Security/customers.html.twig',
[
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
- 'layoutTitle' => $this->trans('Customer sessions', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Customer sessions', [], 'Admin.Navigation.Menu'),
'grid' => $this->presentGrid($sessionsCustomersGridFactory->getGrid($filters)),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => ($this->get('prestashop.adapter.multistore_feature')->isUsed()
- && $this->get('prestashop.adapter.shop.context')->isShopContext()),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed() && $this->getShopContext()->getShopConstraint()->getShopId() !== null,
]
);
}
@@ -226,9 +243,9 @@ public function clearCustomerSessionAction(): RedirectResponse
try {
$clearSessionCommand = new ClearOutdatedCustomerSessionCommand();
- $this->getCommandBus()->handle($clearSessionCommand);
+ $this->dispatchCommand($clearSessionCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -245,9 +262,9 @@ public function clearEmployeeSessionAction(): RedirectResponse
try {
$clearSessionCommand = new ClearOutdatedEmployeeSessionCommand();
- $this->getCommandBus()->handle($clearSessionCommand);
+ $this->dispatchCommand($clearSessionCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -268,9 +285,9 @@ public function deleteEmployeeSessionAction(int $sessionId): RedirectResponse
try {
$deleteSessionCommand = new DeleteEmployeeSessionCommand($sessionId);
- $this->getCommandBus()->handle($deleteSessionCommand);
+ $this->dispatchCommand($deleteSessionCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -291,9 +308,9 @@ public function deleteCustomerSessionAction(int $sessionId): RedirectResponse
try {
$deleteSessionCommand = new DeleteCustomerSessionCommand($sessionId);
- $this->getCommandBus()->handle($deleteSessionCommand);
+ $this->dispatchCommand($deleteSessionCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -316,9 +333,9 @@ public function bulkDeleteCustomerSessionAction(Request $request): RedirectRespo
try {
$deleteSessionsCommand = new BulkDeleteCustomerSessionsCommand($sessionIds);
- $this->getCommandBus()->handle($deleteSessionsCommand);
+ $this->dispatchCommand($deleteSessionsCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -341,9 +358,9 @@ public function bulkDeleteEmployeeSessionAction(Request $request): RedirectRespo
try {
$deleteSessionsCommand = new BulkDeleteEmployeeSessionsCommand($sessionIds);
- $this->getCommandBus()->handle($deleteSessionsCommand);
+ $this->dispatchCommand($deleteSessionsCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (CoreException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -352,7 +369,7 @@ public function bulkDeleteEmployeeSessionAction(Request $request): RedirectRespo
}
/**
- * Get human readable error for exception.
+ * Get human-readable error for exception.
*
* @param Exception $e
*
@@ -363,62 +380,53 @@ protected function getErrorMessages(Exception $e): array
return [
SessionNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CannotDeleteCustomerSessionException::class => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
CannotClearCustomerSessionException::class => $this->trans(
'An error occurred while clearing objects.',
+ [],
'Admin.Notifications.Error'
),
CannotBulkDeleteCustomerSessionException::class => $this->trans(
'%s: %s',
- 'Admin.Global',
[
$this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof CannotBulkDeleteCustomerSessionException ? implode(', ', $e->getSessionIds()) : '',
- ]
+ ],
+ 'Admin.Global',
),
CannotDeleteEmployeeSessionException::class => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
CannotClearEmployeeSessionException::class => $this->trans(
'An error occurred while clearing objects.',
+ [],
'Admin.Notifications.Error'
),
CannotBulkDeleteEmployeeSessionException::class => $this->trans(
'%s: %s',
- 'Admin.Global',
[
$this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof CannotBulkDeleteEmployeeSessionException ? implode(', ', $e->getSessionIds()) : '',
- ]
+ ],
+ 'Admin.Global',
),
];
}
-
- /**
- * @return FormHandlerInterface
- */
- protected function getGeneralFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.security.general.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getPasswordPolicyFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.security.password_policy.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
index 342e41f3ccbd3..5f06e88651cf7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
@@ -30,14 +30,14 @@
use Exception;
use PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
/**
* Admin controller to manage shops.
*/
-class ShopController extends FrameworkBundleAdminController
+class ShopController extends PrestaShopAdminController
{
/**
* Search for shops by query.
@@ -50,29 +50,15 @@ public function searchAction(string $searchTerm): JsonResponse
{
try {
$result = [];
- $result['shops'] = $this->getQueryBus()->handle(new SearchShops((string) $searchTerm));
+ $result['shops'] = $this->dispatchQuery(new SearchShops((string) $searchTerm));
$statusCode = empty($result['shops']) ? Response::HTTP_NOT_FOUND : Response::HTTP_OK;
} catch (Exception $e) {
return $this->json(
- ['message' => $this->getErrorMessage($e)],
+ ['message' => $this->getErrorMessageForException($e)],
Response::HTTP_INTERNAL_SERVER_ERROR
);
}
return $this->json($result['shops'], $statusCode);
}
-
- /**
- * @param Exception $e
- *
- * @return string
- */
- private function getErrorMessage(Exception $e): string
- {
- return $this->getFallbackErrorMessage(
- $e::class,
- $e->getCode(),
- $e->getMessage()
- );
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
index 455d12cb7b4bb..ab7989c76f7b5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
@@ -43,12 +43,16 @@
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\ValueObject\SqlRequestId;
use PrestaShop\PrestaShop\Core\Export\Exception\FileWritingException;
-use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\RequestSqlFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Core\SqlManager\Exporter\SqlRequestExporter;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\File\Stream;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -60,7 +64,7 @@
/**
* Responsible of "Configure > Advanced Parameters > Database -> SQL Manager" page.
*/
-class SqlManagerController extends FrameworkBundleAdminController
+class SqlManagerController extends PrestaShopAdminController
{
/**
* Show list of saved SQL's.
@@ -71,27 +75,31 @@ class SqlManagerController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, RequestSqlFilters $filters)
- {
+ public function indexAction(
+ Request $request,
+ RequestSqlFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.request_sql')]
+ GridFactoryInterface $gridLogFactory,
+ #[Autowire(service: 'prestashop.admin.request_sql_settings.form_handler')]
+ ConfigurationFormHandlerInterface $settingsFormHandler,
+ ): Response {
// handle "Export to SQL manager" action from legacy pages
if ($request->query->has('addrequest_sql')) {
return $this->forward('PrestaShopBundle:Admin\Configure\AdvancedParameters\RequestSql:create');
}
- $gridLogFactory = $this->get('prestashop.core.grid.factory.request_sql');
$grid = $gridLogFactory->getGrid($filters);
-
- $settingsForm = $this->getSettingsFormHandler()->getForm();
+ $settingsForm = $settingsFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/RequestSql/index.html.twig', [
'layoutHeaderToolbarBtn' => [
'add' => [
'href' => $this->generateUrl('admin_sql_requests_create'),
- 'desc' => $this->trans('Add new SQL query', 'Admin.Advparameters.Feature'),
+ 'desc' => $this->trans('Add new SQL query', [], 'Admin.Advparameters.Feature'),
'icon' => 'add_circle_outline',
],
],
- 'layoutTitle' => $this->trans('SQL manager', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('SQL manager', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'requestSqlSettingsForm' => $settingsForm->createView(),
@@ -108,17 +116,19 @@ public function indexAction(Request $request, RequestSqlFilters $filters)
*/
#[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_sql_requests_index')]
- public function processFormAction(Request $request)
- {
- $handler = $this->getSettingsFormHandler();
- $settingForm = $handler->getForm();
+ public function processFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.request_sql_settings.form_handler')]
+ ConfigurationFormHandlerInterface $settingsFormHandler,
+ ): RedirectResponse {
+ $settingForm = $settingsFormHandler->getForm();
$settingForm->handleRequest($request);
if ($settingForm->isSubmitted()) {
- if (!$errors = $handler->save($settingForm->getData())) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ if (!$errors = $settingsFormHandler->save($settingForm->getData())) {
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
}
}
@@ -130,21 +140,26 @@ public function processFormAction(Request $request)
*
* @param Request $request
*
- * @return Response
+ * @return Response|RedirectResponse
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", message: 'You do not have permission to create this.', redirectRoute: 'admin_sql_requests_index')]
- public function createAction(Request $request)
- {
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.builder.sql_request_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.sql_request_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response|RedirectResponse {
$data = $this->getSqlRequestDataFromRequest($request);
- $sqlRequestForm = $this->getSqlRequestFormBuilder()->getForm($data);
+ $sqlRequestForm = $formBuilder->getForm($data);
$sqlRequestForm->handleRequest($request);
try {
- $result = $this->getSqlRequestFormHandler()->handle($sqlRequestForm);
+ $result = $formHandler->handle($sqlRequestForm);
if (null !== $result->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_sql_requests_index');
}
@@ -153,16 +168,17 @@ public function createAction(Request $request)
}
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/RequestSql/create.html.twig', [
- 'layoutTitle' => $this->trans('New SQL query', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New SQL query', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'requestSqlForm' => $sqlRequestForm->createView(),
'dbTableNames' => $this->getDatabaseTables(),
'multistoreInfoTip' => $this->trans(
'Note that this feature is only available in the "all stores" context. It will be added to all your stores.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
]);
}
@@ -172,27 +188,33 @@ public function createAction(Request $request)
* @param int $sqlRequestId
* @param Request $request
*
- * @return Response
+ * @return Response|RedirectResponse
*/
#[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_sql_requests_index')]
- public function editAction(int $sqlRequestId, Request $request)
- {
- $sqlRequestForm = $this->getSqlRequestFormBuilder()->getFormFor($sqlRequestId);
+ public function editAction(
+ int $sqlRequestId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.builder.sql_request_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.sql_request_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response|RedirectResponse {
+ $sqlRequestForm = $formBuilder->getFormFor($sqlRequestId);
$sqlRequestForm->handleRequest($request);
try {
- $result = $this->getSqlRequestFormHandler()->handleFor($sqlRequestId, $sqlRequestForm);
+ $result = $formHandler->handleFor($sqlRequestId, $sqlRequestForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_sql_requests_index');
}
} catch (SqlRequestNotFoundException $e) {
$this->addFlash(
'error',
- $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error')
+ $this->trans('The object cannot be loaded (or found).', [], 'Admin.Notifications.Error')
);
return $this->redirectToRoute('admin_sql_requests_index');
@@ -201,7 +223,7 @@ public function editAction(int $sqlRequestId, Request $request)
}
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/RequestSql/edit.html.twig', [
- 'layoutTitle' => $this->trans('Editing SQL query %query%', 'Admin.Navigation.Menu', ['%query%' => $sqlRequestForm->getData()['name']]),
+ 'layoutTitle' => $this->trans('Editing SQL query %query%', ['%query%' => $sqlRequestForm->getData()['name']], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'requestSqlForm' => $sqlRequestForm->createView(),
@@ -218,16 +240,16 @@ public function editAction(int $sqlRequestId, Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.', redirectRoute: 'admin_sql_requests_index')]
- public function deleteAction(int $sqlRequestId)
+ public function deleteAction(int $sqlRequestId): RedirectResponse
{
try {
$deleteSqlRequestCommand = new DeleteSqlRequestCommand(
new SqlRequestId($sqlRequestId)
);
- $this->getCommandBus()->handle($deleteSqlRequestCommand);
+ $this->dispatchCommand($deleteSqlRequestCommand);
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (SqlRequestException $e) {
$this->addFlash('error', $this->handleException($e));
}
@@ -244,17 +266,17 @@ public function deleteAction(int $sqlRequestId)
*/
#[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.', redirectRoute: 'admin_sql_requests_index')]
- public function deleteBulkAction(Request $request)
+ public function deleteBulkAction(Request $request): RedirectResponse
{
try {
$requestSqlIds = $this->getBulkSqlRequestFromRequest($request);
$bulkDeleteSqlRequestCommand = new BulkDeleteSqlRequestCommand($requestSqlIds);
- $this->getCommandBus()->handle($bulkDeleteSqlRequestCommand);
+ $this->dispatchCommand($bulkDeleteSqlRequestCommand);
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
} catch (SqlRequestException $e) {
$this->addFlash('error', $this->handleException($e));
@@ -272,12 +294,12 @@ public function deleteBulkAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'You do not have permission to view this.', redirectRoute: 'admin_sql_requests_index')]
- public function viewAction(Request $request, int $sqlRequestId)
+ public function viewAction(Request $request, int $sqlRequestId): Response
{
try {
$query = new GetSqlRequestExecutionResult($sqlRequestId);
- $sqlRequestExecutionResult = $this->getQueryBus()->handle($query);
+ $sqlRequestExecutionResult = $this->dispatchQuery($query);
} catch (SqlRequestException $e) {
$this->addFlash('error', $this->handleViewException($e));
@@ -286,7 +308,7 @@ public function viewAction(Request $request, int $sqlRequestId)
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/RequestSql/view.html.twig', [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Result of SQL query', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Result of SQL query', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'sqlRequestResult' => $sqlRequestExecutionResult,
@@ -302,22 +324,22 @@ public function viewAction(Request $request, int $sqlRequestId)
*/
#[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute: 'admin_sql_requests_index')]
- public function exportAction(int $sqlRequestId)
- {
- $requestSqlExporter = $this->get('prestashop.core.sql_manager.exporter.sql_request_exporter');
-
+ public function exportAction(
+ int $sqlRequestId,
+ SqlRequestExporter $sqlRequestExporter,
+ ): RedirectResponse|BinaryFileResponse {
try {
$query = new GetSqlRequestExecutionResult($sqlRequestId);
/** @var SqlRequestExecutionResult $sqlRequestExecutionResult */
- $sqlRequestExecutionResult = $this->getQueryBus()->handle($query);
+ $sqlRequestExecutionResult = $this->dispatchQuery($query);
- $exportedFile = $requestSqlExporter->exportToFile(
+ $exportedFile = $sqlRequestExporter->exportToFile(
$query->getSqlRequestId(),
$sqlRequestExecutionResult
);
/** @var SqlRequestSettings $sqlRequestSettings */
- $sqlRequestSettings = $this->getQueryBus()->handle(new GetSqlRequestSettings());
+ $sqlRequestSettings = $this->dispatchQuery(new GetSqlRequestSettings());
} catch (SqlRequestException $e) {
$this->addFlash('error', $this->handleExportException($e));
@@ -340,51 +362,15 @@ public function exportAction(int $sqlRequestId)
* @return JsonResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute: 'admin_sql_requests_index')]
- public function ajaxTableColumnsAction($mySqlTableName)
+ public function ajaxTableColumnsAction(string $mySqlTableName): JsonResponse
{
$query = new GetDatabaseTableFieldsList($mySqlTableName);
/** @var DatabaseTableFields $databaseFields */
- $databaseFields = $this->getQueryBus()->handle($query);
+ $databaseFields = $this->dispatchQuery($query);
return $this->json(['columns' => $databaseFields->getFields()]);
}
- /**
- * Get request SQL repository.
- *
- * @return \PrestaShopBundle\Entity\Repository\RequestSqlRepository
- */
- protected function getRepository()
- {
- return $this->get('prestashop.core.admin.request_sql.repository');
- }
-
- /**
- * Get Request SQL settings form handler.
- *
- * @return FormHandlerInterface
- */
- protected function getSettingsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.request_sql_settings.form_handler');
- }
-
- /**
- * @return \PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface
- */
- protected function getSqlRequestFormHandler()
- {
- return $this->get('prestashop.core.form.identifiable_object.sql_request_form_handler');
- }
-
- /**
- * @return FormBuilderInterface
- */
- protected function getSqlRequestFormBuilder()
- {
- return $this->get('prestashop.core.form.builder.sql_request_form_builder');
- }
-
/**
* When "Export to SQL Manager" feature is used,
* it adds "name" and "sql" to request's POST data
@@ -395,7 +381,7 @@ protected function getSqlRequestFormBuilder()
*
* @return array
*/
- protected function getSqlRequestDataFromRequest(Request $request)
+ protected function getSqlRequestDataFromRequest(Request $request): array
{
if ($request->request->has('sql') || $request->request->has('name')) {
return [
@@ -414,20 +400,20 @@ protected function getSqlRequestDataFromRequest(Request $request)
*
* @return string Error message
*/
- protected function handleException(SqlRequestException $e)
+ protected function handleException(SqlRequestException $e): string
{
$code = $e->getCode();
$type = $e::class;
$exceptionMessages = [
- SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
+ SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', [], 'Admin.Notifications.Error'),
SqlRequestConstraintException::class => $e->getMessage(),
- SqlRequestException::class => $this->trans('An error occurred while deleting the object.', 'Admin.Notifications.Error'),
+ SqlRequestException::class => $this->trans('An error occurred while deleting the object.', [], 'Admin.Notifications.Error'),
];
$deleteExceptionMessages = [
- CannotDeleteSqlRequestException::CANNOT_SINGLE_DELETE => $this->trans('An error occurred while deleting the object.', 'Admin.Notifications.Error'),
- CannotDeleteSqlRequestException::CANNOT_BULK_DELETE => $this->trans('An error occurred while deleting this selection.', 'Admin.Notifications.Error'),
+ CannotDeleteSqlRequestException::CANNOT_SINGLE_DELETE => $this->trans('An error occurred while deleting the object.', [], 'Admin.Notifications.Error'),
+ CannotDeleteSqlRequestException::CANNOT_BULK_DELETE => $this->trans('An error occurred while deleting this selection.', [], 'Admin.Notifications.Error'),
];
if (CannotDeleteSqlRequestException::class === $type
@@ -440,7 +426,7 @@ protected function handleException(SqlRequestException $e)
return $exceptionMessages[$type];
}
- return $this->getFallbackErrorMessage($type, $code);
+ return $this->getErrorMessageForException($e);
}
/**
@@ -450,19 +436,19 @@ protected function handleException(SqlRequestException $e)
*
* @return string
*/
- protected function handleViewException(SqlRequestException $e)
+ protected function handleViewException(SqlRequestException $e): string
{
$type = $e::class;
$exceptionMessages = [
- SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
+ SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', [], 'Admin.Notifications.Error'),
];
if (isset($exceptionMessages[$type])) {
return $exceptionMessages[$type];
}
- return $this->getFallbackErrorMessage($type, $e->getCode());
+ return $this->getErrorMessageForException($e);
}
/**
@@ -470,7 +456,7 @@ protected function handleViewException(SqlRequestException $e)
*
* @return string Error message
*/
- protected function handleExportException(Exception $e)
+ protected function handleExportException(Exception $e): string
{
$type = $e::class;
@@ -482,7 +468,7 @@ protected function handleExportException(Exception $e)
return $this->handleDomainExportException($e);
}
- return $this->getFallbackErrorMessage($type, $e->getCode());
+ return $this->getErrorMessageForException($e);
}
/**
@@ -490,19 +476,19 @@ protected function handleExportException(Exception $e)
*
* @return string Error message
*/
- protected function handleApplicationExportException(FileWritingException $e)
+ protected function handleApplicationExportException(FileWritingException $e): string
{
$code = $e->getCode();
$applicationErrors = [
- FileWritingException::CANNOT_OPEN_FILE_FOR_WRITING => $this->trans('Cannot open export file for writing', 'Admin.Notifications.Error'),
+ FileWritingException::CANNOT_OPEN_FILE_FOR_WRITING => $this->trans('Cannot open export file for writing', [], 'Admin.Notifications.Error'),
];
if (isset($applicationErrors[$code])) {
return $applicationErrors[$code];
}
- return $this->getFallbackErrorMessage($e::class, $code);
+ return $this->getErrorMessageForException($e);
}
/**
@@ -510,28 +496,28 @@ protected function handleApplicationExportException(FileWritingException $e)
*
* @return string
*/
- protected function handleDomainExportException(SqlRequestException $e)
+ protected function handleDomainExportException(SqlRequestException $e): string
{
$type = $e::class;
$domainErrors = [
- SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
+ SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', [], 'Admin.Notifications.Error'),
];
if (isset($domainErrors[$type])) {
return $domainErrors[$type];
}
- return $this->getFallbackErrorMessage($type, $e->getCode());
+ return $this->getErrorMessageForException($e);
}
/**
* @return string[] Array of database tables
*/
- protected function getDatabaseTables()
+ protected function getDatabaseTables(): array
{
/** @var DatabaseTablesList $databaseTablesList */
- $databaseTablesList = $this->getQueryBus()->handle(new GetDatabaseTablesList());
+ $databaseTablesList = $this->dispatchQuery(new GetDatabaseTablesList());
return $databaseTablesList->getTables();
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SystemInformationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SystemInformationController.php
index e54f2bb9600d5..3ea565c7bc04a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SystemInformationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SystemInformationController.php
@@ -26,7 +26,10 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Adapter\Requirement\CheckMissingOrUpdatedFiles;
+use PrestaShop\PrestaShop\Adapter\Requirement\CheckRequirements;
+use PrestaShop\PrestaShop\Adapter\System\SystemInformation;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -35,7 +38,7 @@
/**
* Responsible of "Configure > Advanced Parameters > Information" page display.
*/
-class SystemInformationController extends FrameworkBundleAdminController
+class SystemInformationController extends PrestaShopAdminController
{
/**
* @param Request $request
@@ -43,15 +46,18 @@ class SystemInformationController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(Request $request): Response
- {
+ public function indexAction(
+ Request $request,
+ CheckRequirements $checkRequirements,
+ SystemInformation $systemInformation,
+ ): Response {
$legacyController = $request->get('_legacy_controller');
- $requirementsSummary = $this->getRequirementsChecker()->getSummary();
- $systemInformationSummary = $this->getSystemInformation()->getSummary();
+ $requirementsSummary = $checkRequirements->getSummary();
+ $systemInformationSummary = $systemInformation->getSummary();
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/system_information.html.twig', [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Information', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Information', [], 'Admin.Navigation.Menu'),
'requireBulkActions' => false,
'showContentHeader' => true,
'enableSidebar' => true,
@@ -68,32 +74,9 @@ public function indexAction(Request $request): Response
* @return JsonResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function displayCheckFilesAction()
- {
- return new JsonResponse($this->getRequiredFilesChecker()->getListOfUpdatedFiles());
- }
-
- /**
- * @return \PrestaShop\PrestaShop\Adapter\System\SystemInformation
- */
- private function getSystemInformation()
- {
- return $this->get('prestashop.adapter.system_information');
- }
-
- /**
- * @return \PrestaShop\PrestaShop\Adapter\Requirement\CheckRequirements
- */
- private function getRequirementsChecker()
- {
- return $this->get('prestashop.adapter.check_requirements');
- }
-
- /**
- * @return \PrestaShop\PrestaShop\Adapter\Requirement\CheckMissingOrUpdatedFiles
- */
- private function getRequiredFilesChecker()
- {
- return $this->get('prestashop.adapter.check_missing_files');
+ public function displayCheckFilesAction(
+ CheckMissingOrUpdatedFiles $requiredFilesChecker,
+ ): JsonResponse {
+ return new JsonResponse($requiredFilesChecker->getListOfUpdatedFiles());
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
index 19a30c1437ca1..703e44afc9bd7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
@@ -27,14 +27,22 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters;
use Exception;
+use PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyEraser;
+use PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyStatusModifier;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\DuplicateWebserviceKeyException;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\WebserviceConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Webservice\ValueObject\Key;
-use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\WebserviceKeyFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsCheckerInterface;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
+use PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Webservice\WebserviceFormDataProvider;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpClient\HttpClient;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -42,11 +50,11 @@
use Symfony\Component\HttpFoundation\Response;
/**
- * Responsible of "Configure > Advanced Parameters > Webservice" page.
+ * Responsible for "Configure > Advanced Parameters > Webservice" page.
*
* @todo: add unit tests
*/
-class WebserviceController extends FrameworkBundleAdminController
+class WebserviceController extends PrestaShopAdminController
{
private const WEBSERVICE_ENTRY_ENDPOINT = '/api';
@@ -59,9 +67,17 @@ class WebserviceController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(WebserviceKeyFilters $filters, Request $request)
- {
- return $this->renderPage($request, $filters, $this->getFormHandler()->getForm());
+ public function indexAction(
+ WebserviceKeyFilters $filters,
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.webservice.form_handler')]
+ ConfigurationFormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.core.grid.factory.webservice_key')]
+ GridFactoryInterface $gridFactory,
+ ServerRequirementsCheckerInterface $serverRequirementsChecker,
+ WebserviceFormDataProvider $webserviceFormDataProvider,
+ ): Response {
+ return $this->renderPage($request, $filters, $formHandler->getForm(), $gridFactory, $serverRequirementsChecker, $webserviceFormDataProvider);
}
/**
@@ -69,14 +85,16 @@ public function indexAction(WebserviceKeyFilters $filters, Request $request)
*
* @param Request $request
*
- * @return Response
+ * @return Response|RedirectResponse
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function createAction(Request $request)
- {
- $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.webservice_key_form_handler');
- $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.webservice_key_form_builder');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.webservice_key_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.webservice_key_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response|RedirectResponse {
$form = $formBuilder->getForm();
$form->handleRequest($request);
@@ -84,7 +102,7 @@ public function createAction(Request $request)
$result = $formHandler->handle($form);
if (null !== $result->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_webservice_keys_index');
}
@@ -96,7 +114,7 @@ public function createAction(Request $request)
'@PrestaShop/Admin/Configure/AdvancedParameters/Webservice/create.html.twig',
[
'webserviceKeyForm' => $form->createView(),
- 'layoutTitle' => $this->trans('New webservice key', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New webservice key', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink('AdminWebservice'),
]
@@ -109,22 +127,25 @@ public function createAction(Request $request)
* @param int $webserviceKeyId
* @param Request $request
*
- * @return Response
+ * @return Response|RedirectResponse
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function editAction($webserviceKeyId, Request $request)
- {
- $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.webservice_key_form_handler');
- $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.webservice_key_form_builder');
-
- $form = $formBuilder->getFormFor((int) $webserviceKeyId);
+ public function editAction(
+ int $webserviceKeyId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.webservice_key_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.webservice_key_form_handler')]
+ FormHandlerInterface $formHandler,
+ ): Response|RedirectResponse {
+ $form = $formBuilder->getFormFor($webserviceKeyId);
$form->handleRequest($request);
try {
- $result = $formHandler->handleFor((int) $webserviceKeyId, $form);
+ $result = $formHandler->handleFor($webserviceKeyId, $form);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_webservice_keys_index');
}
@@ -138,10 +159,10 @@ public function editAction($webserviceKeyId, Request $request)
'webserviceKeyForm' => $form->createView(),
'layoutTitle' => $this->trans(
'Editing webservice key %key%',
- 'Admin.Navigation.Menu',
[
'%key%' => $form->getData()['key'],
- ]
+ ],
+ 'Admin.Navigation.Menu',
),
]
);
@@ -156,17 +177,18 @@ public function editAction($webserviceKeyId, Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.')]
- public function deleteAction($webserviceKeyId)
- {
- $webserviceEraser = $this->get('prestashop.adapter.webservice.webservice_key_eraser');
+ public function deleteAction(
+ int $webserviceKeyId,
+ WebserviceKeyEraser $webserviceEraser,
+ ): RedirectResponse {
$errors = $webserviceEraser->erase([$webserviceKeyId]);
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
}
@@ -182,19 +204,19 @@ public function deleteAction($webserviceKeyId)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to delete this.')]
- public function bulkDeleteAction(Request $request)
- {
+ public function bulkDeleteAction(
+ Request $request,
+ WebserviceKeyEraser $webserviceEraser,
+ ): RedirectResponse {
$webserviceToDelete = $request->request->all('webservice_key_bulk_action');
-
- $webserviceEraser = $this->get('prestashop.adapter.webservice.webservice_key_eraser');
$errors = $webserviceEraser->erase($webserviceToDelete);
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
}
@@ -210,15 +232,16 @@ public function bulkDeleteAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function bulkEnableAction(Request $request)
- {
+ public function bulkEnableAction(
+ Request $request,
+ WebserviceKeyStatusModifier $statusModifier,
+ ): RedirectResponse {
$webserviceToEnable = $request->request->all('webservice_key_bulk_action');
- $statusModifier = $this->get('prestashop.adapter.webservice.webservice_key_status_modifier');
if ($statusModifier->setStatus($webserviceToEnable, true)) {
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
}
@@ -234,15 +257,16 @@ public function bulkEnableAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function bulkDisableAction(Request $request)
- {
+ public function bulkDisableAction(
+ Request $request,
+ WebserviceKeyStatusModifier $statusModifier,
+ ): RedirectResponse {
$webserviceToDisable = $request->request->all('webservice_key_bulk_action');
- $statusModifier = $this->get('prestashop.adapter.webservice.webservice_key_status_modifier');
if ($statusModifier->setStatus($webserviceToDisable, false)) {
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
}
@@ -258,17 +282,18 @@ public function bulkDisableAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function toggleStatusAction($webserviceKeyId)
- {
- $statusModifier = $this->get('prestashop.adapter.webservice.webservice_key_status_modifier');
+ public function toggleStatusAction(
+ int $webserviceKeyId,
+ WebserviceKeyStatusModifier $statusModifier,
+ ): RedirectResponse {
$errors = $statusModifier->toggleStatus($webserviceKeyId);
if (!empty($errors)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
}
@@ -285,38 +310,45 @@ public function toggleStatusAction($webserviceKeyId)
*/
#[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
#[AdminSecurity("is_granted('create', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function saveSettingsAction(Request $request, WebserviceKeyFilters $filters)
- {
- $this->dispatchHook('actionAdminAdminWebserviceControllerPostProcessBefore', ['controller' => $this]);
-
- $form = $this->getFormHandler()->getForm();
+ public function saveSettingsAction(
+ Request $request,
+ WebserviceKeyFilters $filters,
+ #[Autowire(service: 'prestashop.adapter.webservice.form_handler')]
+ ConfigurationFormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.core.grid.factory.webservice_key')]
+ GridFactoryInterface $gridFactory,
+ ServerRequirementsCheckerInterface $serverRequirementsChecker,
+ WebserviceFormDataProvider $webserviceFormDataProvider,
+ ): Response|RedirectResponse {
+ $this->dispatchHookWithParameters('actionAdminAdminWebserviceControllerPostProcessBefore', ['controller' => $this]);
+
+ $form = $formHandler->getForm();
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $saveErrors = $this->getFormHandler()->save($form->getData());
+ $saveErrors = $formHandler->save($form->getData());
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_webservice_keys_index');
} else {
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
}
- return $this->renderPage($request, $filters, $form);
+ return $this->renderPage($request, $filters, $form, $gridFactory, $serverRequirementsChecker, $webserviceFormDataProvider);
}
- /**
- * @param Request $request
- * @param WebserviceKeyFilters $filters
- * @param FormInterface $form
- *
- * @return Response
- */
- protected function renderPage(Request $request, WebserviceKeyFilters $filters, FormInterface $form): Response
- {
- $grid = $this->get('prestashop.core.grid.factory.webservice_key')->getGrid($filters);
+ protected function renderPage(
+ Request $request,
+ WebserviceKeyFilters $filters,
+ FormInterface $form,
+ GridFactoryInterface $gridFactory,
+ ServerRequirementsCheckerInterface $serverRequirementsChecker,
+ WebserviceFormDataProvider $webserviceFormDataProvider,
+ ): Response {
+ $grid = $gridFactory->getGrid($filters);
return $this->render(
'@PrestaShop/Admin/Configure/AdvancedParameters/Webservice/index.html.twig',
@@ -324,47 +356,29 @@ protected function renderPage(Request $request, WebserviceKeyFilters $filters, F
'help_link' => $this->generateSidebarLink($request->get('_legacy_controller')),
'webserviceConfigurationForm' => $form->createView(),
'grid' => $this->presentGrid($grid),
- 'configurationWarnings' => $this->lookForWarnings(),
- 'webserviceStatus' => $this->getWebServiceStatus($request),
+ 'configurationWarnings' => $serverRequirementsChecker->checkForErrors(),
+ 'webserviceStatus' => $this->getWebServiceStatus($request, $webserviceFormDataProvider),
'enableSidebar' => true,
]
);
}
- /**
- * @return FormHandlerInterface
- */
- private function getFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.adapter.webservice.form_handler');
- }
-
- /**
- * @return string[]
- */
- private function lookForWarnings()
- {
- $configurationChecker = $this->get('prestashop.core.webservice.server_requirements_checker');
-
- return $configurationChecker->checkForErrors();
- }
-
/**
* @return array
*/
- private function getErrorMessages()
+ private function getErrorMessages(): array
{
return [
WebserviceConstraintException::class => [
WebserviceConstraintException::INVALID_KEY => $this->trans(
'Key length must be %length% characters long.',
- 'Admin.Advparameters.Notification',
[
'%length%' => Key::LENGTH,
- ]
+ ],
+ 'Admin.Advparameters.Notification',
),
],
- DuplicateWebserviceKeyException::class => $this->trans('This key already exists.', 'Admin.Advparameters.Notification'),
+ DuplicateWebserviceKeyException::class => $this->trans('This key already exists.', [], 'Admin.Advparameters.Notification'),
];
}
@@ -373,9 +387,11 @@ private function getErrorMessages()
*
* @return array
*/
- private function getWebServiceStatus(Request $request): array
- {
- $webserviceConfiguration = $this->get('prestashop.admin.webservice.form_data_provider')->getData();
+ private function getWebServiceStatus(
+ Request $request,
+ WebserviceFormDataProvider $webserviceFormDataProvider,
+ ): array {
+ $webserviceConfiguration = $webserviceFormDataProvider->getData();
$webserviceStatus = [
'isEnabled' => (bool) $webserviceConfiguration['enable_webservice'],
'isFunctional' => false,
@@ -384,7 +400,7 @@ private function getWebServiceStatus(Request $request): array
if ($webserviceStatus['isEnabled']) {
$webserviceStatus['endpoint'] = rtrim($request->getSchemeAndHttpHost(), '/');
- $webserviceStatus['endpoint'] .= rtrim($this->getContext()->shop->getBaseURI(), '/');
+ $webserviceStatus['endpoint'] .= rtrim($this->getShopContext()->getBaseURI(), '/');
$webserviceStatus['endpoint'] .= self::WEBSERVICE_ENTRY_ENDPOINT;
$webserviceStatus['isFunctional'] = $this->checkWebserviceEndpoint($webserviceStatus['endpoint']);
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
index 17fca680b8adc..9ff695a27900a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
@@ -37,10 +37,14 @@
use PrestaShop\PrestaShop\Core\Domain\Country\Exception\DeleteCountryException;
use PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing;
use PrestaShop\PrestaShop\Core\Domain\Country\QueryResult\CountryForEditing;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\CountryFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -48,7 +52,7 @@
/**
* CountryController is responsible for handling "Improve > International > Locations > Countries"
*/
-class CountryController extends FrameworkBundleAdminController
+class CountryController extends PrestaShopAdminController
{
/**
* Show countries listing page
@@ -59,9 +63,12 @@ class CountryController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, CountryFilters $filters): Response
- {
- $countryGridFactory = $this->get('prestashop.core.grid.factory.country');
+ public function indexAction(
+ Request $request,
+ CountryFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.country')]
+ GridFactoryInterface $countryGridFactory
+ ): Response {
$countryGrid = $countryGridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Improve/International/Country/index.html.twig', [
@@ -80,11 +87,13 @@ public function indexAction(Request $request, CountryFilters $filters): Response
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_countries_index', message: 'You need permission to create new country.')]
- public function createAction(Request $request): Response
- {
- $countryFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.country_form_builder');
- $countryFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.country_form_handler');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.country_form_builder')]
+ FormBuilderInterface $countryFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.country_form_handler')]
+ FormHandlerInterface $countryFormHandler
+ ): Response {
$countryForm = $countryFormBuilder->getForm();
$countryForm->handleRequest($request);
@@ -92,7 +101,7 @@ public function createAction(Request $request): Response
$handleResult = $countryFormHandler->handle($countryForm);
if (null !== $handleResult->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_countries_index');
}
@@ -104,7 +113,7 @@ public function createAction(Request $request): Response
'countryForm' => $countryForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('New country', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New country', [], 'Admin.Navigation.Menu'),
]);
}
@@ -117,25 +126,24 @@ public function createAction(Request $request): Response
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_countries_index', message: 'You need permission to edit this.')]
- public function editAction(int $countryId, Request $request): Response
- {
+ public function editAction(
+ int $countryId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.country_form_builder')]
+ FormBuilderInterface $countryFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.country_form_handler')]
+ FormHandlerInterface $countryFormHandler
+ ): Response {
try {
/** @var CountryForEditing $editableCountry */
- $editableCountry = $this->getQueryBus()->handle(new GetCountryForEditing($countryId));
-
- $countryFormBuilder = $this->get(
- 'prestashop.core.form.identifiable_object.builder.country_form_builder'
- );
- $countryFormHandler = $this->get(
- 'prestashop.core.form.identifiable_object.handler.country_form_handler'
- );
+ $editableCountry = $this->dispatchQuery(new GetCountryForEditing($countryId));
$countryForm = $countryFormBuilder->getFormFor($countryId);
$countryForm->handleRequest($request);
$result = $countryFormHandler->handleFor($countryId, $countryForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_countries_index');
}
@@ -149,7 +157,7 @@ public function editAction(int $countryId, Request $request): Response
'enableSidebar' => true,
'countryForm' => $countryForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
- 'countryName' => $editableCountry->getLocalizedNames()[$this->getContextLangId()],
+ 'countryName' => $editableCountry->getLocalizedNames()[$this->getLanguageContext()->getId()],
]);
}
@@ -165,8 +173,8 @@ public function editAction(int $countryId, Request $request): Response
public function deleteAction(int $countryId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteCountryCommand($countryId));
- $this->addFlash('success', $this->trans('Successful deletion.', 'Admin.Notifications.Success'));
+ $this->dispatchCommand(new DeleteCountryCommand($countryId));
+ $this->addFlash('success', $this->trans('Successful deletion.', [], 'Admin.Notifications.Success'));
} catch (CountryException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -184,7 +192,7 @@ protected function getCountryToolbarButtons(): array
return [
'add' => [
'href' => $this->generateUrl('admin_countries_create'),
- 'desc' => $this->trans('Add new country', 'Admin.International.Feature'),
+ 'desc' => $this->trans('Add new country', [], 'Admin.International.Feature'),
'icon' => 'add_circle_outline',
],
];
@@ -202,24 +210,29 @@ protected function getErrorMessages(Exception $e): array
return [
CountryNotFoundException::class => $this->trans(
'This country does not exist.',
+ [],
'Admin.International.Feature'
),
CannotEditCountryException::class => [
CannotEditCountryException::FAILED_TO_UPDATE_COUNTRY => $this->trans(
'Failed to update country.',
+ [],
'Admin.International.Feature'
),
CannotEditCountryException::UNKNOWN_EXCEPTION => $this->trans(
'Failed to update country. An unexpected error occurred.',
+ [],
'Admin.International.Feature'
),
],
CountryConstraintException::class => $this->trans(
'Country contains invalid field values.',
+ [],
'Admin.International.Feature'
),
DeleteCountryException::class => $this->trans(
'Country cannot be deleted.',
+ [],
'Admin.International.Feature'
),
];
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
index 8a102e3012cc9..fc1faa49e97fc 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
@@ -49,19 +49,22 @@
use PrestaShop\PrestaShop\Core\Domain\Currency\QueryResult\ExchangeRate as ExchangeRateResult;
use PrestaShop\PrestaShop\Core\Domain\Currency\QueryResult\ReferenceCurrency;
use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Language\LanguageInterface;
+use PrestaShop\PrestaShop\Core\Language\LanguageRepositoryInterface;
use PrestaShop\PrestaShop\Core\Localization\CLDR\ComputingPrecision;
use PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository as CldrLocaleRepository;
use PrestaShop\PrestaShop\Core\Localization\Currency\PatternTransformer;
-use PrestaShop\PrestaShop\Core\Localization\Locale\Repository as LocaleRepository;
+use PrestaShop\PrestaShop\Core\Localization\Locale\RepositoryInterface as LocaleRepositoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\CurrencyFilters;
use PrestaShop\PrestaShop\Core\Security\Permission;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use PrestaShopBundle\Entity\Repository\LangRepository;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -70,8 +73,18 @@
/**
* Class CurrencyController is responsible for handling "Improve -> International -> Localization -> Currencies" page.
*/
-class CurrencyController extends FrameworkBundleAdminController
+class CurrencyController extends PrestaShopAdminController
{
+ public static function getSubscribedServices(): array
+ {
+ return parent::getSubscribedServices() + [
+ LanguageRepositoryInterface::class => LanguageRepositoryInterface::class,
+ LocaleRepositoryInterface::class => LocaleRepositoryInterface::class,
+ CldrLocaleRepository::class => CldrLocaleRepository::class,
+ PatternTransformer::class => PatternTransformer::class,
+ ];
+ }
+
/**
* Show currency page.
*
@@ -81,12 +94,17 @@ class CurrencyController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(CurrencyFilters $filters, Request $request)
- {
- $currencyGridFactory = $this->get('prestashop.core.grid.factory.currency');
+ public function indexAction(
+ CurrencyFilters $filters,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.grid.factory.currency')]
+ GridFactoryInterface $currencyGridFactory,
+ #[Autowire(service: 'prestashop.admin.currency_settings.form_handler')]
+ ConfigurationFormHandlerInterface $settingsFormHandler
+ ): Response {
$currencyGrid = $currencyGridFactory->getGrid($filters);
- $settingsForm = $this->getSettingsFormHandler()->getForm();
+ $settingsForm = $settingsFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Improve/International/Currency/index.html.twig', [
'currencyGrid' => $this->presentGrid($currencyGrid),
@@ -104,17 +122,20 @@ public function indexAction(CurrencyFilters $filters, Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index', message: 'You need permission to create this.')]
- public function createAction(Request $request)
- {
- $multiStoreFeature = $this->get('prestashop.adapter.multistore_feature');
-
- $currencyForm = $this->getCurrencyFormBuilder()->getForm();
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.builder.currency_form_builder')]
+ FormBuilderInterface $currencyFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.currency_form_handler')]
+ FormHandlerInterface $currencyFormHandler,
+ ): Response {
+ $currencyForm = $currencyFormBuilder->getForm();
$currencyForm->handleRequest($request);
try {
- $result = $this->getCurrencyFormHandler()->handle($currencyForm);
+ $result = $currencyFormHandler->handle($currencyForm);
if (null !== $result->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_currencies_index');
}
@@ -123,9 +144,9 @@ public function createAction(Request $request)
}
return $this->render('@PrestaShop/Admin/Improve/International/Currency/create.html.twig', [
- 'isShopFeatureEnabled' => $multiStoreFeature->isUsed(),
+ 'isShopFeatureEnabled' => $this->getShopContext()->isMultiShopUsed(),
'currencyForm' => $currencyForm->createView(),
- 'layoutTitle' => $this->trans('New currency', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New currency', [], 'Admin.Navigation.Menu'),
]);
}
@@ -138,18 +159,23 @@ public function createAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index', message: 'You need permission to edit this.')]
- public function editAction($currencyId, Request $request)
- {
- $multiStoreFeature = $this->get('prestashop.adapter.multistore_feature');
- $currencyForm = $this->getCurrencyFormBuilder()->getFormFor($currencyId);
+ public function editAction(
+ int $currencyId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.builder.currency_form_builder')]
+ FormBuilderInterface $currencyFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.currency_form_handler')]
+ FormHandlerInterface $currencyFormHandler,
+ ): Response {
+ $currencyForm = $currencyFormBuilder->getFormFor($currencyId);
try {
$currencyForm->handleRequest($request);
- $result = $this->getCurrencyFormHandler()->handleFor($currencyId, $currencyForm);
+ $result = $currencyFormHandler->handleFor($currencyId, $currencyForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_currencies_index');
}
@@ -158,14 +184,14 @@ public function editAction($currencyId, Request $request)
}
$templateVars = [
- 'isShopFeatureEnabled' => $multiStoreFeature->isUsed(),
+ 'isShopFeatureEnabled' => $this->getShopContext()->isMultiShopUsed(),
'currencyForm' => $currencyForm->createView(),
'layoutTitle' => $this->trans(
'Editing currency %name%',
- 'Admin.Navigation.Menu',
[
- '%name%' => $currencyForm->getData()['names'][$this->getContextLangId()],
- ]
+ '%name%' => $currencyForm->getData()['names'][$this->getLanguageContext()->getId()],
+ ],
+ 'Admin.Navigation.Menu'
),
];
try {
@@ -184,17 +210,17 @@ public function editAction($currencyId, Request $request)
*
* @return array
*/
- private function getLanguagesData(string $currencyIsoCode)
+ private function getLanguagesData(string $currencyIsoCode): array
{
- /** @var LangRepository $langRepository */
- $langRepository = $this->get('prestashop.core.admin.lang.repository');
+ /** @var LanguageRepositoryInterface $langRepository */
+ $langRepository = $this->container->get(LanguageRepositoryInterface::class);
$languages = $langRepository->findAll();
- /** @var LocaleRepository $localeRepository */
- $localeRepository = $this->get('prestashop.core.localization.locale.repository');
+ /** @var LocaleRepositoryInterface $localeRepository */
+ $localeRepository = $this->container->get(LocaleRepositoryInterface::class);
/** @var CldrLocaleRepository $cldrLocaleRepository */
- $cldrLocaleRepository = $this->get('prestashop.core.localization.cldr.locale_repository');
+ $cldrLocaleRepository = $this->container->get(CldrLocaleRepository::class);
/** @var PatternTransformer $transformer */
- $transformer = $this->get('prestashop.core.localization.currency.pattern_transformer');
+ $transformer = $this->container->get(PatternTransformer::class);
$languagesData = [];
/** @var LanguageInterface $language */
@@ -234,17 +260,17 @@ private function getLanguagesData(string $currencyIsoCode)
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index', message: 'You need permission to delete this.')]
- public function deleteAction($currencyId)
+ public function deleteAction(int $currencyId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteCurrencyCommand((int) $currencyId));
+ $this->dispatchCommand(new DeleteCurrencyCommand((int) $currencyId));
} catch (CurrencyException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
return $this->redirectToRoute('admin_currencies_index');
}
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_currencies_index');
}
@@ -258,26 +284,26 @@ public function deleteAction($currencyId)
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function getReferenceDataAction($currencyIsoCode)
+ public function getReferenceDataAction(string $currencyIsoCode): JsonResponse
{
try {
/** @var ReferenceCurrency $referenceCurrency */
- $referenceCurrency = $this->getQueryBus()->handle(new GetReferenceCurrency($currencyIsoCode));
+ $referenceCurrency = $this->dispatchQuery(new GetReferenceCurrency($currencyIsoCode));
} catch (CurrencyException $e) {
return new JsonResponse([
'error' => $this->trans(
'Cannot find reference data for currency %isoCode%',
- 'Admin.International.Feature',
[
'%isoCode%' => $currencyIsoCode,
- ]
+ ],
+ 'Admin.International.Feature'
),
], 404);
}
try {
/** @var ExchangeRateResult $exchangeRate */
- $exchangeRate = $this->getQueryBus()->handle(new GetCurrencyExchangeRate($currencyIsoCode));
+ $exchangeRate = $this->dispatchQuery(new GetCurrencyExchangeRate($currencyIsoCode));
$computingPrecision = new ComputingPrecision();
$exchangeRateValue = $exchangeRate->getValue()->round($computingPrecision->getPrecision(2));
} catch (ExchangeRateNotFoundException $e) {
@@ -304,10 +330,10 @@ public function getReferenceDataAction($currencyIsoCode)
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index', message: 'You need permission to edit this.')]
- public function toggleStatusAction($currencyId)
+ public function toggleStatusAction(int $currencyId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new ToggleCurrencyStatusCommand((int) $currencyId));
+ $this->dispatchCommand(new ToggleCurrencyStatusCommand((int) $currencyId));
} catch (CurrencyException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -316,7 +342,7 @@ public function toggleStatusAction($currencyId)
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
return $this->redirectToRoute('admin_currencies_index');
@@ -329,12 +355,12 @@ public function toggleStatusAction($currencyId)
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index', message: 'You need permission to edit this.')]
- public function refreshExchangeRatesAction()
+ public function refreshExchangeRatesAction(): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new RefreshExchangeRatesCommand());
+ $this->dispatchCommand(new RefreshExchangeRatesCommand());
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
} catch (CannotRefreshExchangeRatesException $exception) {
$this->addFlash('error', $exception->getMessage());
}
@@ -349,8 +375,11 @@ public function refreshExchangeRatesAction()
*
* @return JsonResponse
*/
- public function updateLiveExchangeRatesAction(Request $request)
- {
+ public function updateLiveExchangeRatesAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.currency_settings.form_handler')]
+ ConfigurationFormHandlerInterface $settingsFormHandler
+ ): JsonResponse {
if ($this->isDemoModeEnabled()) {
return $this->json([
'status' => false,
@@ -360,13 +389,14 @@ public function updateLiveExchangeRatesAction(Request $request)
);
}
- $authLevel = $this->authorizationLevel($request->attributes->get('_legacy_controller'));
+ $authLevel = $this->getAuthorizationLevel($request->attributes->get('_legacy_controller'));
if (!in_array($authLevel, [Permission::LEVEL_UPDATE, Permission::LEVEL_DELETE])) {
return $this->json([
'status' => false,
'message' => $this->trans(
'You need permission to edit this.',
+ [],
'Admin.Notifications.Error'
),
],
@@ -374,14 +404,13 @@ public function updateLiveExchangeRatesAction(Request $request)
);
}
- $settingsFormHandler = $this->getSettingsFormHandler();
$settingsForm = $settingsFormHandler->getForm();
$settingsForm->handleRequest($request);
$response = [
'status' => false,
- 'message' => $this->trans('An unexpected error occurred.', 'Admin.Notifications.Error'),
+ 'message' => $this->trans('An unexpected error occurred.', [], 'Admin.Notifications.Error'),
];
$statusCode = Response::HTTP_BAD_REQUEST;
@@ -392,6 +421,7 @@ public function updateLiveExchangeRatesAction(Request $request)
'status' => true,
'message' => $this->trans(
'The status has been successfully updated.',
+ [],
'Admin.Notifications.Success'
),
];
@@ -404,32 +434,6 @@ public function updateLiveExchangeRatesAction(Request $request)
return $this->json($response, $statusCode);
}
- /**
- * Gets form builder.
- *
- * @return FormBuilderInterface
- */
- private function getCurrencyFormBuilder()
- {
- return $this->get('prestashop.core.form.builder.currency_form_builder');
- }
-
- /**
- * @return FormHandlerInterface
- */
- private function getCurrencyFormHandler()
- {
- return $this->get('prestashop.core.form.identifiable_object.currency_form_handler');
- }
-
- /**
- * @return \PrestaShop\PrestaShop\Core\Form\FormHandlerInterface
- */
- private function getSettingsFormHandler()
- {
- return $this->get('prestashop.admin.currency_settings.form_handler');
- }
-
/**
* Toggles currencies status in bulk action
*
@@ -440,20 +444,20 @@ private function getSettingsFormHandler()
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index')]
- public function bulkToggleStatusAction(Request $request, $status)
+ public function bulkToggleStatusAction(Request $request, string $status): RedirectResponse
{
$currenciesIds = $this->getBulkCurrenciesFromRequest($request);
$expectedStatus = 'enable' === $status;
try {
- $this->getCommandBus()->handle(new BulkToggleCurrenciesStatusCommand(
+ $this->dispatchCommand(new BulkToggleCurrenciesStatusCommand(
$currenciesIds,
$expectedStatus
));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (CurrencyException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -471,16 +475,16 @@ public function bulkToggleStatusAction(Request $request, $status)
*/
#[DemoRestricted(redirectRoute: 'admin_currencies_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_currencies_index')]
- public function bulkDeleteAction(Request $request)
+ public function bulkDeleteAction(Request $request): RedirectResponse
{
$currenciesIds = $this->getBulkCurrenciesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkDeleteCurrenciesCommand($currenciesIds));
+ $this->dispatchCommand(new BulkDeleteCurrenciesCommand($currenciesIds));
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
} catch (CurrencyException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -496,7 +500,7 @@ public function bulkDeleteAction(Request $request)
*
* @return array
*/
- private function getErrorMessages(Exception $e)
+ private function getErrorMessages(Exception $e): array
{
$isoCode = $e instanceof InvalidUnofficialCurrencyException ? $e->getIsoCode() : '';
@@ -504,94 +508,102 @@ private function getErrorMessages(Exception $e)
CurrencyConstraintException::class => [
CurrencyConstraintException::INVALID_ISO_CODE => $this->trans(
'The %s field is not valid',
- 'Admin.Notifications.Error',
[
- sprintf('"%s"', $this->trans('ISO code', 'Admin.International.Feature')),
- ]
+ sprintf('"%s"', $this->trans('ISO code', [], 'Admin.International.Feature')),
+ ],
+ 'Admin.Notifications.Error'
),
CurrencyConstraintException::INVALID_NUMERIC_ISO_CODE => $this->trans(
'The %s field is not valid',
- 'Admin.Notifications.Error',
[
- sprintf('"%s"', $this->trans('Numeric ISO code', 'Admin.International.Feature')),
- ]
+ sprintf('"%s"', $this->trans('Numeric ISO code', [], 'Admin.International.Feature')),
+ ],
+ 'Admin.Notifications.Error'
),
CurrencyConstraintException::INVALID_EXCHANGE_RATE => $this->trans(
'The %s field is not valid',
- 'Admin.Notifications.Error',
[
- sprintf('"%s"', $this->trans('Exchange rate', 'Admin.International.Feature')),
- ]
+ sprintf('"%s"', $this->trans('Exchange rate', [], 'Admin.International.Feature')),
+ ],
+ 'Admin.Notifications.Error'
),
CurrencyConstraintException::INVALID_NAME => $this->trans(
'The %s field is not valid',
- 'Admin.Notifications.Error',
[
- sprintf('"%s"', $this->trans('Currency name', 'Admin.International.Feature')),
- ]
+ sprintf('"%s"', $this->trans('Currency name', [], 'Admin.International.Feature')),
+ ],
+ 'Admin.Notifications.Error'
),
CurrencyConstraintException::CURRENCY_ALREADY_EXISTS => $this->trans(
'This currency already exists.',
+ [],
'Admin.International.Notification'
),
CurrencyConstraintException::EMPTY_BULK_TOGGLE => $this->trans(
'You must select at least one item to perform a bulk action.',
+ [],
'Admin.Notifications.Error'
),
CurrencyConstraintException::EMPTY_BULK_DELETE => $this->trans(
'You must select at least one item to perform a bulk action.',
+ [],
'Admin.Notifications.Error'
),
],
DefaultCurrencyInMultiShopException::class => [
DefaultCurrencyInMultiShopException::CANNOT_REMOVE_CURRENCY => $this->trans(
'%currency% is the default currency for shop %shop_name%, and therefore cannot be removed from shop association',
- 'Admin.International.Notification',
[
'%currency%' => $e instanceof DefaultCurrencyInMultiShopException ? $e->getCurrencyName() : '',
'%shop_name%' => $e instanceof DefaultCurrencyInMultiShopException ? $e->getShopName() : '',
- ]
+ ],
+ 'Admin.International.Notification'
),
DefaultCurrencyInMultiShopException::CANNOT_DISABLE_CURRENCY => $this->trans(
'%currency% is the default currency for shop %shop_name%, and therefore cannot be disabled',
- 'Admin.International.Notification',
[
'%currency%' => $e instanceof DefaultCurrencyInMultiShopException ? $e->getCurrencyName() : '',
'%shop_name%' => $e instanceof DefaultCurrencyInMultiShopException ? $e->getShopName() : '',
- ]
+ ],
+ 'Admin.International.Notification'
),
],
CurrencyNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CannotToggleCurrencyException::class => $this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
CannotDeleteDefaultCurrencyException::class => $this->trans(
'You cannot delete the default currency',
+ [],
'Admin.International.Notification'
),
CannotDisableDefaultCurrencyException::class => $this->trans(
'You cannot disable the default currency',
+ [],
'Admin.International.Notification'
),
InvalidUnofficialCurrencyException::class => $this->trans(
'Oops... it looks like this ISO code already exists. If you are: [1][2]trying to create an alternative currency, you must type a different ISO code[/2][2]trying to modify the currency with ISO code %isoCode%, make sure you did not check the creation box[/2][/1]',
- 'Admin.International.Notification',
[
'%isoCode%' => $isoCode,
'[1]' => '',
'[2]' => '',
'[/2]' => '',
- ]
+ ],
+ 'Admin.International.Notification'
),
BulkDeleteCurrenciesException::class => sprintf(
'%s: %s',
$this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof BulkDeleteCurrenciesException ? implode(', ', $e->getCurrenciesNames()) : ''
@@ -600,6 +612,7 @@ private function getErrorMessages(Exception $e)
'%s: %s',
$this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof BulkToggleCurrenciesException ? implode(', ', $e->getCurrenciesNames()) : ''
@@ -614,7 +627,7 @@ private function getErrorMessages(Exception $e)
*
* @return int[]
*/
- private function getBulkCurrenciesFromRequest(Request $request)
+ private function getBulkCurrenciesFromRequest(Request $request): array
{
$currenciesIds = $request->request->all('currency_currency_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
index a5aa06d165042..19ba69320ca8b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
@@ -27,9 +27,11 @@
namespace PrestaShopBundle\Controller\Admin\Improve\International;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Core\Geolocation\GeoLite\GeoLiteCityCheckerInterface;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -37,7 +39,7 @@
/**
* Class GeolocationController is responsible for "Improve > International > Localization > Geolocation" page.
*/
-class GeolocationController extends FrameworkBundleAdminController
+class GeolocationController extends PrestaShopAdminController
{
/**
* Show geolocation page.
@@ -47,17 +49,25 @@ class GeolocationController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(Request $request)
- {
+ public function indexAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.geolocation.by_ip_address.form_handler')]
+ FormHandlerInterface $geolocationByIpAddressFormHandler,
+ #[Autowire(service: 'prestashop.admin.geolocation.whitelist.form_handler')]
+ FormHandlerInterface $geolocationWhitelistFormHandler,
+ #[Autowire(service: 'prestashop.admin.geolocation.options.form_handler')]
+ FormHandlerInterface $geolocationOptionsFormHandler,
+ #[Autowire(service: 'prestashop.core.geolocation.geo_lite_city.checker')]
+ GeoLiteCityCheckerInterface $geoLiteCityChecker
+ ): Response {
$legacyController = $request->attributes->get('_legacy_controller');
- $geolocationByIpAddressForm = $this->getGeolocationByIpAddressFormHandler()->getForm();
- $geolocationIpAddressWhitelistForm = $this->getGeolocationWhitelistFormHandler()->getForm();
- $geolocationOptionsForm = $this->getGeolocationOptionsFormHandler()->getForm();
- $geoLiteCityChecker = $this->get('prestashop.core.geolocation.geo_lite_city.checker');
+ $geolocationByIpAddressForm = $geolocationByIpAddressFormHandler->getForm();
+ $geolocationIpAddressWhitelistForm = $geolocationWhitelistFormHandler->getForm();
+ $geolocationOptionsForm = $geolocationOptionsFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Improve/International/Geolocation/index.html.twig', [
- 'layoutTitle' => $this->trans('Geolocation', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Geolocation', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($legacyController),
'geolocationByIpAddressForm' => $geolocationByIpAddressForm->createView(),
@@ -76,11 +86,14 @@ public function indexAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_geolocation_index')]
- public function processByIpAddressFormAction(Request $request)
- {
+ public function processByIpAddressFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.geolocation.by_ip_address.form_handler')]
+ FormHandlerInterface $geolocationByIpAddressFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getGeolocationByIpAddressFormHandler(),
+ $geolocationByIpAddressFormHandler,
'ByIpAddress'
);
}
@@ -94,11 +107,14 @@ public function processByIpAddressFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_geolocation_index')]
- public function processWhitelistFormAction(Request $request)
- {
+ public function processWhitelistFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.geolocation.whitelist.form_handler')]
+ FormHandlerInterface $geolocationWhitelistFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getGeolocationWhitelistFormHandler(),
+ $geolocationWhitelistFormHandler,
'Whitelist'
);
}
@@ -112,11 +128,14 @@ public function processWhitelistFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_geolocation_index')]
- public function processOptionsFormAction(Request $request)
- {
+ public function processOptionsFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.geolocation.options.form_handler')]
+ FormHandlerInterface $geolocationOptionsFormHandler
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getGeolocationOptionsFormHandler(),
+ $geolocationOptionsFormHandler,
'Options'
);
}
@@ -130,14 +149,14 @@ public function processOptionsFormAction(Request $request)
*
* @return RedirectResponse
*/
- protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName)
+ protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName): RedirectResponse
{
- $this->dispatchHook(
+ $this->dispatchHookWithParameters(
'actionAdminInternationalGeolocationControllerPostProcess' . $hookName . 'Before',
['controller' => $this]
);
- $this->dispatchHook('actionAdminInternationalGeolocationControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminInternationalGeolocationControllerPostProcessBefore', ['controller' => $this]);
$form = $formHandler->getForm();
$form->handleRequest($request);
@@ -147,36 +166,12 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
$saveErrors = $formHandler->save($data);
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
}
return $this->redirectToRoute('admin_geolocation_index');
}
-
- /**
- * @return FormHandlerInterface
- */
- protected function getGeolocationByIpAddressFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.geolocation.by_ip_address.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getGeolocationWhitelistFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.geolocation.whitelist.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- protected function getGeolocationOptionsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.geolocation.options.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
index 3b3f2b9a692fe..abd15a37b6fa7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
@@ -27,6 +27,7 @@
namespace PrestaShopBundle\Controller\Admin\Improve\International;
use Exception;
+use PrestaShop\PrestaShop\Core\Configuration\IniConfiguration;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand;
@@ -40,13 +41,17 @@
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing;
use PrestaShop\PrestaShop\Core\Domain\Language\QueryResult\EditableLanguage;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\UploadedImageConstraintException;
use PrestaShop\PrestaShop\Core\Search\Filters\LanguageFilters;
use PrestaShop\PrestaShop\Core\Util\Url\UrlFileCheckerInterface;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -55,7 +60,7 @@
* Class LanguageController manages "Improve > International > Localization > Languages".
*/
#[AllShopContext]
-class LanguageController extends FrameworkBundleAdminController
+class LanguageController extends PrestaShopAdminController
{
/**
* Show languages listing page.
@@ -66,20 +71,25 @@ class LanguageController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, LanguageFilters $filters)
- {
- $languageGridFactory = $this->get('prestashop.core.grid.factory.language');
+ public function indexAction(
+ Request $request,
+ LanguageFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.language')]
+ GridFactoryInterface $languageGridFactory,
+ UrlFileCheckerInterface $urlFileChecker
+ ): Response {
$languageGrid = $languageGridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Improve/International/Language/index.html.twig', [
'languageGrid' => $this->presentGrid($languageGrid),
- 'isHtaccessFileWriter' => $this->get(UrlFileCheckerInterface::class)->isHtaccessFileWritable(),
+ 'isHtaccessFileWriter' => $urlFileChecker->isHtaccessFileWritable(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'multistoreInfoTip' => $this->trans(
'Note that this page is available in all shops context only, this is why your context has just switched.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
'enableSidebar' => true,
]);
}
@@ -92,11 +102,13 @@ public function indexAction(Request $request, LanguageFilters $filters)
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function createAction(Request $request)
- {
- $languageFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.language_form_handler');
- $languageFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.language_form_builder');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.language_form_builder')]
+ FormBuilderInterface $languageFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.language_form_handler')]
+ FormHandlerInterface $languageFormHandler
+ ): Response {
$languageForm = $languageFormBuilder->getForm();
$languageForm->handleRequest($request);
@@ -104,7 +116,7 @@ public function createAction(Request $request)
$result = $languageFormHandler->handle($languageForm);
if (null !== $result->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_languages_index');
}
@@ -116,7 +128,7 @@ public function createAction(Request $request)
'languageForm' => $languageForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('New language', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New language', [], 'Admin.Navigation.Menu'),
]);
}
@@ -129,11 +141,14 @@ public function createAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))")]
- public function editAction($languageId, Request $request)
- {
- $languageFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.language_form_handler');
- $languageFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.language_form_builder');
-
+ public function editAction(
+ int $languageId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.language_form_builder')]
+ FormBuilderInterface $languageFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.language_form_handler')]
+ FormHandlerInterface $languageFormHandler
+ ): Response {
try {
$languageForm = $languageFormBuilder->getFormFor((int) $languageId, [], [
'is_for_editing' => true,
@@ -154,7 +169,7 @@ public function editAction($languageId, Request $request)
if ($result->isSubmitted() && $result->isValid()) {
$this->addFlash(
'success',
- $this->trans('Successful update', 'Admin.Notifications.Success')
+ $this->trans('Successful update', [], 'Admin.Notifications.Success')
);
return $this->redirectToRoute('admin_languages_index');
@@ -168,7 +183,7 @@ public function editAction($languageId, Request $request)
}
/** @var EditableLanguage $editableLanguage */
- $editableLanguage = $this->getQueryBus()->handle(new GetLanguageForEditing((int) $languageId));
+ $editableLanguage = $this->dispatchQuery(new GetLanguageForEditing((int) $languageId));
return $this->render('@PrestaShop/Admin/Improve/International/Language/edit.html.twig', [
'languageForm' => $languageForm->createView(),
@@ -177,10 +192,10 @@ public function editAction($languageId, Request $request)
'enableSidebar' => true,
'layoutTitle' => $this->trans(
'Editing language %name%',
- 'Admin.Navigation.Menu',
[
'%name%' => $editableLanguage->getName(),
- ]
+ ],
+ 'Admin.Navigation.Menu'
),
]);
}
@@ -194,12 +209,12 @@ public function editAction($languageId, Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_languages_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_languages_index')]
- public function deleteAction($languageId)
+ public function deleteAction(int $languageId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteLanguageCommand((int) $languageId));
+ $this->dispatchCommand(new DeleteLanguageCommand((int) $languageId));
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (LanguageException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
}
@@ -216,16 +231,16 @@ public function deleteAction($languageId)
*/
#[DemoRestricted(redirectRoute: 'admin_languages_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_languages_index')]
- public function bulkDeleteAction(Request $request)
+ public function bulkDeleteAction(Request $request): RedirectResponse
{
$languageIds = $this->getBulkLanguagesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkDeleteLanguagesCommand($languageIds));
+ $this->dispatchCommand(new BulkDeleteLanguagesCommand($languageIds));
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
} catch (LanguageException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -243,20 +258,20 @@ public function bulkDeleteAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_languages_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_languages_index')]
- public function toggleStatusAction($languageId)
+ public function toggleStatusAction(int $languageId): RedirectResponse
{
try {
/** @var EditableLanguage $editableLanguage */
- $editableLanguage = $this->getQueryBus()->handle(new GetLanguageForEditing((int) $languageId));
+ $editableLanguage = $this->dispatchQuery(new GetLanguageForEditing((int) $languageId));
- $this->getCommandBus()->handle(new ToggleLanguageStatusCommand(
+ $this->dispatchCommand(new ToggleLanguageStatusCommand(
(int) $languageId,
!$editableLanguage->isActive()
));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (LanguageException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -275,20 +290,20 @@ public function toggleStatusAction($languageId)
*/
#[DemoRestricted(redirectRoute: 'admin_languages_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_languages_index')]
- public function bulkToggleStatusAction(Request $request, $status)
+ public function bulkToggleStatusAction(Request $request, string $status): RedirectResponse
{
$languageIds = $this->getBulkLanguagesFromRequest($request);
$expectedStatus = 'enable' === $status;
try {
- $this->getCommandBus()->handle(new BulkToggleLanguagesStatusCommand(
+ $this->dispatchCommand(new BulkToggleLanguagesStatusCommand(
$languageIds,
$expectedStatus
));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (LanguageException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -304,86 +319,103 @@ public function bulkToggleStatusAction(Request $request, $status)
*/
private function getErrorMessages(Exception $e)
{
- $iniConfig = $this->get('prestashop.core.configuration.ini_configuration');
+ $iniConfig = $this->container->get(IniConfiguration::class);
return [
LanguageNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CannotDisableDefaultLanguageException::class => $this->trans(
'You cannot change the status of the default language.',
+ [],
'Admin.International.Notification'
),
UploadedImageConstraintException::class => [
UploadedImageConstraintException::EXCEEDED_SIZE => $this->trans(
- 'Max file size allowed is "%s" bytes.', 'Admin.Notifications.Error', [
+ 'Max file size allowed is "%s" bytes.',
+ [
$iniConfig->getUploadMaxSizeInBytes(),
- ]),
+ ],
+ 'Admin.Notifications.Error'
+ ),
UploadedImageConstraintException::UNRECOGNIZED_FORMAT => $this->trans(
'Image format not recognized, allowed formats are: .gif, .jpg, .png',
+ [],
'Admin.Notifications.Error'
),
],
CopyingNoPictureException::class => [
CopyingNoPictureException::PRODUCT_IMAGE_COPY_ERROR => $this->trans(
'An error occurred while copying "No Picture" image to your product folder.',
+ [],
'Admin.International.Notification'
),
CopyingNoPictureException::CATEGORY_IMAGE_COPY_ERROR => $this->trans(
'An error occurred while copying "No picture" image to your category folder.',
+ [],
'Admin.International.Notification'
),
CopyingNoPictureException::BRAND_IMAGE_COPY_ERROR => $this->trans(
'An error occurred while copying "No picture" image to your brand folder.',
+ [],
'Admin.International.Notification'
),
],
LanguageImageUploadingException::class => [
LanguageImageUploadingException::MEMORY_LIMIT_RESTRICTION => $this->trans(
'Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings.',
+ [],
'Admin.Notifications.Error'
),
LanguageImageUploadingException::UNEXPECTED_ERROR => $this->trans(
'An error occurred while uploading the image.',
+ [],
'Admin.Notifications.Error'
),
],
LanguageConstraintException::class => [
LanguageConstraintException::INVALID_ISO_CODE => $this->trans(
'The %s field is invalid.',
- 'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('ISO code', 'Admin.International.Feature'))]
+ [sprintf('"%s"', $this->trans('ISO code', [], 'Admin.International.Feature'))],
+ 'Admin.Notifications.Error'
),
LanguageConstraintException::INVALID_IETF_TAG => $this->trans(
'The %s field is invalid.',
- 'Admin.Notifications.Error',
- [sprintf('"%s"', $this->trans('Language code', 'Admin.International.Feature'))]
+ [sprintf('"%s"', $this->trans('Language code', [], 'Admin.International.Feature'))],
+ 'Admin.Notifications.Error'
),
LanguageConstraintException::DUPLICATE_ISO_CODE => $this->trans(
'This ISO code is already linked to another language.',
+ [],
'Admin.International.Notification'
),
LanguageConstraintException::EMPTY_BULK_DELETE => $this->trans(
'You must select at least one element to delete.',
+ [],
'Admin.Notifications.Error'
),
],
DefaultLanguageException::class => [
DefaultLanguageException::CANNOT_DELETE_ERROR => $this->trans(
'You cannot delete the default language.',
+ [],
'Admin.International.Notification'
),
DefaultLanguageException::CANNOT_DISABLE_ERROR => $this->trans(
'You cannot change the status of the default language.',
+ [],
'Admin.International.Notification'
),
DefaultLanguageException::CANNOT_DELETE_DEFAULT_ERROR => $this->trans(
'You cannot delete the default language.',
+ [],
'Admin.International.Notification'
),
DefaultLanguageException::CANNOT_DELETE_IN_USE_ERROR => $this->trans(
'You cannot delete the language currently in use. Please select a different language.',
+ [],
'Admin.International.Notification'
),
],
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
index 63325db77262c..39466fe52fa3c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
@@ -28,10 +28,12 @@
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
use PrestaShop\PrestaShop\Core\Localization\Pack\Import\LocalizationPackImportConfig;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShop\PrestaShop\Core\Localization\Pack\Import\LocalizationPackImporter;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Form\Admin\Improve\International\Localization\ImportLocalizationPackType;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -39,7 +41,7 @@
/**
* Class LocalizationController is responsible for handling "Improve > International > Localization" page.
*/
-class LocalizationController extends FrameworkBundleAdminController
+class LocalizationController extends PrestaShopAdminController
{
/**
* Show localization settings page.
@@ -49,22 +51,29 @@ class LocalizationController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message: 'Access denied.')]
- public function indexAction(Request $request)
- {
+ public function indexAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.localization.configuration.form_handler')]
+ FormHandlerInterface $configurationFormHandler,
+ #[Autowire(service: 'prestashop.admin.localization.local_units.form_handler')]
+ FormHandlerInterface $localUnitsFormHandler,
+ #[Autowire(service: 'prestashop.admin.localization.advanced.form_handler')]
+ FormHandlerInterface $advancedFormHandler
+ ): Response {
$legacyController = $request->attributes->get('_legacy_controller');
if (!extension_loaded('openssl')) {
- $this->addFlash('warning', $this->trans('Importing a new language may fail without the OpenSSL module. Please enable "openssl.so" on your server configuration.', 'Admin.International.Notification'));
+ $this->addFlash('warning', $this->trans('Importing a new language may fail without the OpenSSL module. Please enable "openssl.so" on your server configuration.', [], 'Admin.International.Notification'));
}
$localizationPackImportForm = $this->createForm(ImportLocalizationPackType::class);
- $configurationForm = $this->getConfigurationFormHandler()->getForm();
- $localUnitsForm = $this->getLocalUnitsFormHandler()->getForm();
- $advancedForm = $this->getAdvancedFormHandler()->getForm();
+ $configurationForm = $configurationFormHandler->getForm();
+ $localUnitsForm = $localUnitsFormHandler->getForm();
+ $advancedForm = $advancedFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Improve/International/Localization/index.html.twig', [
'layoutHeaderToolbarBtn' => [],
- 'layoutTitle' => $this->trans('Localization', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Localization', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($legacyController),
'configurationForm' => $configurationForm->createView(),
@@ -83,11 +92,14 @@ public function indexAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_localization_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function processConfigurationFormAction(Request $request)
- {
+ public function processConfigurationFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.localization.configuration.form_handler')]
+ FormHandlerInterface $configurationFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getConfigurationFormHandler(),
+ $configurationFormHandler,
'Configuration'
);
}
@@ -101,11 +113,14 @@ public function processConfigurationFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_localization_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function processLocalUnitsFormAction(Request $request)
- {
+ public function processLocalUnitsFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.localization.local_units.form_handler')]
+ FormHandlerInterface $localUnitsFormHandler,
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getLocalUnitsFormHandler(),
+ $localUnitsFormHandler,
'LocalUnits'
);
}
@@ -119,11 +134,14 @@ public function processLocalUnitsFormAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_localization_index')]
#[AdminSecurity("is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function processAdvancedFormAction(Request $request)
- {
+ public function processAdvancedFormAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.localization.advanced.form_handler')]
+ FormHandlerInterface $advancedFormHandler
+ ): RedirectResponse {
return $this->processForm(
$request,
- $this->getAdvancedFormHandler(),
+ $advancedFormHandler,
'Advanced'
);
}
@@ -137,14 +155,14 @@ public function processAdvancedFormAction(Request $request)
*
* @return RedirectResponse
*/
- protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName)
+ protected function processForm(Request $request, FormHandlerInterface $formHandler, string $hookName): RedirectResponse
{
- $this->dispatchHook(
+ $this->dispatchHookWithParameters(
'actionAdminInternationalLocalizationControllerPostProcess' . $hookName . 'Before',
['controller' => $this]
);
- $this->dispatchHook('actionAdminInternationalLocalizationControllerPostProcessBefore', ['controller' => $this]);
+ $this->dispatchHookWithParameters('actionAdminInternationalLocalizationControllerPostProcessBefore', ['controller' => $this]);
$form = $formHandler->getForm();
$form->handleRequest($request);
@@ -154,9 +172,9 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
$saveErrors = $formHandler->save($data);
if (0 === count($saveErrors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
} else {
- $this->flashErrors($saveErrors);
+ $this->addFlashErrors($saveErrors);
}
}
@@ -172,8 +190,10 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
*/
#[DemoRestricted(redirectRoute: 'admin_localization_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.')]
- public function importPackAction(Request $request)
- {
+ public function importPackAction(
+ Request $request,
+ LocalizationPackImporter $localizationPackImporter
+ ): RedirectResponse {
$localizationPackImportForm = $this->createForm(ImportLocalizationPackType::class);
$localizationPackImportForm->handleRequest($request);
@@ -186,13 +206,12 @@ public function importPackAction(Request $request)
$data['download_pack_data']
);
- $localizationPackImporter = $this->get('prestashop.core.localization.pack.import.importer');
$errors = $localizationPackImporter->import($localizationImportConfig);
if (empty($errors)) {
$this->addFlash(
'success',
- $this->trans('Localization pack imported successfully.', 'Admin.International.Notification')
+ $this->trans('Localization pack imported successfully.', [], 'Admin.International.Notification')
);
return $this->redirectToRoute('admin_localization_index');
@@ -205,34 +224,4 @@ public function importPackAction(Request $request)
return $this->redirectToRoute('admin_localization_index');
}
-
- /**
- * Returns localization configuration form handler.
- *
- * @return FormHandlerInterface
- */
- private function getConfigurationFormHandler()
- {
- return $this->get('prestashop.admin.localization.configuration.form_handler');
- }
-
- /**
- * Returns localization local units form handler.
- *
- * @return FormHandlerInterface
- */
- private function getLocalUnitsFormHandler()
- {
- return $this->get('prestashop.admin.localization.local_units.form_handler');
- }
-
- /**
- * Returns localization advanced form handler.
- *
- * @return FormHandlerInterface
- */
- private function getAdvancedFormHandler()
- {
- return $this->get('prestashop.admin.localization.advanced.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
index 83a202809b02f..e916613244ba1 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
@@ -27,6 +27,7 @@
namespace PrestaShopBundle\Controller\Admin\Improve\International;
use Exception;
+use PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\CountryStateByIdChoiceProvider;
use PrestaShop\PrestaShop\Core\Domain\Country\Exception\CountryConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Country\Exception\CountryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand;
@@ -44,10 +45,12 @@
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\ZoneNotFoundException;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\StateFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -57,7 +60,7 @@
/**
* Responsible for handling country states data
*/
-class StateController extends FrameworkBundleAdminController
+class StateController extends PrestaShopAdminController
{
/**
* Provides country states in json response
@@ -66,11 +69,13 @@ class StateController extends FrameworkBundleAdminController
*
* @return JsonResponse
*/
- public function getStatesAction(Request $request)
- {
+ public function getStatesAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.form.choice_provider.country_state_by_id')]
+ CountryStateByIdChoiceProvider $statesProvider
+ ): JsonResponse {
try {
$countryId = (int) $request->query->get('id_country');
- $statesProvider = $this->get('prestashop.adapter.form.choice_provider.country_state_by_id');
$states = $statesProvider->getChoices([
'id_country' => $countryId,
]);
@@ -96,9 +101,13 @@ public function getStatesAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, StateFilters $filters): Response
- {
- $stateGrid = $this->get('prestashop.core.grid.grid_factory.state')->getGrid($filters);
+ public function indexAction(
+ Request $request,
+ StateFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.grid_factory.state')]
+ GridFactoryInterface $gridFactory
+ ): Response {
+ $stateGrid = $gridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Improve/International/Locations/State/index.html.twig', [
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
@@ -120,10 +129,10 @@ public function indexAction(Request $request, StateFilters $filters): Response
public function deleteAction(int $stateId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteStateCommand($stateId));
+ $this->dispatchCommand(new DeleteStateCommand($stateId));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (StateException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -141,11 +150,17 @@ public function deleteAction(int $stateId): RedirectResponse
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_states_index')]
- public function editAction(int $stateId, Request $request): Response
- {
+ public function editAction(
+ int $stateId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.state_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.state_form_handler')]
+ FormHandlerInterface $formHandler
+ ): Response {
try {
/** @var EditableState $editableState */
- $editableState = $this->getQueryBus()->handle(new GetStateForEditing((int) $stateId));
+ $editableState = $this->dispatchQuery(new GetStateForEditing((int) $stateId));
} catch (StateException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -155,11 +170,11 @@ public function editAction(int $stateId, Request $request): Response
$stateForm = null;
try {
- $stateForm = $this->getFormBuilder()->getFormFor((int) $stateId);
+ $stateForm = $formBuilder->getFormFor((int) $stateId);
$stateForm->handleRequest($request);
- $result = $this->getFormHandler()->handleFor((int) $stateId, $stateForm);
+ $result = $formHandler->handleFor((int) $stateId, $stateForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_states_index');
}
@@ -173,7 +188,7 @@ public function editAction(int $stateId, Request $request): Response
return $this->render('@PrestaShop/Admin/Improve/International/Locations/State/edit.html.twig', [
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('Editing state %value%', 'Admin.Navigation.Menu', ['%value%' => $editableState->getName()]),
+ 'layoutTitle' => $this->trans('Editing state %value%', ['%value%' => $editableState->getName()], 'Admin.Navigation.Menu'),
'stateForm' => $stateForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
]);
@@ -187,15 +202,20 @@ public function editAction(int $stateId, Request $request): Response
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_states_index', message: 'You do not have permission to create this.')]
- public function createAction(Request $request): Response
- {
- $stateForm = $this->getFormBuilder()->getForm();
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.state_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.state_form_handler')]
+ FormHandlerInterface $formHandler
+ ): Response {
+ $stateForm = $formBuilder->getForm();
$stateForm->handleRequest($request);
try {
- $handlerResult = $this->getFormHandler()->handle($stateForm);
+ $handlerResult = $formHandler->handle($stateForm);
if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_states_index');
}
@@ -209,10 +229,11 @@ public function createAction(Request $request): Response
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'multistoreInfoTip' => $this->trans(
'Note that this feature is only available in the "all stores" context. It will be added to all your stores.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
- 'layoutTitle' => $this->trans('New state', 'Admin.Navigation.Menu'),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
+ 'layoutTitle' => $this->trans('New state', [], 'Admin.Navigation.Menu'),
]);
}
@@ -228,13 +249,14 @@ public function createAction(Request $request): Response
public function toggleStatusAction(int $stateId): JsonResponse
{
try {
- $this->getCommandBus()->handle(
+ $this->dispatchCommand(
new ToggleStateStatusCommand((int) $stateId)
);
$response = [
'status' => true,
'message' => $this->trans(
'The status has been successfully updated.',
+ [],
'Admin.Notifications.Success'
),
];
@@ -261,10 +283,10 @@ public function deleteBulkAction(Request $request): RedirectResponse
$stateIds = $this->getBulkStatesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkDeleteStateCommand($stateIds));
+ $this->dispatchCommand(new BulkDeleteStateCommand($stateIds));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (StateException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -287,11 +309,11 @@ public function bulkEnableAction(Request $request): RedirectResponse
$stateIds = $this->getBulkStatesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkToggleStateStatusCommand(true, $stateIds));
+ $this->dispatchCommand(new BulkToggleStateStatusCommand(true, $stateIds));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (StateException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -314,11 +336,11 @@ public function bulkDisableAction(Request $request): RedirectResponse
$stateIds = $this->getBulkStatesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkToggleStateStatusCommand(false, $stateIds));
+ $this->dispatchCommand(new BulkToggleStateStatusCommand(false, $stateIds));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (StateException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -336,7 +358,7 @@ private function getToolbarButtons(): array
$toolbarButtons['add'] = [
'href' => $this->generateUrl('admin_states_create'),
- 'desc' => $this->trans('Add new state', 'Admin.International.Feature'),
+ 'desc' => $this->trans('Add new state', [], 'Admin.International.Feature'),
'icon' => 'add_circle_outline',
];
@@ -369,60 +391,53 @@ private function getErrorMessages(?Throwable $e = null): array
return [
StateException::class => $this->trans(
'An unexpected error occurred.',
+ [],
'Admin.Notifications.Error'
),
StateNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
StateConstraintException::class => [
StateConstraintException::INVALID_ID => $this->trans(
'The object cannot be loaded (the identifier is missing or invalid)',
+ [],
'Admin.Notifications.Error'
),
],
CannotUpdateStateException::class => $this->trans(
'An error occurred while attempting to save.',
+ [],
'Admin.Notifications.Error'
),
CannotAddStateException::class => $this->trans(
'An error occurred while attempting to save.',
+ [],
'Admin.Notifications.Error'
),
ZoneNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CountryNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
ZoneException::class => $this->trans(
'The object cannot be loaded (the identifier is missing or invalid)',
+ [],
'Admin.Notifications.Error'
),
CountryConstraintException::class => [
CountryConstraintException::INVALID_ID => $this->trans(
'The object cannot be loaded (the identifier is missing or invalid)',
+ [],
'Admin.Notifications.Error'
),
],
];
}
-
- /**
- * @return FormHandlerInterface
- */
- private function getFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.core.form.identifiable_object.handler.state_form_handler');
- }
-
- /**
- * @return FormBuilderInterface
- */
- private function getFormBuilder(): FormBuilderInterface
- {
- return $this->get('prestashop.core.form.identifiable_object.builder.state_form_builder');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
index 84118d2991def..6e3940405b563 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
@@ -37,11 +37,15 @@
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\UpdateTaxException;
use PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing;
use PrestaShop\PrestaShop\Core\Domain\Tax\QueryResult\EditableTax;
-use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface as ConfigurationFormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\TaxFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -49,7 +53,7 @@
/**
* Responsible for handling "Improve > International > Taxes" page.
*/
-class TaxController extends FrameworkBundleAdminController
+class TaxController extends PrestaShopAdminController
{
/**
* Show taxes page.
@@ -60,13 +64,18 @@ class TaxController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, TaxFilters $filters)
- {
+ public function indexAction(
+ Request $request,
+ TaxFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.tax')]
+ GridFactoryInterface $taxGridFactory,
+ #[Autowire(service: 'prestashop.admin.tax_options.form_handler')]
+ ConfigurationFormHandlerInterface $taxOptionsFormHandler
+ ): Response {
$legacyController = $request->attributes->get('_legacy_controller');
- $taxGridFactory = $this->get('prestashop.core.grid.factory.tax');
$taxGrid = $taxGridFactory->getGrid($filters);
- $taxOptionsForm = $this->getTaxOptionsFormHandler()->getForm();
+ $taxOptionsForm = $taxOptionsFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Improve/International/Tax/index.html.twig', [
'taxGrid' => $this->presentGrid($taxGrid),
@@ -85,10 +94,11 @@ public function indexAction(Request $request, TaxFilters $filters)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function saveOptionsAction(Request $request)
- {
- $taxOptionsFormHandler = $this->getTaxOptionsFormHandler();
-
+ public function saveOptionsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.tax_options.form_handler')]
+ ConfigurationFormHandlerInterface $taxOptionsFormHandler
+ ): RedirectResponse {
$taxOptionsForm = $taxOptionsFormHandler->getForm();
$taxOptionsForm->handleRequest($request);
@@ -96,12 +106,12 @@ public function saveOptionsAction(Request $request)
$errors = $taxOptionsFormHandler->save($taxOptionsForm->getData());
if (empty($errors)) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_taxes_index');
}
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
}
return $this->redirectToRoute('admin_taxes_index');
@@ -113,11 +123,13 @@ public function saveOptionsAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function createAction(Request $request)
- {
- $taxFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.tax_form_handler');
- $taxFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.tax_form_builder');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.tax_form_builder')]
+ FormBuilderInterface $taxFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.tax_form_handler')]
+ FormHandlerInterface $taxFormHandler
+ ): Response {
try {
$taxForm = $taxFormBuilder->getForm();
} catch (Exception $exception) {
@@ -135,7 +147,7 @@ public function createAction(Request $request)
if (null !== $result->getIdentifiableObjectId()) {
$this->addFlash(
'success',
- $this->trans('Successful creation', 'Admin.Notifications.Success')
+ $this->trans('Successful creation', [], 'Admin.Notifications.Success')
);
return $this->redirectToRoute('admin_taxes_index');
@@ -150,10 +162,11 @@ public function createAction(Request $request)
'enableSidebar' => true,
'multistoreInfoTip' => $this->trans(
'Note that this feature is only available in the "all stores" context. It will be added to all your stores.',
+ [],
'Admin.Notifications.Info'
),
- 'multistoreIsUsed' => $this->get('prestashop.adapter.multistore_feature')->isUsed(),
- 'layoutTitle' => $this->trans('New tax', 'Admin.Navigation.Menu'),
+ 'multistoreIsUsed' => $this->getShopContext()->isMultiShopUsed(),
+ 'layoutTitle' => $this->trans('New tax', [], 'Admin.Navigation.Menu'),
]);
}
@@ -166,11 +179,14 @@ public function createAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function editAction(Request $request, $taxId)
- {
- $taxFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.tax_form_handler');
- $taxFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.tax_form_builder');
-
+ public function editAction(
+ Request $request,
+ int $taxId,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.tax_form_builder')]
+ FormBuilderInterface $taxFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.tax_form_handler')]
+ FormHandlerInterface $taxFormHandler
+ ): Response {
try {
$taxForm = $taxFormBuilder->getFormFor((int) $taxId);
} catch (Exception $exception) {
@@ -187,7 +203,7 @@ public function editAction(Request $request, $taxId)
$result = $taxFormHandler->handleFor((int) $taxId, $taxForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful update', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_taxes_index');
}
@@ -200,19 +216,19 @@ public function editAction(Request $request, $taxId)
}
/** @var EditableTax $editableTax */
- $editableTax = $this->getQueryBus()->handle(new GetTaxForEditing((int) $taxId));
+ $editableTax = $this->dispatchQuery(new GetTaxForEditing((int) $taxId));
return $this->render('@PrestaShop/Admin/Improve/International/Tax/edit.html.twig', [
'taxForm' => $taxForm->createView(),
- 'taxName' => $editableTax->getLocalizedNames()[$this->getContextLangId()],
+ 'taxName' => $editableTax->getLocalizedNames()[$this->getLanguageContext()->getId()],
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
'layoutTitle' => $this->trans(
'Editing tax %name%',
- 'Admin.Navigation.Menu',
[
- '%name%' => $editableTax->getLocalizedNames()[$this->getContextLangId()],
- ]
+ '%name%' => $editableTax->getLocalizedNames()[$this->getLanguageContext()->getId()],
+ ],
+ 'Admin.Navigation.Menu'
),
]);
}
@@ -226,13 +242,13 @@ public function editAction(Request $request, $taxId)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function deleteAction($taxId)
+ public function deleteAction(int $taxId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteTaxCommand((int) $taxId));
+ $this->dispatchCommand(new DeleteTaxCommand((int) $taxId));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (TaxException $e) {
}
@@ -249,15 +265,15 @@ public function deleteAction($taxId)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function toggleStatusAction($taxId)
+ public function toggleStatusAction(int $taxId): RedirectResponse
{
try {
/** @var EditableTax $editableTax */
- $editableTax = $this->getQueryBus()->handle(new GetTaxForEditing((int) $taxId));
- $this->getCommandBus()->handle(new ToggleTaxStatusCommand((int) $taxId, !$editableTax->isActive()));
+ $editableTax = $this->dispatchQuery(new GetTaxForEditing((int) $taxId));
+ $this->dispatchCommand(new ToggleTaxStatusCommand((int) $taxId, !$editableTax->isActive()));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (TaxException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -275,14 +291,14 @@ public function toggleStatusAction($taxId)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function bulkEnableStatusAction(Request $request)
+ public function bulkEnableStatusAction(Request $request): RedirectResponse
{
$taxIds = $request->request->all('tax_bulk');
try {
- $this->getCommandBus()->handle(new BulkToggleTaxStatusCommand($taxIds, true));
+ $this->dispatchCommand(new BulkToggleTaxStatusCommand($taxIds, true));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (TaxException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -300,14 +316,14 @@ public function bulkEnableStatusAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function bulkDisableStatusAction(Request $request)
+ public function bulkDisableStatusAction(Request $request): RedirectResponse
{
$taxIds = $request->request->all('tax_bulk');
try {
- $this->getCommandBus()->handle(new BulkToggleTaxStatusCommand($taxIds, false));
+ $this->dispatchCommand(new BulkToggleTaxStatusCommand($taxIds, false));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (TaxException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -325,14 +341,14 @@ public function bulkDisableStatusAction(Request $request)
*/
#[DemoRestricted(redirectRoute: 'admin_taxes_index')]
#[AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute: 'admin_taxes_index')]
- public function bulkDeleteAction(Request $request)
+ public function bulkDeleteAction(Request $request): RedirectResponse
{
$taxIds = $request->request->all('tax_bulk');
try {
- $this->getCommandBus()->handle(new BulkDeleteTaxCommand($taxIds));
+ $this->dispatchCommand(new BulkDeleteTaxCommand($taxIds));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (TaxException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -341,14 +357,6 @@ public function bulkDeleteAction(Request $request)
return $this->redirectToRoute('admin_taxes_index');
}
- /**
- * @return FormHandlerInterface
- */
- private function getTaxOptionsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.tax_options.form_handler');
- }
-
/**
* Gets error messages for exceptions
*
@@ -359,18 +367,21 @@ private function getErrorMessages()
return [
TaxNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
UpdateTaxException::class => [
UpdateTaxException::FAILED_BULK_UPDATE_STATUS => [
$this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
],
UpdateTaxException::FAILED_UPDATE_STATUS => [
$this->trans(
'An error occurred while updating the status for an object.',
+ [],
'Admin.Notifications.Error'
),
],
@@ -378,10 +389,12 @@ private function getErrorMessages()
DeleteTaxException::class => [
DeleteTaxException::FAILED_BULK_DELETE => $this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
DeleteTaxException::FAILED_DELETE => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
],
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxRulesGroupController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxRulesGroupController.php
index 4074aef12e2f4..fb605bd9a66d2 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxRulesGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxRulesGroupController.php
@@ -42,10 +42,12 @@
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\QueryResult\EditableTaxRulesGroup;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\TaxRuleFilters;
use PrestaShop\PrestaShop\Core\Search\Filters\TaxRulesGroupFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -53,7 +55,7 @@
/**
* Responsible for handling "Improve > International > Tax Rules" page.
*/
-class TaxRulesGroupController extends FrameworkBundleAdminController
+class TaxRulesGroupController extends PrestaShopAdminController
{
/**
* Show tax rules group page.
@@ -64,9 +66,12 @@ class TaxRulesGroupController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, TaxRulesGroupFilters $filters): Response
- {
- $taxRulesGroupGridFactory = $this->get('prestashop.core.grid.factory.tax_rules_group');
+ public function indexAction(
+ Request $request,
+ TaxRulesGroupFilters $filters,
+ #[Autowire(service: 'prestashop.core.grid.factory.tax_rules_group')]
+ GridFactoryInterface $taxRulesGroupGridFactory
+ ): Response {
$taxRulesGroupGrid = $taxRulesGroupGridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Improve/International/TaxRulesGroup/index.html.twig', [
@@ -83,15 +88,20 @@ public function indexAction(Request $request, TaxRulesGroupFilters $filters): Re
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_tax_rules_groups_index')]
- public function createAction(Request $request): Response
- {
- $taxRulesGroupForm = $this->getFormBuilder()->getForm();
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.tax_rules_group_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.tax_rules_group_form_handler')]
+ FormHandlerInterface $formHandler
+ ): Response {
+ $taxRulesGroupForm = $formBuilder->getForm();
$taxRulesGroupForm->handleRequest($request);
try {
- $handlerResult = $this->getFormHandler()->handle($taxRulesGroupForm);
+ $handlerResult = $formHandler->handle($taxRulesGroupForm);
if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_tax_rules_groups_edit', [
'taxRulesGroupId' => $handlerResult->getIdentifiableObjectId(),
@@ -105,7 +115,7 @@ public function createAction(Request $request): Response
'enableSidebar' => true,
'taxRulesGroupForm' => $taxRulesGroupForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
- 'layoutTitle' => $this->trans('New tax rule', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New tax rule', [], 'Admin.Navigation.Menu'),
]);
}
@@ -119,16 +129,25 @@ public function createAction(Request $request): Response
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_tax_rules_groups_index')]
- public function editAction(Request $request, int $taxRulesGroupId, TaxRuleFilters $filters): Response
- {
+ public function editAction(
+ Request $request,
+ int $taxRulesGroupId,
+ TaxRuleFilters $filters,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.tax_rules_group_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.tax_rules_group_form_handler')]
+ FormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.core.grid.factory.tax_rule')]
+ GridFactoryInterface $taxRuleGridFactory
+ ): Response {
$taxRulesGroupForm = null;
try {
- $taxRulesGroupForm = $this->getFormBuilder()->getFormFor((int) $taxRulesGroupId);
+ $taxRulesGroupForm = $formBuilder->getFormFor((int) $taxRulesGroupId);
$taxRulesGroupForm->handleRequest($request);
- $result = $this->getFormHandler()->handleFor((int) $taxRulesGroupId, $taxRulesGroupForm);
+ $result = $formHandler->handleFor((int) $taxRulesGroupId, $taxRulesGroupForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_tax_rules_groups_edit', [
'taxRulesGroupId' => $taxRulesGroupId,
@@ -143,12 +162,11 @@ public function editAction(Request $request, int $taxRulesGroupId, TaxRuleFilter
}
$filters->addFilter(['taxRulesGroupId' => $taxRulesGroupId]);
- $taxRuleGridFactory = $this->get('prestashop.core.grid.factory.tax_rule');
$taxRuleGrid = $taxRuleGridFactory->getGrid($filters);
return $this->render('@PrestaShop/Admin/Improve/International/TaxRulesGroup/edit.html.twig', [
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('Editing tax rule %value%', 'Admin.Navigation.Menu', ['%value%' => $taxRulesGroupForm->getData()['name']]),
+ 'layoutTitle' => $this->trans('Editing tax rule %value%', ['%value%' => $taxRulesGroupForm->getData()['name']], 'Admin.Navigation.Menu'),
'taxRulesGroupForm' => $taxRulesGroupForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'taxRuleGrid' => $this->presentGrid($taxRuleGrid),
@@ -166,10 +184,10 @@ public function editAction(Request $request, int $taxRulesGroupId, TaxRuleFilter
public function deleteAction(int $taxRulesGroupId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteTaxRulesGroupCommand($taxRulesGroupId));
+ $this->dispatchCommand(new DeleteTaxRulesGroupCommand($taxRulesGroupId));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -190,17 +208,17 @@ public function toggleStatusAction(int $taxRulesGroupId): RedirectResponse
{
try {
/** @var EditableTaxRulesGroup $editableTaxRulesGroup */
- $editableTaxRulesGroup = $this->getQueryBus()->handle(
+ $editableTaxRulesGroup = $this->dispatchQuery(
new GetTaxRulesGroupForEditing($taxRulesGroupId)
);
- $this->getCommandBus()->handle(
+ $this->dispatchCommand(
new SetTaxRulesGroupStatusCommand($taxRulesGroupId, !$editableTaxRulesGroup->isActive())
);
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -222,10 +240,10 @@ public function bulkEnableStatusAction(Request $request): RedirectResponse
$taxRulesGroupIds = $this->getBulkTaxRulesGroupFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkSetTaxRulesGroupStatusCommand($taxRulesGroupIds, true));
+ $this->dispatchCommand(new BulkSetTaxRulesGroupStatusCommand($taxRulesGroupIds, true));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -247,10 +265,10 @@ public function bulkDisableStatusAction(Request $request): RedirectResponse
$taxRulesGroupIds = $this->getBulkTaxRulesGroupFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkSetTaxRulesGroupStatusCommand($taxRulesGroupIds, false));
+ $this->dispatchCommand(new BulkSetTaxRulesGroupStatusCommand($taxRulesGroupIds, false));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -272,10 +290,10 @@ public function bulkDeleteAction(Request $request): RedirectResponse
$taxRulesGroupIds = $this->getBulkTaxRulesGroupFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkDeleteTaxRulesGroupCommand($taxRulesGroupIds));
+ $this->dispatchCommand(new BulkDeleteTaxRulesGroupCommand($taxRulesGroupIds));
$this->addFlash(
'success',
- $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ $this->trans('Successful deletion', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -305,7 +323,7 @@ private function getTaxRulesGroupToolbarButtons(): array
$toolbarButtons['add'] = [
'href' => $this->generateUrl('admin_tax_rules_groups_create'),
- 'desc' => $this->trans('Add new tax rule', 'Admin.International.Feature'),
+ 'desc' => $this->trans('Add new tax rule', [], 'Admin.International.Feature'),
'icon' => 'add_circle_outline',
];
@@ -324,15 +342,18 @@ private function getErrorMessages(?Exception $e = null): array
return [
CannotDeleteTaxRulesGroupException::class => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
TaxRulesGroupNotFoundException::class => $this->trans(
'The object cannot be loaded (or found).',
+ [],
'Admin.Notifications.Error'
),
CannotUpdateTaxRulesGroupException::class => [
CannotUpdateTaxRulesGroupException::FAILED_TOGGLE_STATUS => $this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
],
@@ -340,6 +361,7 @@ private function getErrorMessages(?Exception $e = null): array
'%s: %s',
$this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof CannotBulkDeleteTaxRulesGroupException ? implode(', ', $e->getTaxRulesGroupsIds()) : ''
@@ -348,6 +370,7 @@ private function getErrorMessages(?Exception $e = null): array
'%s: %s',
$this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
$e instanceof CannotBulkUpdateTaxRulesGroupException ? implode(', ', $e->getTaxRulesGroupsIds()) : ''
@@ -355,25 +378,10 @@ private function getErrorMessages(?Exception $e = null): array
TaxRulesGroupConstraintException::class => [
TaxRulesGroupConstraintException::INVALID_ID => $this->trans(
'The object cannot be loaded (the identifier is missing or invalid)',
+ [],
'Admin.Notifications.Error'
),
],
];
}
-
- /**
- * @return FormHandlerInterface
- */
- protected function getFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.core.form.identifiable_object.handler.tax_rules_group_form_handler');
- }
-
- /**
- * @return FormBuilderInterface
- */
- protected function getFormBuilder(): FormBuilderInterface
- {
- return $this->get('prestashop.core.form.identifiable_object.builder.tax_rules_group_form_builder');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/TranslationsController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/TranslationsController.php
index 79fa185f56dbe..8c7a11fcdeca1 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/TranslationsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/TranslationsController.php
@@ -26,14 +26,22 @@
namespace PrestaShopBundle\Controller\Admin\Improve\International;
-use PrestaShop\PrestaShop\Adapter\Shop\Context;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Adapter\Translations\TranslationRouteFinder;
use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Kpi\Row\HookableKpiRowFactory;
use PrestaShop\PrestaShop\Core\Language\Copier\LanguageCopierConfig;
+use PrestaShop\PrestaShop\Core\Language\Copier\LanguageCopierInterface;
+use PrestaShop\PrestaShop\Core\Language\LanguageRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Language\Pack\Import\LanguagePackImporterInterface;
+use PrestaShop\PrestaShop\Core\Translation\Export\TranslationCatalogueExporter;
use PrestaShop\PrestaShop\Core\Translation\Storage\Provider\Definition\ProviderDefinitionInterface;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Controller\Attribute\AllShopContext;
use PrestaShopBundle\Exception\InvalidModuleException;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
+use PrestaShopBundle\Translation\Exporter\ThemeExporter;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -44,7 +52,7 @@
* Admin controller for the International pages.
*/
#[AllShopContext]
-class TranslationsController extends FrameworkBundleAdminController
+class TranslationsController extends PrestaShopAdminController
{
public const CONTROLLER_NAME = 'ADMINTRANSLATIONS';
@@ -57,11 +65,11 @@ class TranslationsController extends FrameworkBundleAdminController
* Renders the translation page
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function overviewAction()
+ public function overviewAction(): Response
{
return $this->render('@PrestaShop/Admin/Improve/International/Translations/overview.html.twig', [
- 'is_shop_context' => (new Context())->isShopContext(),
- 'layoutTitle' => $this->trans('Translations', 'Admin.Navigation.Menu'),
+ 'is_shop_context' => $this->getShopContext()->getShopConstraint()->isSingleShopContext(),
+ 'layoutTitle' => $this->trans('Translations', [], 'Admin.Navigation.Menu'),
]);
}
@@ -73,16 +81,18 @@ public function overviewAction()
* @return BinaryFileResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function exportThemeAction(Request $request)
- {
+ public function exportThemeAction(
+ Request $request,
+ LanguageRepositoryInterface $langRepository,
+ #[Autowire(service: 'prestashop.translation.theme.exporter')]
+ ThemeExporter $themeExporter
+ ): Response {
$themeName = $request->request->get('theme-name');
$isoCode = $request->request->get('iso_code');
- $langRepository = $this->get('prestashop.core.admin.lang.repository');
- $locale = $langRepository->getLocaleByIsoCode($isoCode);
+ $locale = $langRepository->getOneByIsoCode($isoCode)->getLocale();
- $themeExporter = $this->get('prestashop.translation.theme.exporter');
- $zipFile = $themeExporter->createZipArchive($themeName, $locale, _PS_ROOT_DIR_ . DIRECTORY_SEPARATOR);
+ $zipFile = $themeExporter->createZipArchive($themeName, $locale, true);
$response = new BinaryFileResponse($zipFile);
$response->deleteFileAfterSend(true);
@@ -100,18 +110,28 @@ public function exportThemeAction(Request $request)
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function showSettingsAction(Request $request)
- {
+ public function showSettingsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.translations_settings.modify_translations.form_handler')]
+ FormHandlerInterface $modifyTranslationsFormHandler,
+ #[Autowire(service: 'prestashop.admin.translations_settings.add_update_language.form_handler')]
+ FormHandlerInterface $addUpdateLanguageFormHandler,
+ #[Autowire(service: 'prestashop.admin.translations_settings.export_catalogues.form_handler')]
+ FormHandlerInterface $exportTranslationCataloguesFormHandler,
+ #[Autowire(service: 'prestashop.admin.translations_settings.copy_language.form_handler')]
+ FormHandlerInterface $copyLanguageFormHandler,
+ LegacyContext $legacyContext,
+ #[Autowire(service: 'prestashop.core.kpi_row.factory.translations_page')]
+ HookableKpiRowFactory $kpiRowFactory
+ ): Response {
$legacyController = $request->attributes->get('_legacy_controller');
- $legacyContext = $this->get('prestashop.adapter.legacy.context');
- $kpiRowFactory = $this->get('prestashop.core.kpi_row.factory.translations_page');
- $modifyTranslationsForm = $this->getModifyTranslationsFormHandler()->getForm();
- $addUpdateLanguageForm = $this->getAddUpdateLanguageTranslationsFormHandler()->getForm();
- $exportCataloguesForm = $this->getExportTranslationCataloguesFormHandler()->getForm();
- $copyLanguageForm = $this->getCopyLanguageTranslationsFormHandler()->getForm();
+ $modifyTranslationsForm = $modifyTranslationsFormHandler->getForm();
+ $addUpdateLanguageForm = $addUpdateLanguageFormHandler->getForm();
+ $exportCataloguesForm = $exportTranslationCataloguesFormHandler->getForm();
+ $copyLanguageForm = $copyLanguageFormHandler->getForm();
return $this->render('@PrestaShop/Admin/Improve/International/Translations/translations_settings.html.twig', [
- 'layoutTitle' => $this->trans('Translations', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('Translations', [], 'Admin.Navigation.Menu'),
'enableSidebar' => true,
'help_link' => $this->generateSidebarLink($legacyController),
'kpiRow' => $kpiRowFactory->build(),
@@ -131,14 +151,16 @@ public function showSettingsAction(Request $request)
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function modifyTranslationsAction(Request $request)
- {
+ public function modifyTranslationsAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.adapter.translation_route_finder')]
+ TranslationRouteFinder $routeFinder
+ ): RedirectResponse {
try {
- $routeFinder = $this->get('prestashop.adapter.translation_route_finder');
$route = $routeFinder->findRoute($request);
$routeParameters = $routeFinder->findRouteParameters($request);
} catch (InvalidModuleException $e) {
- $this->addFlash('error', $this->trans('An error has occurred, this module does not exist: %s', 'Admin.International.Notification', [$e->getMessage()]));
+ $this->addFlash('error', $this->trans('An error has occurred, this module does not exist: %s', [$e->getMessage()], 'Admin.International.Notification'));
return $this->redirectToRoute('admin_international_translations_show_settings');
}
@@ -155,9 +177,13 @@ public function modifyTranslationsAction(Request $request)
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function addUpdateLanguageAction(Request $request)
- {
- $formHandler = $this->getAddUpdateLanguageTranslationsFormHandler();
+ public function addUpdateLanguageAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.translations_settings.add_update_language.form_handler')]
+ FormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.adapter.language.pack.importer')]
+ LanguagePackImporterInterface $languagePackImporter
+ ): RedirectResponse {
$addUpdateLanguageForm = $formHandler->getForm();
$addUpdateLanguageForm->handleRequest($request);
@@ -165,13 +191,12 @@ public function addUpdateLanguageAction(Request $request)
$data = $addUpdateLanguageForm->getData();
$isoCode = $data['iso_localization_pack'];
- $languagePackImporter = $this->get('prestashop.adapter.language.pack.importer');
$errors = $languagePackImporter->import($isoCode);
if (empty($errors)) {
$this->addFlash(
'success',
- $this->trans('The translations have been successfully added.', 'Admin.International.Notification')
+ $this->trans('The translations have been successfully added.', [], 'Admin.International.Notification')
);
return $this->redirectToRoute('admin_international_translations_show_settings');
@@ -193,9 +218,14 @@ public function addUpdateLanguageAction(Request $request)
* @return BinaryFileResponse|RedirectResponse
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function exportCataloguesAction(Request $request)
- {
- $formHandler = $this->getExportTranslationCataloguesFormHandler();
+ public function exportCataloguesAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.translations_settings.export_catalogues.form_handler')]
+ FormHandlerInterface $formHandler,
+ LanguageRepositoryInterface $langRepository,
+ #[Autowire(service: 'prestashop.translation.export.translation_catalogue')]
+ TranslationCatalogueExporter $translationCatalogueExporter
+ ): BinaryFileResponse|RedirectResponse {
$exportTranslationCataloguesForm = $formHandler->getForm();
$exportTranslationCataloguesForm->handleRequest($request);
@@ -261,16 +291,15 @@ public function exportCataloguesAction(Request $request)
if (empty($selections)) {
$this->addFlash(
'error',
- $this->trans('You must select at least one translation type to export translations.', 'Admin.International.Notification')
+ $this->trans('You must select at least one translation type to export translations.', [], 'Admin.International.Notification')
);
return $this->redirectToRoute('admin_international_translations_show_settings');
}
- $langRepository = $this->get('prestashop.core.admin.lang.repository');
- $locale = $langRepository->getLocaleByIsoCode($isoCode);
+ $locale = $langRepository->getOneByIsoCode($isoCode)->getLocale();
- $zipFilename = $this->get('prestashop.translation.export.translation_catalogue')->export($selections, $locale);
+ $zipFilename = $translationCatalogueExporter->export($selections, $locale);
$response = new BinaryFileResponse($zipFilename);
$response->deleteFileAfterSend(true);
@@ -289,14 +318,17 @@ public function exportCataloguesAction(Request $request)
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))")]
- public function copyLanguageAction(Request $request)
- {
- $formHandler = $this->getCopyLanguageTranslationsFormHandler();
+ public function copyLanguageAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.admin.translations_settings.copy_language.form_handler')]
+ FormHandlerInterface $formHandler,
+ #[Autowire(service: 'prestashop.adapter.language.copier')]
+ LanguageCopierInterface $languageCopier
+ ): RedirectResponse {
$form = $formHandler->getForm();
$form->handleRequest($request);
if ($form->isSubmitted()) {
- $languageCopier = $this->get('prestashop.adapter.language.copier');
$data = $form->getData();
$languageCopierConfig = new LanguageCopierConfig(
$data['from_theme'],
@@ -306,47 +338,15 @@ public function copyLanguageAction(Request $request)
);
if ($errors = $languageCopier->copy($languageCopierConfig)) {
- $this->flashErrors($errors);
+ $this->addFlashErrors($errors);
} else {
$this->addFlash(
'success',
- $this->trans('The translation was successfully copied.', 'Admin.International.Notification')
+ $this->trans('The translation was successfully copied.', [], 'Admin.International.Notification')
);
}
}
return $this->redirectToRoute('admin_international_translations_show_settings');
}
-
- /**
- * @return FormHandlerInterface
- */
- private function getModifyTranslationsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.translations_settings.modify_translations.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- private function getAddUpdateLanguageTranslationsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.translations_settings.add_update_language.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- private function getCopyLanguageTranslationsFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.translations_settings.copy_language.form_handler');
- }
-
- /**
- * @return FormHandlerInterface
- */
- private function getExportTranslationCataloguesFormHandler(): FormHandlerInterface
- {
- return $this->get('prestashop.admin.translations_settings.export_catalogues.form_handler');
- }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
index 53347b8b73678..a84e45f00d1e8 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
@@ -41,11 +41,16 @@
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\ZoneNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing;
use PrestaShop\PrestaShop\Core\Domain\Zone\QueryResult\EditableZone;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
+use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ZoneGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\ZoneFilters;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
use PrestaShopBundle\Security\Attribute\AdminSecurity;
use PrestaShopBundle\Security\Attribute\DemoRestricted;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -53,7 +58,7 @@
/**
* ZoneController is responsible for handling "Improve > International > Locations > Zones"
*/
-class ZoneController extends FrameworkBundleAdminController
+class ZoneController extends PrestaShopAdminController
{
/**
* Show all zones.
@@ -64,9 +69,12 @@ class ZoneController extends FrameworkBundleAdminController
* @return Response
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function indexAction(Request $request, ZoneFilters $zoneFilters): Response
- {
- $zoneGridFactory = $this->get('prestashop.core.grid.factory.zone');
+ public function indexAction(
+ Request $request,
+ ZoneFilters $zoneFilters,
+ #[Autowire(service: 'prestashop.core.grid.factory.zone')]
+ GridFactoryInterface $zoneGridFactory
+ ): Response {
$zoneGrid = $zoneGridFactory->getGrid($zoneFilters);
return $this->render('@PrestaShop/Admin/Improve/International/Zone/index.html.twig', [
@@ -85,12 +93,13 @@ public function indexAction(Request $request, ZoneFilters $zoneFilters): Respons
* @return RedirectResponse
*/
#[AdminSecurity("is_granted('read', request.get('_legacy_controller'))")]
- public function searchAction(Request $request): RedirectResponse
- {
- $responseBuilder = $this->get('prestashop.bundle.grid.response_builder');
-
- return $responseBuilder->buildSearchResponse(
- $this->get('prestashop.core.grid.definition.factory.zone'),
+ public function searchAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.grid.definition.factory.zone')]
+ GridDefinitionFactoryInterface $zoneGridDefinitionFactory
+ ): RedirectResponse {
+ return $this->buildSearchResponse(
+ $zoneGridDefinitionFactory,
$request,
ZoneGridDefinitionFactory::GRID_ID,
'admin_zones_index'
@@ -105,11 +114,13 @@ public function searchAction(Request $request): RedirectResponse
* @return Response
*/
#[AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute: 'admin_zones_index', message: 'You need permission to create new zone.')]
- public function createAction(Request $request): Response
- {
- $zoneFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.zone_form_builder');
- $zoneFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.zone_form_handler');
-
+ public function createAction(
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.zone_form_builder')]
+ FormBuilderInterface $zoneFormBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.zone_form_handler')]
+ FormHandlerInterface $zoneFormHandler
+ ): Response {
$zoneForm = $zoneFormBuilder->getForm();
$zoneForm->handleRequest($request);
@@ -117,7 +128,7 @@ public function createAction(Request $request): Response
$handleResult = $zoneFormHandler->handle($zoneForm);
if (null !== $handleResult->getIdentifiableObjectId()) {
- $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Successful creation', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_zones_index');
}
@@ -129,7 +140,7 @@ public function createAction(Request $request): Response
'zoneForm' => $zoneForm->createView(),
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'layoutTitle' => $this->trans('New zone', 'Admin.Navigation.Menu'),
+ 'layoutTitle' => $this->trans('New zone', [], 'Admin.Navigation.Menu'),
]);
}
@@ -142,14 +153,17 @@ public function createAction(Request $request): Response
* @return Response
*/
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute: 'admin_zones_index', message: 'You need permission to edit this.')]
- public function editAction(int $zoneId, Request $request): Response
- {
+ public function editAction(
+ int $zoneId,
+ Request $request,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.builder.zone_form_builder')]
+ FormBuilderInterface $formBuilder,
+ #[Autowire(service: 'prestashop.core.form.identifiable_object.handler.zone_form_handler')]
+ FormHandlerInterface $formHandler
+ ): Response {
try {
/** @var EditableZone $editableZone */
- $editableZone = $this->getQueryBus()->handle(new GetZoneForEditing($zoneId));
-
- $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.zone_form_builder');
- $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.zone_form_handler');
+ $editableZone = $this->dispatchQuery(new GetZoneForEditing($zoneId));
$zoneForm = $formBuilder->getFormFor($zoneId);
$zoneForm->handleRequest($request);
@@ -157,7 +171,7 @@ public function editAction(int $zoneId, Request $request): Response
$result = $formHandler->handleFor($zoneId, $zoneForm);
if ($result->isSubmitted() && $result->isValid()) {
- $this->addFlash('success', $this->trans('Update successful', 'Admin.Notifications.Success'));
+ $this->addFlash('success', $this->trans('Update successful', [], 'Admin.Notifications.Success'));
return $this->redirectToRoute('admin_zones_index');
}
@@ -169,10 +183,6 @@ public function editAction(int $zoneId, Request $request): Response
}
}
- if (!isset($zoneForm)) {
- return $this->redirectToRoute('admin_zones_index');
- }
-
return $this->render('@PrestaShop/Admin/Improve/International/Zone/edit.html.twig', [
'zoneName' => $editableZone->getName(),
'zoneForm' => $zoneForm->createView(),
@@ -180,10 +190,10 @@ public function editAction(int $zoneId, Request $request): Response
'enableSidebar' => true,
'layoutTitle' => $this->trans(
'Editing zone %name%',
- 'Admin.Navigation.Menu',
[
'%name%' => $editableZone->getName(),
- ]
+ ],
+ 'Admin.Navigation.Menu'
),
]);
}
@@ -200,8 +210,8 @@ public function editAction(int $zoneId, Request $request): Response
public function deleteAction(int $zoneId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new DeleteZoneCommand($zoneId));
- $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+ $this->dispatchCommand(new DeleteZoneCommand($zoneId));
+ $this->addFlash('success', $this->trans('Successful deletion', [], 'Admin.Notifications.Success'));
} catch (ZoneException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -223,10 +233,10 @@ public function deleteAction(int $zoneId): RedirectResponse
public function toggleStatusAction(int $zoneId): RedirectResponse
{
try {
- $this->getCommandBus()->handle(new ToggleZoneStatusCommand($zoneId));
+ $this->dispatchCommand(new ToggleZoneStatusCommand($zoneId));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -249,11 +259,11 @@ public function bulkDeleteAction(Request $request): RedirectResponse
$zoneIds = $this->getBulkZonesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkDeleteZoneCommand($zoneIds));
+ $this->dispatchCommand(new BulkDeleteZoneCommand($zoneIds));
$this->addFlash(
'success',
- $this->trans('The selection has been successfully deleted.', 'Admin.Notifications.Success')
+ $this->trans('The selection has been successfully deleted.', [], 'Admin.Notifications.Success')
);
} catch (ZoneException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -278,10 +288,10 @@ public function bulkToggleStatus(string $status, Request $request): RedirectResp
$zoneIds = $this->getBulkZonesFromRequest($request);
try {
- $this->getCommandBus()->handle(new BulkToggleZoneStatusCommand($status, $zoneIds));
+ $this->dispatchCommand(new BulkToggleZoneStatusCommand($status, $zoneIds));
$this->addFlash(
'success',
- $this->trans('The status has been successfully updated.', 'Admin.Notifications.Success')
+ $this->trans('The status has been successfully updated.', [], 'Admin.Notifications.Success')
);
} catch (ZoneException $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
@@ -302,33 +312,38 @@ private function getErrorMessages(Exception $e): array
return [
CannotEditZoneException::class => $this->trans(
'An error occurred while editing the zone.',
+ [],
'Admin.International.Notification'
),
MissingZoneRequiredFieldsException::class => $this->trans(
'The %s field is required.',
- 'Admin.Notifications.Error',
[
implode(
', ',
$e instanceof MissingZoneRequiredFieldsException ? $e->getMissingRequiredFields() : []
),
- ]
+ ],
+ 'Admin.Notifications.Error'
),
ZoneNotFoundException::class => $this->trans(
'This zone does not exist.',
+ [],
'Admin.Notifications.Error'
),
CannotToggleZoneStatusException::class => $this->trans(
'An error occurred while updating the status.',
+ [],
'Admin.Notifications.Error'
),
DeleteZoneException::class => [
DeleteZoneException::FAILED_DELETE => $this->trans(
'An error occurred while deleting the object.',
+ [],
'Admin.Notifications.Error'
),
DeleteZoneException::FAILED_BULK_DELETE => $this->trans(
'An error occurred while deleting this selection.',
+ [],
'Admin.Notifications.Error'
),
],
@@ -357,7 +372,7 @@ private function getZoneToolbarButtons(): array
return [
'add' => [
'href' => $this->generateUrl('admin_zones_create'),
- 'desc' => $this->trans('Add new zone', 'Admin.International.Feature'),
+ 'desc' => $this->trans('Add new zone', [], 'Admin.International.Feature'),
'icon' => 'add_circle_outline',
],
];
diff --git a/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
index f9bc4fb7bf475..ecaa480798f34 100644
--- a/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
@@ -38,6 +38,7 @@
use PrestaShop\PrestaShop\Core\Context\LanguageContext;
use PrestaShop\PrestaShop\Core\Context\LegacyControllerContext;
use PrestaShop\PrestaShop\Core\Context\ShopContext;
+use PrestaShop\PrestaShop\Core\EnvironmentInterface;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
use PrestaShop\PrestaShop\Core\Grid\GridInterface;
@@ -86,6 +87,7 @@ public static function getSubscribedServices(): array
PositionUpdateFactoryInterface::class => PositionUpdateFactoryInterface::class,
GridPositionUpdaterInterface::class => GridPositionUpdaterInterface::class,
FeatureFlagStateCheckerInterface::class => FeatureFlagStateCheckerInterface::class,
+ EnvironmentInterface::class => EnvironmentInterface::class,
];
}
@@ -139,6 +141,11 @@ protected function getShopContext(): ShopContext
return $this->container->get(ShopContext::class);
}
+ protected function getEnvironment(): EnvironmentInterface
+ {
+ return $this->container->get(EnvironmentInterface::class);
+ }
+
/**
* Get commands bus to execute command.
*/
@@ -193,7 +200,7 @@ protected function generateSidebarLink(string $section, ?string $title = null):
*
* @return string
*/
- protected function getErrorMessageForException(Throwable $e, array $messages): string
+ protected function getErrorMessageForException(Throwable $e, array $messages = []): string
{
if ($e instanceof ModuleErrorInterface) {
return $e->getMessage();
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
index 8076affbe7424..e7f266701ec37 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
+use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryThumbnailImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
@@ -74,7 +75,6 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* Class CategoryController is responsible for "Sell > Catalog > Categories" page.
@@ -422,16 +422,35 @@ public function editRootAction(
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_categories_edit', redirectQueryParamsToKeep: ['categoryId'])]
public function deleteCoverImageAction(Request $request, $categoryId)
{
- if (!$this->isCsrfTokenValid('delete-cover-image', $request->request->get('_csrf_token'))) {
- return $this->redirectToRoute('admin_security_compromised', [
- 'uri' => $this->generateUrl('admin_categories_edit', [
- 'categoryId' => $categoryId,
- ], UrlGeneratorInterface::ABSOLUTE_URL),
- ]);
+ try {
+ $this->dispatchCommand(new DeleteCategoryCoverImageCommand((int) $categoryId));
+
+ $this->addFlash(
+ 'success',
+ $this->trans('Image successfully deleted.', [], 'Admin.Notifications.Success')
+ );
+ } catch (CategoryException $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
}
+ return $this->redirectToRoute('admin_categories_edit', [
+ 'categoryId' => $categoryId,
+ ]);
+ }
+
+ /**
+ * Deletes category thumbnail image.
+ *
+ * @param Request $request
+ * @param int $categoryId
+ *
+ * @return RedirectResponse
+ */
+ #[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_categories_edit', redirectQueryParamsToKeep: ['categoryId'])]
+ public function deleteThumbnailImageAction(Request $request, $categoryId)
+ {
try {
- $this->dispatchCommand(new DeleteCategoryCoverImageCommand((int) $categoryId));
+ $this->dispatchCommand(new DeleteCategoryThumbnailImageCommand((int) $categoryId));
$this->addFlash(
'success',
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
index 0bef5713871d4..dd95a72ee2810 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
@@ -72,7 +72,6 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* Manages "Sell > Catalog > Brands & Suppliers > Brands" page
@@ -452,14 +451,6 @@ public function exportAction(
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectQueryParamsToKeep: ['manufacturerId'], redirectRoute: 'admin_manufacturers_edit')]
public function deleteLogoImageAction(Request $request, int $manufacturerId): RedirectResponse
{
- if (!$this->isCsrfTokenValid('delete-logo-thumbnail', $request->request->get('_csrf_token'))) {
- return $this->redirectToRoute('admin_security_compromised', [
- 'uri' => $this->generateUrl('admin_manufacturers_edit', [
- 'manufacturerId' => $manufacturerId,
- ], UrlGeneratorInterface::ABSOLUTE_URL),
- ]);
- }
-
try {
$this->dispatchCommand(new DeleteManufacturerLogoImageCommand($manufacturerId));
$this->addFlash(
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
index 124697eedbd5a..29a11ac4e307e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
@@ -60,7 +60,6 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* Class SupplierController is responsible for "Sell > Catalog > Brands & Suppliers > Suppliers" page.
@@ -441,14 +440,6 @@ public function exportAction(
#[AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message: 'You do not have permission to edit this.', redirectRoute: 'admin_suppliers_edit', redirectQueryParamsToKeep: ['supplierId'])]
public function deleteLogoImageAction(Request $request, int $supplierId): RedirectResponse
{
- if (!$this->isCsrfTokenValid('delete-logo-thumbnail', $request->request->get('_csrf_token'))) {
- return $this->redirectToRoute('admin_security_compromised', [
- 'uri' => $this->generateUrl('admin_suppliers_edit', [
- 'supplierId' => $supplierId,
- ], UrlGeneratorInterface::ABSOLUTE_URL),
- ]);
- }
-
try {
$this->dispatchCommand(new DeleteSupplierLogoImageCommand($supplierId));
$this->addFlash(
diff --git a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
index 4e1f73e20e0ec..ad6d8b1eb75d3 100644
--- a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
+++ b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
@@ -180,13 +180,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'required' => false,
'can_be_deleted' => true,
'show_size' => true,
- 'csrf_delete_token_id' => 'delete-cover-image',
])
->add('thumbnail_image', ImageWithPreviewType::class, [
'label' => $this->trans('Category thumbnail', 'Admin.Catalog.Feature'),
'help' => $this->trans('It will display a thumbnail on the parent category\'s page, if the theme allows it.', 'Admin.Catalog.Help'),
'required' => false,
- 'can_be_deleted' => false,
+ 'can_be_deleted' => true,
'show_size' => true,
])
->add('seo_preview', CategorySeoPreviewType::class,
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php
index 289a065dfb6e3..062a4334a6c81 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php
@@ -30,6 +30,7 @@
use PrestaShopBundle\Form\Admin\Type\SwitchType;
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
/**
@@ -37,7 +38,7 @@
*/
class SqlRequestSettingsType extends TranslatorAwareType
{
- public function buildForm(FormBuilderInterface $builder, array $options)
+ public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('default_file_encoding', ChoiceType::class, [
@@ -48,13 +49,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
],
'translation_domain' => false,
])
+ ->add('default_file_separator', TextType::class, [
+ 'label' => $this->trans('Select your default file separator', 'Admin.Advparameters.Feature'),
+ 'translation_domain' => false,
+ 'attr' => [
+ 'maxlength' => '1',
+ 'required',
+ ],
+ ])
->add('enable_multi_statements', SwitchType::class, [
'label' => $this->trans('Enable multi-statements queries', 'Admin.Advparameters.Feature'),
'help' => $this->trans(
'Enabling multi-statements queries increases the risk of SQL injection vulnerabilities being exploited.',
'Admin.Advparameters.Help'
),
- ])
- ;
+ ]);
}
}
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/ProductSearchAndResetType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/ProductSearchAndResetType.php
new file mode 100644
index 0000000000000..91687c847ca32
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/ProductSearchAndResetType.php
@@ -0,0 +1,50 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\Form\Admin\Sell\Product;
+
+use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+
+/**
+ * Special search and reset button for product grid, the reset button is not shown when
+ * category is the only filter selected.
+ */
+class ProductSearchAndResetType extends SearchAndResetType
+{
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+ if (null !== $form->getParent()) {
+ $selectedFilters = array_keys($form->getParent()->getData());
+
+ if (count($selectedFilters) === 1 && $selectedFilters[0] === 'id_category') {
+ $view->vars['show_reset_button'] = false;
+ }
+ }
+ }
+}
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
index ce433f89b5cc2..b0e2ae7677b92 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
@@ -127,6 +127,15 @@ admin_categories_delete_cover_image:
requirements:
categoryId: \d+
+admin_categories_delete_thumbnail_image:
+ path: /{categoryId}/delete-thumbnail-image
+ methods: [ POST ]
+ defaults:
+ _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\CategoryController::deleteThumbnailImageAction
+ _legacy_controller: AdminCategories
+ requirements:
+ categoryId: \d+
+
admin_categories_update_position:
path: /update-positions
methods: [ POST ]
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
index 3019101f3df5b..cd430980fef66 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
@@ -2,7 +2,7 @@ services:
_defaults:
autowire: true
- PrestaShop\PrestaShop\Core\Backup\BackupInterface:
+ PrestaShop\PrestaShop\Core\Backup\Manager\BackupCreatorInterface:
class: PrestaShop\PrestaShop\Adapter\Backup\DatabaseBackupCreator
public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index ba7e16a0dee3b..a797ebbe0cc9e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -79,8 +79,13 @@ services:
arguments:
- '@prestashop.core.image.parser.image_tag_source_parser'
- prestashop.adapter.category.command_handler.delete_category_cover_image_handler:
- class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler
+ PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler:
+ autoconfigure: true
+ arguments:
+ - '@filesystem'
+ - '@prestashop.adapter.legacy.configuration'
+
+ PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryThumbnailImageHandler:
autoconfigure: true
arguments:
- '@filesystem'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_configuration.yml
index 9d7cc2848b954..f1428293732ba 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_configuration.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_configuration.yml
@@ -52,6 +52,7 @@ services:
- '%ps_config_dir%/defines.inc.php'
- '@prestashop.adapter.cache.clearer.class_index_cache_clearer'
- '@prestashop.adapter.debug_profiling'
+ - '@prestashop.core.cache.clearer.cache_clearer_chain'
prestashop.adapter.optional_features.configuration:
class: 'PrestaShop\PrestaShop\Adapter\OptionalFeatures\OptionalFeaturesConfiguration'
@@ -215,13 +216,19 @@ services:
arguments:
- '@prestashop.adapter.legacy.configuration'
- prestashop.adapter.webservice.configuration:
- class: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceConfiguration'
+ PrestaShop\PrestaShop\Adapter\Webservice\WebserviceConfiguration:
+ public: false
arguments:
- '@prestashop.adapter.legacy.configuration'
- '@prestashop.adapter.shop.context'
- '@prestashop.adapter.multistore_feature'
+ prestashop.adapter.webservice.configuration:
+ alias: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceConfiguration'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.adapter.meta.set_up_urls.configuration:
class: 'PrestaShop\PrestaShop\Adapter\Meta\SetUpUrlsDataConfiguration'
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 5d9063db368f6..dadd6a0777c07 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -34,7 +34,8 @@ services:
prestashop.adapter.data_provider.carrier:
class: PrestaShop\PrestaShop\Adapter\Carrier\CarrierDataProvider
- arguments: [ '@prestashop.adapter.legacy.configuration' ]
+ arguments:
+ - '@prestashop.adapter.legacy.configuration'
prestashop.adapter.data_provider.order_invoice:
class: PrestaShop\PrestaShop\Adapter\Invoice\OrderInvoiceDataProvider
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/email.yml b/src/PrestaShopBundle/Resources/config/services/adapter/email.yml
index 1c8047d27e4d2..74ccc798b9564 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/email.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/email.yml
@@ -8,5 +8,9 @@ services:
- '@prestashop.adapter.legacy.configuration'
- '@translator'
+ PrestaShop\PrestaShop\Core\Email\EmailConfigurationTesterInterface: '@prestashop.adapter.email.email_configuration_tester'
+
prestashop.adapter.email.email_log_eraser:
class: 'PrestaShop\PrestaShop\Adapter\Email\EmailLogEraser'
+
+ PrestaShop\PrestaShop\Core\Email\EmailLogEraserInterface: '@prestashop.adapter.email.email_log_eraser'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
index e55569be1136f..04af67c6b99b9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
@@ -30,6 +30,8 @@ services:
- '@prestashop.adapter.data_provider.employee'
- '@prestashop.adapter.employee.data_provider'
+ PrestaShop\PrestaShop\Core\Employee\Access\EmployeeFormAccessCheckerInterface: '@prestashop.adapter.employee.form_access_checker'
+
prestashop.adapter.employee.command_handler.add_employee_handler:
class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\AddEmployeeHandler'
autoconfigure: true
@@ -60,11 +62,15 @@ services:
arguments:
- '@prestashop.adapter.legacy.context'
+ PrestaShop\PrestaShop\Core\Employee\NavigationMenuTogglerInterface: '@prestashop.adapter.employee.navigation_menu_toggler'
+
prestashop.adapter.employee.form_language_changer:
class: 'PrestaShop\PrestaShop\Adapter\Employee\FormLanguageChanger'
arguments:
- '@prestashop.adapter.legacy.context'
+ PrestaShop\PrestaShop\Core\Employee\FormLanguageChangerInterface: '@prestashop.adapter.employee.form_language_changer'
+
prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler:
class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler
autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/import.yml b/src/PrestaShopBundle/Resources/config/services/adapter/import.yml
index 939e395169bc0..fb8fcdad1f186 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/import.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/import.yml
@@ -76,6 +76,8 @@ services:
- '@prestashop.adapter.import.handler.category'
- '@prestashop.adapter.import.handler.product'
+ PrestaShop\PrestaShop\Core\Import\Handler\ImportHandlerFinderInterface: '@prestashop.adapter.import.handler_finder'
+
prestashop.adapter.import.data_formatter:
class: 'PrestaShop\PrestaShop\Adapter\Import\ImportDataFormatter'
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
index 2d329f9fd4173..32fb10c3e9240 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -15,6 +15,11 @@ services:
autowire: true
public: false
+ PrestaShop\PrestaShop\Adapter\Module\CommandHandler\ResetModuleHandler:
+ autoconfigure: true
+ autowire: true
+ public: false
+
PrestaShop\PrestaShop\Adapter\Module\QueryHandler\GetModuleInfosHandler:
autowire: true
autoconfigure: true
@@ -89,8 +94,15 @@ services:
prestashop.adapter.legacy.module:
class: PrestaShop\PrestaShop\Adapter\Module\Module
- prestashop.adapter.module.repository.module_repository:
- class: 'PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository'
+ PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository:
+ public: false
arguments:
- !php/const _PS_ROOT_DIR_
- !php/const _PS_MODULE_DIR_
+
+ prestashop.adapter.module.repository.module_repository:
+ alias: 'PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+ public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
index f55126b46f0bc..89ccd634c625f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
@@ -15,19 +15,37 @@ services:
prestashop.adapter.mailing_information:
class: 'PrestaShop\PrestaShop\Adapter\Mail\MailingInformation'
- prestashop.adapter.check_requirements:
- class: 'PrestaShop\PrestaShop\Adapter\Requirement\CheckRequirements'
+ PrestaShop\PrestaShop\Adapter\Requirement\CheckRequirements:
+ public: false
arguments: [ '@translator' ]
- prestashop.adapter.system_information:
- class: 'PrestaShop\PrestaShop\Adapter\System\SystemInformation'
+ prestashop.adapter.check_requirements:
+ alias: 'PrestaShop\PrestaShop\Adapter\Requirement\CheckRequirements'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
+ PrestaShop\PrestaShop\Adapter\System\SystemInformation:
+ public: false
arguments:
- '@prestashop.adapter.hosting_information'
- '@prestashop.adapter.mailing_information'
- '@prestashop.adapter.shop_information'
+ prestashop.adapter.system_information:
+ alias: 'PrestaShop\PrestaShop\Adapter\System\SystemInformation'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
+ PrestaShop\PrestaShop\Adapter\Requirement\CheckMissingOrUpdatedFiles:
+ public: false
+
prestashop.adapter.check_missing_files:
- class: 'PrestaShop\PrestaShop\Adapter\Requirement\CheckMissingOrUpdatedFiles'
+ alias: 'PrestaShop\PrestaShop\Adapter\Requirement\CheckMissingOrUpdatedFiles'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
prestashop.adapter.debug_mode:
class: 'PrestaShop\PrestaShop\Adapter\Debug\DebugMode'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
index 607730bfa5906..f7bc3c7af30f2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
@@ -2,14 +2,26 @@ services:
_defaults:
public: true
+ PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyEraser:
+ public: false
+
prestashop.adapter.webservice.webservice_key_eraser:
- class: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyEraser'
+ alias: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyEraser'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
- prestashop.adapter.webservice.webservice_key_status_modifier:
- class: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyStatusModifier'
+ PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyStatusModifier:
+ public: false
arguments:
- '@translator'
+ prestashop.adapter.webservice.webservice_key_status_modifier:
+ alias: 'PrestaShop\PrestaShop\Adapter\Webservice\WebserviceKeyStatusModifier'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler:
class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler'
autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
index a0194a0e31c5d..5c40d5c13271f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
@@ -199,10 +199,15 @@ services:
arguments:
- '@prestashop.core.sql_manager.configuration.sql_request_configuration'
+ PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Webservice\WebserviceFormDataProvider:
+ public: false
+ autowire: true
+
prestashop.admin.webservice.form_data_provider:
- class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Webservice\WebserviceFormDataProvider'
- arguments:
- - '@prestashop.adapter.webservice.configuration'
+ alias: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Webservice\WebserviceFormDataProvider'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
prestashop.admin.backup.form_data_provider:
class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Backup\BackupDataProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
index 33a679bcfe6ae..ab344c218cc84 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
@@ -35,12 +35,18 @@ services:
PrestaShop\PrestaShop\Core\Language\LanguageRepositoryInterface: '@prestashop.core.admin.lang.repository'
- prestashop.core.admin.log.repository:
- class: PrestaShopBundle\Entity\Repository\LogRepository
+ PrestaShopBundle\Entity\Repository\LogRepository:
+ public: false
arguments:
- '@doctrine.dbal.default_connection'
- '%database_prefix%'
+ prestashop.core.admin.log.repository:
+ alias: PrestaShopBundle\Entity\Repository\LogRepository
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.core.api.stock.repository:
class: PrestaShopBundle\Entity\Repository\StockRepository
arguments:
@@ -97,12 +103,18 @@ services:
- '@doctrine.dbal.default_connection'
- '%database_prefix%'
- prestashop.core.admin.import_match.repository:
- class: PrestaShopBundle\Entity\Repository\ImportMatchRepository
+ PrestaShopBundle\Entity\Repository\ImportMatchRepository:
+ public: false
arguments:
- '@doctrine.dbal.default_connection'
- '%database_prefix%'
+ prestashop.core.admin.import_match.repository:
+ alias: PrestaShopBundle\Entity\Repository\ImportMatchRepository
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.bundle.repository.module:
class: PrestaShopBundle\Entity\Repository\ModuleRepository
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/cldr.yml b/src/PrestaShopBundle/Resources/config/services/core/cldr.yml
index 6bc66ab6e6272..0d2a7cf70d570 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/cldr.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/cldr.yml
@@ -37,11 +37,16 @@ services:
arguments:
- '@prestashop.core.localization.currency.datasource'
- prestashop.core.localization.cldr.locale_repository:
- class: PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository
+ PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository:
arguments:
- '@prestashop.core.localization.cldr.locale_data_source'
+ prestashop.core.localization.cldr.locale_repository:
+ alias: PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository
+ deprecated:
+ package: PrestaShop/PrestaShop
+ version: 9.0
+
prestashop.core.localization.cldr.locale_data_source:
class: PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleDataSource
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/configuration.yml b/src/PrestaShopBundle/Resources/config/services/core/configuration.yml
index cef236a155330..0c4e109027db0 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/configuration.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/configuration.yml
@@ -13,6 +13,8 @@ services:
class: 'PrestaShop\PrestaShop\Core\Configuration\PhpExtensionChecker'
public: true
+ PrestaShop\PrestaShop\Core\Configuration\PhpExtensionCheckerInterface: '@prestashop.core.configuration.php_extension_checker'
+
prestashop.core.configuration.upload_size_configuration:
class: 'PrestaShop\PrestaShop\Core\Configuration\UploadSizeConfiguration'
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/currency.yml b/src/PrestaShopBundle/Resources/config/services/core/currency.yml
index 0fa3893be576d..c3321f4766807 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/currency.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/currency.yml
@@ -33,5 +33,10 @@ services:
- '@prestashop.core.currency.exchange_rate.circuit_breaker'
- '@cache.app'
+ PrestaShop\PrestaShop\Core\Localization\Currency\PatternTransformer: ~
+
prestashop.core.localization.currency.pattern_transformer:
- class: PrestaShop\PrestaShop\Core\Localization\Currency\PatternTransformer
+ alias: PrestaShop\PrestaShop\Core\Localization\Currency\PatternTransformer
+ deprecated:
+ package: PrestaShop/PrestaShop
+ version: 9.0
diff --git a/src/PrestaShopBundle/Resources/config/services/core/employee.yml b/src/PrestaShopBundle/Resources/config/services/core/employee.yml
index 5ecfc9ac97fcf..352cf9bcf2076 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/employee.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/employee.yml
@@ -8,6 +8,8 @@ services:
- '@prestashop.adapter.multistore_feature'
- '@prestashop.adapter.shop.context'
+ PrestaShop\PrestaShop\Core\Team\Employee\Configuration\OptionsCheckerInterface: '@prestashop.core.team.employee.configuration.options_checker'
+
prestashop.core.employee.profile_access_checker:
class: 'PrestaShop\PrestaShop\Core\Employee\Access\ProfileAccessChecker'
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_filter_form_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_filter_form_factory.yml
index 1b09b23d0f4dc..34b6adf6af0be 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_filter_form_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_filter_form_factory.yml
@@ -2,12 +2,18 @@ services:
_defaults:
public: true
- prestashop.core.grid.filter.form_factory:
- class: 'PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactory'
+ PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactory:
+ public: false
arguments:
- '@form.factory'
- '@prestashop.core.hook.dispatcher'
+ prestashop.core.grid.filter.form_factory:
+ alias: 'PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactory'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.core.grid.filter.category_form_factory:
class: 'PrestaShop\PrestaShop\Core\Grid\Filter\CategoryFilterFormFactory'
arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/import.yml b/src/PrestaShopBundle/Resources/config/services/core/import.yml
index 59b49b8e7786e..552587a799215 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/import.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/import.yml
@@ -2,32 +2,59 @@ services:
_defaults:
public: true
- prestashop.core.import.file_uploader:
- class: 'PrestaShop\PrestaShop\Core\Import\File\FileUploader'
+ PrestaShop\PrestaShop\Core\Import\File\FileUploader:
+ public: false
arguments:
- '@translator'
- '@prestashop.core.import.dir'
- prestashop.core.import.file_finder:
- class: 'PrestaShop\PrestaShop\Core\Import\File\FileFinder'
+ prestashop.core.import.file_uploader:
+ alias: 'PrestaShop\PrestaShop\Core\Import\File\FileUploader'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
+ PrestaShop\PrestaShop\Core\Import\File\FileFinder:
+ public: false
arguments:
- '@prestashop.core.import.dir'
- prestashop.core.import.dir:
- class: 'PrestaShop\PrestaShop\Core\Import\ImportDirectory'
+ prestashop.core.import.file_finder:
+ alias: 'PrestaShop\PrestaShop\Core\Import\File\FileFinder'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
+ PrestaShop\PrestaShop\Core\Import\ImportDirectory:
+ public: false
arguments:
- '@prestashop.adapter.legacy.configuration'
- prestashop.core.import.file_removal:
- class: 'PrestaShop\PrestaShop\Core\Import\File\FileRemoval'
+ prestashop.core.import.dir:
+ alias: 'PrestaShop\PrestaShop\Core\Import\ImportDirectory'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
+ PrestaShop\PrestaShop\Core\Import\File\FileRemoval:
+ public: false
arguments:
- '@prestashop.core.import.dir'
- prestashop.core.import.sample.file_provider:
- class: 'PrestaShop\PrestaShop\Core\Import\Sample\SampleFileProvider'
+ prestashop.core.import.file_removal:
+ alias: 'PrestaShop\PrestaShop\Core\Import\File\FileRemoval'
+
+ PrestaShop\PrestaShop\Core\Import\Sample\SampleFileProvider:
+ public: false
arguments:
- '@prestashop.adapter.legacy.configuration'
+ prestashop.core.import.sample.file_provider:
+ alias: 'PrestaShop\PrestaShop\Core\Import\Sample\SampleFileProvider'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.core.import.csv_file_reader:
class: 'PrestaShop\PrestaShop\Core\Import\File\CsvFileReader'
arguments:
@@ -42,11 +69,15 @@ services:
arguments:
- '@prestashop.core.import.data_row.presenter'
+ PrestaShop\PrestaShop\Core\Import\File\DataRow\DataRowCollectionPresenterInterface: '@prestashop.core.import.data_row.collection_presenter'
+
prestashop.core.import.factory.data_row.collection_factory:
class: 'PrestaShop\PrestaShop\Core\Import\File\DataRow\Factory\DataRowCollectionFactory'
arguments:
- '@prestashop.core.import.csv_file_reader'
+ PrestaShop\PrestaShop\Core\Import\File\DataRow\Factory\DataRowCollectionFactoryInterface: '@prestashop.core.import.factory.data_row.collection_factory'
+
prestashop.core.import.fields_provider.product:
class: 'PrestaShop\PrestaShop\Core\Import\EntityField\Provider\ProductFieldsProvider'
arguments:
@@ -90,8 +121,8 @@ services:
prestashop.core.import.normalizer.csv_value_separator:
class: 'PrestaShop\PrestaShop\Core\Import\CsvValueSeparatorNormalizer'
- prestashop.core.import.fields_provider_finder:
- class: 'PrestaShop\PrestaShop\Core\Import\EntityField\Provider\EntityFieldsProviderFinder'
+ PrestaShop\PrestaShop\Core\Import\EntityField\Provider\EntityFieldsProviderFinder:
+ public: false
arguments:
- 0: '@prestashop.core.import.fields_provider.category'
1: '@prestashop.core.import.fields_provider.product'
@@ -103,15 +134,27 @@ services:
7: '@prestashop.core.import.fields_provider.alias'
8: '@prestashop.core.import.fields_provider.store_contact'
+ prestashop.core.import.fields_provider_finder:
+ alias: 'PrestaShop\PrestaShop\Core\Import\EntityField\Provider\EntityFieldsProviderFinder'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
+
prestashop.core.import.config_factory:
class: 'PrestaShop\PrestaShop\Core\Import\Configuration\ImportConfigFactory'
+ PrestaShop\PrestaShop\Core\Import\Configuration\ImportConfigFactoryInterface: '@prestashop.core.import.config_factory'
+
prestashop.core.import.runtime_config_factory:
class: 'PrestaShop\PrestaShop\Core\Import\Configuration\ImportRuntimeConfigFactory'
+ PrestaShop\PrestaShop\Core\Import\Configuration\ImportRuntimeConfigFactoryInterface: '@prestashop.core.import.runtime_config_factory'
+
prestashop.core.import.request_validator:
class: 'PrestaShop\PrestaShop\Core\Import\Validator\ImportRequestValidator'
+ PrestaShop\PrestaShop\Core\Import\Validator\ImportRequestValidatorInterface: '@prestashop.core.import.request_validator'
+
prestashop.core.import.access_checker:
class: 'PrestaShop\PrestaShop\Core\Import\Access\ImportAccessChecker'
arguments:
@@ -125,3 +168,5 @@ services:
- '@prestashop.core.import.csv_file_reader'
- '@prestashop.core.import.dir'
- '@prestashop.core.configuration.ini_configuration'
+
+ PrestaShop\PrestaShop\Core\Import\ImporterInterface: '@prestashop.core.import.importer'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/sql_request.yml b/src/PrestaShopBundle/Resources/config/services/core/sql_request.yml
index 85195d74dcd60..cfc94efd53d23 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/sql_request.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/sql_request.yml
@@ -2,10 +2,17 @@ services:
_defaults:
public: true
- prestashop.core.sql_manager.exporter.sql_request_exporter:
- class: 'PrestaShop\PrestaShop\Core\SqlManager\Exporter\SqlRequestExporter'
+ PrestaShop\PrestaShop\Core\SqlManager\Exporter\SqlRequestExporter:
+ public: false
arguments:
- '@prestashop.core.export.file_writer.export_csv_file_writer'
+ - '@prestashop.adapter.legacy.configuration'
+
+ prestashop.core.sql_manager.exporter.sql_request_exporter:
+ alias: 'PrestaShop\PrestaShop\Core\SqlManager\Exporter\SqlRequestExporter'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
prestashop.core.sql_manager.configuration.sql_request_configuration:
class: 'PrestaShop\PrestaShop\Core\SqlManager\Configuration\SqlRequestConfiguration'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/webservice.yml b/src/PrestaShopBundle/Resources/config/services/core/webservice.yml
index b9b929764c495..c4a8e67f8b572 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/webservice.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/webservice.yml
@@ -1,11 +1,19 @@
services:
_defaults:
- public: true
+ public: false
- prestashop.core.webservice.server_requirements_checker:
- class: 'PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsChecker'
+ PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsChecker:
arguments:
- '@translator'
- '@prestashop.adapter.legacy.configuration'
- '@prestashop.adapter.hosting_information'
- '@prestashop.core.configuration.php_extension_checker'
+
+ PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsCheckerInterface: '@PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsChecker'
+
+ prestashop.core.webservice.server_requirements_checker:
+ public: true
+ alias: 'PrestaShop\PrestaShop\Core\Webservice\ServerRequirementsChecker'
+ deprecated:
+ package: PrestaShop\PrestaShop
+ version: 9.0
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Manufacturer/logo_image.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Manufacturer/logo_image.html.twig
index 3d424839dbd8f..0a94a5fe775aa 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Manufacturer/logo_image.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Manufacturer/logo_image.html.twig
@@ -28,7 +28,6 @@
{{ 'File size'|trans({}, 'Admin.Advparameters.Feature') }} {{ logoImage.size }}