From 878f4e2e0ad11a0a423b3aab55a22ebe6f29be16 Mon Sep 17 00:00:00 2001 From: Ian Thomas Date: Sun, 6 Sep 2020 22:19:09 +0100 Subject: [PATCH] Switch to constructor injection #123 in case controller has not been registered with controller.service_arguments --- Controller/UploadController.php | 48 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/Controller/UploadController.php b/Controller/UploadController.php index 63256160..4d49361b 100644 --- a/Controller/UploadController.php +++ b/Controller/UploadController.php @@ -16,12 +16,19 @@ class UploadController extends AbstractController { + private $translator; + + public function __construct(Translator $translator) + { + $this->translator = $translator; + } + /** * Save uploaded image according to comur_image field configuration * * @param Request $request */ - public function uploadImageAction(Request $request, Translator $translator + public function uploadImageAction(Request $request /*, $uploadUrl, $paramName, $webDir, $minWidth=1, $minHeight=1*/ ){ $config = json_decode($request->request->get('config'),true); @@ -84,24 +91,24 @@ public function uploadImageAction(Request $request, Translator $translator $transDomain = $this->container->getParameter('comur_image.translation_domain'); $errorMessages = array( - 1 => $translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain), - 2 => $translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain), - 3 => $translator->trans('The uploaded file was only partially uploaded', array(), $transDomain), - 4 => $translator->trans('No file was uploaded', array(), $transDomain), - 6 => $translator->trans('Missing a temporary folder', array(), $transDomain), - 7 => $translator->trans('Failed to write file to disk', array(), $transDomain), - 8 => $translator->trans('A PHP extension stopped the file upload', array(), $transDomain), - 'post_max_size' => $translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain), - 'max_file_size' => $translator->trans('File is too big', array(), $transDomain), - 'min_file_size' => $translator->trans('File is too small', array(), $transDomain), - 'accept_file_types' => $translator->trans('Filetype not allowed', array(), $transDomain), - 'max_number_of_files' => $translator->trans('Maximum number of files exceeded', array(), $transDomain), - 'max_width' => $translator->trans('Image exceeds maximum width', array(), $transDomain), - 'min_width' => $translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain), - 'max_height' => $translator->trans('Image exceeds maximum height', array(), $transDomain), - 'min_height' => $translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain), - 'abort' => $translator->trans('File upload aborted', array(), $transDomain), - 'image_resize' => $translator->trans('Failed to resize image', array(), $transDomain), + 1 => $this->translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain), + 2 => $this->translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain), + 3 => $this->translator->trans('The uploaded file was only partially uploaded', array(), $transDomain), + 4 => $this->translator->trans('No file was uploaded', array(), $transDomain), + 6 => $this->translator->trans('Missing a temporary folder', array(), $transDomain), + 7 => $this->translator->trans('Failed to write file to disk', array(), $transDomain), + 8 => $this->translator->trans('A PHP extension stopped the file upload', array(), $transDomain), + 'post_max_size' => $this->translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain), + 'max_file_size' => $this->translator->trans('File is too big', array(), $transDomain), + 'min_file_size' => $this->translator->trans('File is too small', array(), $transDomain), + 'accept_file_types' => $this->translator->trans('Filetype not allowed', array(), $transDomain), + 'max_number_of_files' => $this->translator->trans('Maximum number of files exceeded', array(), $transDomain), + 'max_width' => $this->translator->trans('Image exceeds maximum width', array(), $transDomain), + 'min_width' => $this->translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain), + 'max_height' => $this->translator->trans('Image exceeds maximum height', array(), $transDomain), + 'min_height' => $this->translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain), + 'abort' => $this->translator->trans('File upload aborted', array(), $transDomain), + 'image_resize' => $this->translator->trans('Failed to resize image', array(), $transDomain), ); $response->setCallback(function () use($handlerConfig, $errorMessages) { @@ -431,8 +438,7 @@ private function resizeCropImage($destSrc, $imgSrc, $destX, $destY, $srcX, $srcY */ public function getTranslationCatalogue(Request $request) { $transDomain = $this->container->getParameter('comur_image.translation_domain'); - $translator = $this->container->get('translator'); - $catalogue = $translator->getCatalogue($request->getLocale()); + $catalogue = $this->translator->getCatalogue($request->getLocale()); $messages = $catalogue->all(); return $this->render('@ComurImage/translations.html.twig', array(