diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php index 62b8387d696d3..2c4adbe53aadf 100644 --- a/classes/AttributeGroup.php +++ b/classes/AttributeGroup.php @@ -379,8 +379,7 @@ public function updatePosition($direction, $position) ) && Db::getInstance()->execute(' UPDATE `' . _DB_PREFIX_ . 'attribute_group` SET `position` = ' . (int) $position . ' - WHERE `id_attribute_group`=' . (int) $movedGroupAttribute['id_attribute_group']) - ; + WHERE `id_attribute_group`=' . (int) $movedGroupAttribute['id_attribute_group']); } /** diff --git a/classes/Context.php b/classes/Context.php index ff99a968b8f1a..e0e6de1f42fff 100644 --- a/classes/Context.php +++ b/classes/Context.php @@ -400,8 +400,7 @@ public function getTranslatorFromLocale($locale) ->files() ->name('*.' . $locale . '.xlf') ->notName($notName) - ->in($this->getTranslationResourcesDirectories()) - ; + ->in($this->getTranslationResourcesDirectories()); foreach ($finder as $file) { list($domain, $locale, $format) = explode('.', $file->getBasename(), 3); diff --git a/classes/Cookie.php b/classes/Cookie.php index b0809a120ce8d..0ac9ae213dcc1 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -236,8 +236,7 @@ public function isLoggedBack() return $this->id_employee && Validate::isUnsignedId($this->id_employee) && Employee::checkPassword((int) $this->id_employee, $this->passwd) - && (!isset($this->_content['remote_addr']) || $this->_content['remote_addr'] == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP')) - ; + && (!isset($this->_content['remote_addr']) || $this->_content['remote_addr'] == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP')); } /** diff --git a/classes/Employee.php b/classes/Employee.php index 01cf305731f8e..fbe10f76c2748 100644 --- a/classes/Employee.php +++ b/classes/Employee.php @@ -438,8 +438,7 @@ public function isLastAdmin() { return $this->isSuperAdmin() && Employee::countProfile($this->id_profile, true) == 1 - && $this->active - ; + && $this->active; } /** diff --git a/classes/Product.php b/classes/Product.php index 6e389bec5485a..c1438f2a3120d 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2132,8 +2132,7 @@ public function deleteCustomization() 'DELETE `' . _DB_PREFIX_ . 'customization_field_lang` FROM `' . _DB_PREFIX_ . 'customization_field_lang` LEFT JOIN `' . _DB_PREFIX_ . 'customization_field` ON (' . _DB_PREFIX_ . 'customization_field.id_customization_field = ' . _DB_PREFIX_ . 'customization_field_lang.id_customization_field) WHERE ' . _DB_PREFIX_ . 'customization_field.id_customization_field IS NULL' - ) - ; + ); } /** @@ -2179,8 +2178,7 @@ public function deleteSearchIndexes() 'DELETE sw FROM `' . _DB_PREFIX_ . 'search_word` sw LEFT JOIN `' . _DB_PREFIX_ . 'search_index` si ON (sw.id_word=si.id_word) WHERE si.id_word IS NULL;' - ) - ; + ); } /** diff --git a/classes/Profile.php b/classes/Profile.php index 5f32a0462d713..ad612694e9d31 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -95,8 +95,7 @@ public function delete() if (parent::delete()) { return Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'access` WHERE `id_profile` = ' . (int) $this->id) - && Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'module_access` WHERE `id_profile` = ' . (int) $this->id) - ; + && Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'module_access` WHERE `id_profile` = ' . (int) $this->id); } return false; diff --git a/classes/Tools.php b/classes/Tools.php index 5acbbe26eac81..f52818e6f52a6 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1185,8 +1185,7 @@ public static function isSubmit($submit) { return isset($_POST[$submit]) || isset($_POST[$submit . '_x']) || isset($_POST[$submit . '_y']) - || isset($_GET[$submit]) || isset($_GET[$submit . '_x']) || isset($_GET[$submit . '_y']) - ; + || isset($_GET[$submit]) || isset($_GET[$submit . '_x']) || isset($_GET[$submit . '_y']); } /** diff --git a/classes/checkout/CheckoutAddressesStep.php b/classes/checkout/CheckoutAddressesStep.php index 6ccd7fd1c1e39..b7a92fdf4eb74 100644 --- a/classes/checkout/CheckoutAddressesStep.php +++ b/classes/checkout/CheckoutAddressesStep.php @@ -181,8 +181,7 @@ public function handleRequest(array $requestParams = array()) if (!$this->step_is_complete) { $this->step_is_complete = isset($requestParams['confirm-addresses']) && $this->getCheckoutSession()->getIdAddressInvoice() && - $this->getCheckoutSession()->getIdAddressDelivery() - ; + $this->getCheckoutSession()->getIdAddressDelivery(); } $addresses_count = $this->getCheckoutSession()->getCustomerAddressesCount(); diff --git a/classes/checkout/CheckoutDeliveryStep.php b/classes/checkout/CheckoutDeliveryStep.php index d9b09f58ff7e5..6d7279d82011b 100644 --- a/classes/checkout/CheckoutDeliveryStep.php +++ b/classes/checkout/CheckoutDeliveryStep.php @@ -148,8 +148,7 @@ public function handleRequest(array $requestParams = array()) // - the module associated to the delivery option confirms $deliveryOptions = $this->getCheckoutSession()->getDeliveryOptions(); $this->step_is_complete = - !empty($deliveryOptions) && $this->getCheckoutSession()->getSelectedDeliveryOption() && $this->isModuleComplete($requestParams) - ; + !empty($deliveryOptions) && $this->getCheckoutSession()->getSelectedDeliveryOption() && $this->isModuleComplete($requestParams); } $this->setTitle($this->getTranslator()->trans('Shipping Method', array(), 'Shop.Theme.Checkout')); diff --git a/classes/checkout/CheckoutPersonalInformationStep.php b/classes/checkout/CheckoutPersonalInformationStep.php index 0dc0a08f16675..7b46aaba76108 100644 --- a/classes/checkout/CheckoutPersonalInformationStep.php +++ b/classes/checkout/CheckoutPersonalInformationStep.php @@ -55,8 +55,7 @@ public function handleRequest(array $requestParameters = array()) ->getCheckoutProcess() ->getCheckoutSession() ->getCustomer() - ) - ; + ); if (isset($requestParameters['submitCreate'])) { $this->registerForm->fillWith($requestParameters); @@ -83,8 +82,7 @@ public function handleRequest(array $requestParameters = array()) $this->logged_in = $this ->getCheckoutProcess() ->getCheckoutSession() - ->customerHasLoggedIn() - ; + ->customerHasLoggedIn(); if ($this->logged_in && !$this->getCheckoutSession()->getCustomer()->is_guest) { $this->step_is_complete = true; diff --git a/classes/checkout/CheckoutProcess.php b/classes/checkout/CheckoutProcess.php index e2c7e2817386b..d70540b93b1c3 100644 --- a/classes/checkout/CheckoutProcess.php +++ b/classes/checkout/CheckoutProcess.php @@ -150,8 +150,7 @@ public function restorePersistedData(array $data) $step ->setReachable($stepData['step_is_reachable']) ->setComplete($stepData['step_is_complete']) - ->restorePersistedData($stepData) - ; + ->restorePersistedData($stepData); } } diff --git a/classes/checkout/ConditionsToApproveFinder.php b/classes/checkout/ConditionsToApproveFinder.php index 9100ce9a12fb1..026d0b2b3fe89 100644 --- a/classes/checkout/ConditionsToApproveFinder.php +++ b/classes/checkout/ConditionsToApproveFinder.php @@ -50,8 +50,7 @@ private function getDefaultTermsAndConditions() $this->translator->trans('I agree to the [terms of service] and will adhere to them unconditionally.', array(), 'Shop.Theme.Checkout'), $link ) - ->setIdentifier('terms-and-conditions') - ; + ->setIdentifier('terms-and-conditions'); return $termsAndConditions; } diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index e92ed166ddcaa..50bd21e36c5bb 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -587,8 +587,7 @@ public function isXmlHttpRequest() { return !empty($_SERVER['HTTP_X_REQUESTED_WITH']) - && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' - ; + && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'; } public function getLayout() diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index c07efeded41d5..248fce87b7c8b 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -1858,8 +1858,7 @@ protected function makeCustomerFormatter() $formatter ->setAskForPartnerOptin(Configuration::get('PS_CUSTOMER_OPTIN')) ->setAskForBirthdate(Configuration::get('PS_CUSTOMER_BIRTHDATE')) - ->setPartnerOptinRequired($customer->isFieldRequired('optin')) - ; + ->setPartnerOptinRequired($customer->isFieldRequired('optin')); return $formatter; } diff --git a/classes/controller/ProductListingFrontController.php b/classes/controller/ProductListingFrontController.php index 3a84706500568..9c0d840bae318 100644 --- a/classes/controller/ProductListingFrontController.php +++ b/classes/controller/ProductListingFrontController.php @@ -51,8 +51,7 @@ abstract class ProductListingFrontControllerCore extends ProductPresentingFrontC private function prepareProductForTemplate(array $rawProduct) { $product = (new ProductAssembler($this->context)) - ->assembleProduct($rawProduct) - ; + ->assembleProduct($rawProduct); $presenter = $this->getProductPresenter(); $settings = $this->getProductPresentationSettings(); @@ -94,8 +93,7 @@ protected function getProductSearchContext() $this->context->customer ? $this->context->customer->id : null - ) - ; + ); } /** @@ -279,8 +277,7 @@ protected function getProductSearchVariables() // we need to set a few parameters from back-end preferences $query ->setResultsPerPage($resultsPerPage) - ->setPage(max((int) Tools::getValue('page'), 1)) - ; + ->setPage(max((int) Tools::getValue('page'), 1)); // set the sort order if provided in the URL if (($encodedSortOrder = Tools::getValue('order'))) { @@ -409,8 +406,7 @@ protected function getTemplateVarPagination( ->setPage($query->getPage()) ->setPagesCount( ceil($result->getTotalProductsCount() / $query->getResultsPerPage()) - ) - ; + ); $totalItems = $result->getTotalProductsCount(); $itemsShownFrom = ($query->getResultsPerPage() * ($query->getPage() - 1)) + 1; diff --git a/classes/form/CustomerFormatter.php b/classes/form/CustomerFormatter.php index 6563777de2ed7..272082642fe9d 100644 --- a/classes/form/CustomerFormatter.php +++ b/classes/form/CustomerFormatter.php @@ -93,8 +93,7 @@ public function getFormat() $format['id_customer'] = (new FormField()) ->setName('id_customer') - ->setType('hidden') - ; + ->setType('hidden'); $genders = Gender::getGenders($this->language->id); if ($genders->count() > 0) { @@ -107,8 +106,7 @@ public function getFormat() [], 'Shop.Forms.Labels' ) - ) - ; + ); foreach ($genders as $gender) { $genderField->addAvailableValue($gender->id, $gender->name); } @@ -124,8 +122,7 @@ public function getFormat() 'Shop.Forms.Labels' ) ) - ->setRequired(true) - ; + ->setRequired(true); $format['lastname'] = (new FormField()) ->setName('lastname') @@ -136,8 +133,7 @@ public function getFormat() 'Shop.Forms.Labels' ) ) - ->setRequired(true) - ; + ->setRequired(true); if (Configuration::get('PS_B2B_ENABLE')) { $format['company'] = (new FormField()) @@ -169,8 +165,7 @@ public function getFormat() 'Shop.Forms.Labels' ) ) - ->setRequired(true) - ; + ->setRequired(true); if ($this->ask_for_password) { $format['password'] = (new FormField()) @@ -183,8 +178,7 @@ public function getFormat() 'Shop.Forms.Labels' ) ) - ->setRequired($this->password_is_required) - ; + ->setRequired($this->password_is_required); } if ($this->ask_for_new_password) { @@ -197,8 +191,7 @@ public function getFormat() [], 'Shop.Forms.Labels' ) - ) - ; + ); } if ($this->ask_for_birthdate) { @@ -216,8 +209,7 @@ public function getFormat() ->addAvailableValue( 'comment', $this->translator->trans('(E.g.: %date_format%)', array('%date_format%' => Tools::formatDateStr('31 May 1970')), 'Shop.Forms.Help') - ) - ; + ); } if ($this->ask_for_partner_optin) { @@ -231,8 +223,7 @@ public function getFormat() 'Shop.Theme.Customeraccount' ) ) - ->setRequired($this->partner_optin_is_required) - ; + ->setRequired($this->partner_optin_is_required); } // ToDo, replace the hook exec with HookFinder when the associated PR will be merged diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 83fa4f416663b..73b9cdee55526 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -47,8 +47,7 @@ public function initContent() $register_form = $this ->makeCustomerForm() ->setGuestAllowed(false) - ->fillWith(Tools::getAllValues()) - ; + ->fillWith(Tools::getAllValues()); if (Tools::isSubmit('submitCreate')) { $hookResult = array_reduce( diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index fe6a7a1e59d21..934e00cb50166 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -48,8 +48,7 @@ public function initContent() ->setAskForNewPassword(true) ->setAskForPassword($this->passwordRequired) ->setPasswordRequired($this->passwordRequired) - ->setPartnerOptinRequired($customer->isFieldRequired('optin')) - ; + ->setPartnerOptinRequired($customer->isFieldRequired('optin')); if (Tools::isSubmit('submitCreate')) { $customer_form->fillWith(Tools::getAllValues()); diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 3854232ee9f31..b45348d544915 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -155,8 +155,7 @@ protected function bootstrap() $this->context, $translator ) - )) - ; + )); } /** diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 7cd62dcff5a54..8cfe4d26d23bc 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -1305,8 +1305,7 @@ protected function isValidCombination($productAttributeId, $productId) return Validate::isLoadedObject($combination) - && $combination->id_product == $productId - ; + && $combination->id_product == $productId; } return false; diff --git a/controllers/front/listing/BestSalesController.php b/controllers/front/listing/BestSalesController.php index 32702517df6de..90d049c2fa0bd 100644 --- a/controllers/front/listing/BestSalesController.php +++ b/controllers/front/listing/BestSalesController.php @@ -62,8 +62,7 @@ protected function getProductSearchQuery() $query = new ProductSearchQuery(); $query ->setQueryType('best-sales') - ->setSortOrder(new SortOrder('product', 'name', 'asc')) - ; + ->setSortOrder(new SortOrder('product', 'name', 'asc')); return $query; } diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php index 324df5e4a8cdd..1250d23f8ff30 100644 --- a/controllers/front/listing/CategoryController.php +++ b/controllers/front/listing/CategoryController.php @@ -168,8 +168,7 @@ protected function getProductSearchQuery() $query = new ProductSearchQuery(); $query ->setIdCategory($this->category->id) - ->setSortOrder(new SortOrder('product', Tools::getProductsOrder('by'), Tools::getProductsOrder('way'))) - ; + ->setSortOrder(new SortOrder('product', Tools::getProductsOrder('by'), Tools::getProductsOrder('way'))); return $query; } diff --git a/controllers/front/listing/NewProductsController.php b/controllers/front/listing/NewProductsController.php index f29e56b77db7d..49185f088863a 100644 --- a/controllers/front/listing/NewProductsController.php +++ b/controllers/front/listing/NewProductsController.php @@ -46,8 +46,7 @@ protected function getProductSearchQuery() $query = new ProductSearchQuery(); $query ->setQueryType('new-products') - ->setSortOrder(new SortOrder('product', 'date_add', 'desc')) - ; + ->setSortOrder(new SortOrder('product', 'date_add', 'desc')); return $query; } diff --git a/controllers/front/listing/PricesDropController.php b/controllers/front/listing/PricesDropController.php index 7015ae6da8ba2..7adafaa38d748 100644 --- a/controllers/front/listing/PricesDropController.php +++ b/controllers/front/listing/PricesDropController.php @@ -46,8 +46,7 @@ protected function getProductSearchQuery() $query = new ProductSearchQuery(); $query ->setQueryType('prices-drop') - ->setSortOrder(new SortOrder('product', 'name', 'asc')) - ; + ->setSortOrder(new SortOrder('product', 'name', 'asc')); return $query; } diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php index 2380a69921598..3f7d4289eb7a5 100644 --- a/controllers/front/listing/SupplierController.php +++ b/controllers/front/listing/SupplierController.php @@ -108,8 +108,7 @@ protected function getProductSearchQuery() $query = new ProductSearchQuery(); $query ->setIdSupplier($this->supplier->id) - ->setSortOrder(new SortOrder('product', 'position', 'asc')) - ; + ->setSortOrder(new SortOrder('product', 'position', 'asc')); return $query; } diff --git a/install-dev/upgrade/php/p1540_add_missing_columns.php b/install-dev/upgrade/php/p1540_add_missing_columns.php index f6486dbb84664..480b1a43c0c1f 100644 --- a/install-dev/upgrade/php/p1540_add_missing_columns.php +++ b/install-dev/upgrade/php/p1540_add_missing_columns.php @@ -56,16 +56,14 @@ function p1540_add_missing_columns() } } - $key_exists = Db::getInstance()->executeS('SHOW INDEX FROM `'._DB_PREFIX_.'stock_available` WHERE KEY_NAME = "product_sqlstock"'); - ; + $key_exists = Db::getInstance()->executeS('SHOW INDEX FROM `'._DB_PREFIX_.'stock_available` WHERE KEY_NAME = "product_sqlstock"');; if (is_array($key_exists) && count($key_exists)) { if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'stock_available` DROP INDEX `product_sqlstock`')) { $errors[] = Db::getInstance()->getMsgError(); } } - $key_exists = Db::getInstance()->executeS('SHOW INDEX FROM `'._DB_PREFIX_.'stock_available` WHERE KEY_NAME = "id_product_2"'); - ; + $key_exists = Db::getInstance()->executeS('SHOW INDEX FROM `'._DB_PREFIX_.'stock_available` WHERE KEY_NAME = "id_product_2"');; if (is_array($key_exists) && count($key_exists)) { if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'stock_available` DROP INDEX `id_product_2`')) { $errors[] = Db::getInstance()->getMsgError(); diff --git a/src/Adapter/Backup/BackupRepository.php b/src/Adapter/Backup/BackupRepository.php index 96b46bd322819..c0b9aa6cca2ef 100644 --- a/src/Adapter/Backup/BackupRepository.php +++ b/src/Adapter/Backup/BackupRepository.php @@ -48,8 +48,7 @@ public function retrieveBackups() ->files() ->in(PrestaShopBackup::getBackupPath()) ->name('/^([_a-zA-Z0-9\-]*[\d]+-[a-z\d]+)\.sql(\.gz|\.bz2)?$/') - ->depth(0) - ; + ->depth(0); $backups = new BackupCollection(); diff --git a/src/Adapter/Configuration/LogsConfiguration.php b/src/Adapter/Configuration/LogsConfiguration.php index 8a484070ba4a4..7d35d7b3d593f 100644 --- a/src/Adapter/Configuration/LogsConfiguration.php +++ b/src/Adapter/Configuration/LogsConfiguration.php @@ -73,8 +73,7 @@ public function validateConfiguration(array $configuration) $resolver = new OptionsResolver(); $resolver ->setRequired(array('logs_by_email')) - ->resolve($configuration) - ; + ->resolve($configuration); return true; } diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php index 6ab11cbd7b0ed..59ecdf8493f33 100644 --- a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php +++ b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php @@ -171,8 +171,7 @@ private function getPersonalInformation(Customer $customer) $lastUpdateDate = Tools::displayDate($customer->date_upd, null, true); $lastVisitDate = $customerStats['last_visit'] ? Tools::displayDate($customerStats['last_visit'], null, true) : - $this->translator->trans('Never', [], 'Admin.Global') - ; + $this->translator->trans('Never', [], 'Admin.Global'); $customerShop = new Shop($customer->id_shop); $customerLanguage = new Language($customer->id_lang); @@ -216,8 +215,7 @@ private function getCustomerRankBySales($customerId) WHERE valid = 1 AND id_customer != ' . (int) $customerId . ' GROUP BY id_customer - HAVING SUM(total_paid_real) > ' . (int) $totalPaid - ; + HAVING SUM(total_paid_real) > ' . (int) $totalPaid; Db::getInstance()->getValue($sql); @@ -401,8 +399,7 @@ private function getCustomerMessages(Customer $customer) foreach ($messages as $message) { $status = isset($messageStatuses[$message['status']]) ? $messageStatuses[$message['status']] : - $message['status'] - ; + $message['status']; $customerMessages[] = new MessageInformation( (int) $message['id_customer_thread'], @@ -479,8 +476,7 @@ private function getLastCustomerConnections(Customer $customer) foreach ($connections as $connection) { $httpReferer = $connection['http_referer'] ? preg_replace('/^www./', '', parse_url($connection['http_referer'], PHP_URL_HOST)) : - $this->translator->trans('Direct link', [], 'Admin.Orderscustomers.Notification') - ; + $this->translator->trans('Direct link', [], 'Admin.Orderscustomers.Notification'); $lastConnections[] = new LastConnectionInformation( $connection['id_connections'], diff --git a/src/Adapter/Email/EmailConfigurationTester.php b/src/Adapter/Email/EmailConfigurationTester.php index 85cea96944cbf..20ba6eaf362f0 100644 --- a/src/Adapter/Email/EmailConfigurationTester.php +++ b/src/Adapter/Email/EmailConfigurationTester.php @@ -78,8 +78,7 @@ public function testConfiguration(array $config) $password = !empty($config['smtp_password']) ? urldecode($config['smtp_password']) : - $this->configuration->get('PS_MAIL_PASSWD') - ; + $this->configuration->get('PS_MAIL_PASSWD'); $password = str_replace( ['<', '>', '"', '&'], ['<', '>', '"', '&'], diff --git a/src/Adapter/HookManager.php b/src/Adapter/HookManager.php index e2395384ad3d9..9cad3af4ff31b 100644 --- a/src/Adapter/HookManager.php +++ b/src/Adapter/HookManager.php @@ -73,8 +73,7 @@ public function exec( return $hookDispatcher ->dispatchRenderingWithParameters($hook_name, $hook_args) - ->getContent() - ; + ->getContent(); } else { try { return Hook::exec($hook_name, $hook_args, $id_module, $array_return, $check_exceptions, $use_push, $id_shop); diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php index 00caa5f870bc8..725a5197ab04a 100644 --- a/src/Adapter/Module/AdminModuleDataProvider.php +++ b/src/Adapter/Module/AdminModuleDataProvider.php @@ -450,8 +450,7 @@ protected function loadCatalogData() $addon->origin = $action; $addon->origin_filter_value = $action_filter_value; $addon->categoryParent = $this->categoriesProvider - ->getParentCategory($addon->categoryName) - ; + ->getParentCategory($addon->categoryName); if (isset($addon->version)) { $addon->version_available = $addon->version; } diff --git a/src/Adapter/Module/ModuleZipManager.php b/src/Adapter/Module/ModuleZipManager.php index 77f69ba290678..b319c77a90f0d 100644 --- a/src/Adapter/Module/ModuleZipManager.php +++ b/src/Adapter/Module/ModuleZipManager.php @@ -181,8 +181,7 @@ public function storeInModulesFolder($source) ->dispatch( ModuleZipManagementEvent::DOWNLOAD, new ModuleZipManagementEvent($this->getSource($source)) - ) - ; + ); $this->filesystem->remove($sandboxPath); } diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php index d8c2b99903bb8..1612a7a3fb1d3 100644 --- a/src/Adapter/Presenter/Cart/CartPresenter.php +++ b/src/Adapter/Presenter/Cart/CartPresenter.php @@ -415,8 +415,7 @@ public function present($cart, $shouldSeparateGifts = false) $summary_string = $products_count === 1 ? $this->translator->trans('1 item', array(), 'Shop.Theme.Checkout') : - $this->translator->trans('%count% items', array('%count%' => $products_count), 'Shop.Theme.Checkout') - ; + $this->translator->trans('%count% items', array('%count%' => $products_count), 'Shop.Theme.Checkout'); $minimalPurchase = $this->priceFormatter->convertAmount((float) Configuration::get('PS_PURCHASE_MINIMUM')); diff --git a/src/Core/Addon/Theme/ThemeManager.php b/src/Core/Addon/Theme/ThemeManager.php index 128db0231fc01..ecb00484153df 100644 --- a/src/Core/Addon/Theme/ThemeManager.php +++ b/src/Core/Addon/Theme/ThemeManager.php @@ -486,8 +486,7 @@ private function getDefaultDomains($locale, $themeProvider) $defaultCatalogue = $themeProvider ->setLocale($locale) - ->getDefaultCatalogue() - ; + ->getDefaultCatalogue(); if (empty($defaultCatalogue)) { return $allDomains; diff --git a/src/Core/Domain/Category/Command/AddCategoryCommand.php b/src/Core/Domain/Category/Command/AddCategoryCommand.php index ee7bb7aa663c4..0ec93b763381b 100644 --- a/src/Core/Domain/Category/Command/AddCategoryCommand.php +++ b/src/Core/Domain/Category/Command/AddCategoryCommand.php @@ -52,8 +52,7 @@ public function __construct(array $localizedNames, array $localizedLinkRewrites, ->setLocalizedNames($localizedNames) ->setLocalizedLinkRewrites($localizedLinkRewrites) ->setIsActive($isActive) - ->setParentCategoryId($parentCategoryId) - ; + ->setParentCategoryId($parentCategoryId); } /** diff --git a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php index 730290bb01f02..848cc564daaa0 100644 --- a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php +++ b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php @@ -45,7 +45,6 @@ public function __construct(array $name, array $linkRewrite, $isActive) $this ->setLocalizedNames($name) ->setLocalizedLinkRewrites($linkRewrite) - ->setIsActive($isActive) - ; + ->setIsActive($isActive); } } diff --git a/src/Core/Domain/Category/Command/BulkDeleteCategoriesCommand.php b/src/Core/Domain/Category/Command/BulkDeleteCategoriesCommand.php index 8bb8a9fc5165a..ae3b43e43d637 100644 --- a/src/Core/Domain/Category/Command/BulkDeleteCategoriesCommand.php +++ b/src/Core/Domain/Category/Command/BulkDeleteCategoriesCommand.php @@ -57,8 +57,7 @@ public function __construct(array $categoryIds, CategoryDeleteMode $deleteMode) { $this ->setCategoryIds($categoryIds) - ->setDeleteMode($deleteMode) - ; + ->setDeleteMode($deleteMode); } /** diff --git a/src/Core/Domain/Category/Command/UpdateCategoriesStatusCommand.php b/src/Core/Domain/Category/Command/UpdateCategoriesStatusCommand.php index 2f5476ca6e4a0..4e898472673d1 100644 --- a/src/Core/Domain/Category/Command/UpdateCategoriesStatusCommand.php +++ b/src/Core/Domain/Category/Command/UpdateCategoriesStatusCommand.php @@ -57,8 +57,7 @@ public function __construct(array $categoryIds, CategoryStatus $newStatus) { $this ->setCategoryIds($categoryIds) - ->setNewStatus($newStatus) - ; + ->setNewStatus($newStatus); } /** diff --git a/src/Core/Domain/SqlManagement/Command/AddSqlRequestCommand.php b/src/Core/Domain/SqlManagement/Command/AddSqlRequestCommand.php index 0368c94834ae5..6b58e28d5fbe9 100644 --- a/src/Core/Domain/SqlManagement/Command/AddSqlRequestCommand.php +++ b/src/Core/Domain/SqlManagement/Command/AddSqlRequestCommand.php @@ -53,8 +53,7 @@ public function __construct($name, $sql) { $this ->setName($name) - ->setSql($sql) - ; + ->setSql($sql); } /** diff --git a/src/Core/Domain/SqlManagement/EditableSqlRequest.php b/src/Core/Domain/SqlManagement/EditableSqlRequest.php index 194d522f40326..124d7e44e09a1 100644 --- a/src/Core/Domain/SqlManagement/EditableSqlRequest.php +++ b/src/Core/Domain/SqlManagement/EditableSqlRequest.php @@ -64,8 +64,7 @@ public function __construct( $this ->setSqlRequestId($requestSqlId) ->setName($name) - ->setSql($sql) - ; + ->setSql($sql); } /** diff --git a/src/Core/Domain/SqlManagement/ValueObject/DatabaseTableField.php b/src/Core/Domain/SqlManagement/ValueObject/DatabaseTableField.php index 23e8a2ace175c..500e88effdaa1 100644 --- a/src/Core/Domain/SqlManagement/ValueObject/DatabaseTableField.php +++ b/src/Core/Domain/SqlManagement/ValueObject/DatabaseTableField.php @@ -53,8 +53,7 @@ public function __construct($name, $type) { $this ->setName($name) - ->setType($type) - ; + ->setType($type); } /** diff --git a/src/Core/File/InvoiceModelFinder.php b/src/Core/File/InvoiceModelFinder.php index 01c81f28b406b..9734c29050152 100644 --- a/src/Core/File/InvoiceModelFinder.php +++ b/src/Core/File/InvoiceModelFinder.php @@ -66,8 +66,7 @@ public function find() $finder = new Finder(); $finder->files() ->in($directories) - ->name('invoice-*.tpl') - ; + ->name('invoice-*.tpl'); $fileNames = []; diff --git a/src/Core/Form/IdentifiableObject/DataHandler/SqlRequestFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/SqlRequestFormDataHandler.php index 5d22fa08d19a6..da3ca60e8e34b 100644 --- a/src/Core/Form/IdentifiableObject/DataHandler/SqlRequestFormDataHandler.php +++ b/src/Core/Form/IdentifiableObject/DataHandler/SqlRequestFormDataHandler.php @@ -69,8 +69,7 @@ public function update($id, array $data) $command = (new EditSqlRequestCommand($sqlRequestId)) ->setName($data['name']) - ->setSql($data['sql']) - ; + ->setSql($data['sql']); $this->commandBus->handle($command); diff --git a/src/Core/Grid/Action/Bulk/Type/Catalog/Category/DeleteCategoriesBulkAction.php b/src/Core/Grid/Action/Bulk/Type/Catalog/Category/DeleteCategoriesBulkAction.php index 4dafc4a4c4108..ba3f453e89790 100644 --- a/src/Core/Grid/Action/Bulk/Type/Catalog/Category/DeleteCategoriesBulkAction.php +++ b/src/Core/Grid/Action/Bulk/Type/Catalog/Category/DeleteCategoriesBulkAction.php @@ -51,7 +51,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setRequired([ 'categories_bulk_delete_route', ]) - ->setAllowedTypes('categories_bulk_delete_route', 'string') - ; + ->setAllowedTypes('categories_bulk_delete_route', 'string'); } } diff --git a/src/Core/Grid/Action/Bulk/Type/SubmitBulkAction.php b/src/Core/Grid/Action/Bulk/Type/SubmitBulkAction.php index 1b50920cb2e2b..2db2866605cf8 100644 --- a/src/Core/Grid/Action/Bulk/Type/SubmitBulkAction.php +++ b/src/Core/Grid/Action/Bulk/Type/SubmitBulkAction.php @@ -57,7 +57,6 @@ protected function configureOptions(OptionsResolver $resolver) ]) ->setAllowedTypes('submit_route', 'string') ->setAllowedTypes('confirm_message', ['string', 'null']) - ->setAllowedValues('submit_method', ['POST', 'GET']) - ; + ->setAllowedValues('submit_method', ['POST', 'GET']); } } diff --git a/src/Core/Grid/Action/Row/Type/Category/DeleteCategoryRowAction.php b/src/Core/Grid/Action/Row/Type/Category/DeleteCategoryRowAction.php index 754b1cb3fa147..999b4335634c3 100644 --- a/src/Core/Grid/Action/Row/Type/Category/DeleteCategoryRowAction.php +++ b/src/Core/Grid/Action/Row/Type/Category/DeleteCategoryRowAction.php @@ -53,7 +53,6 @@ protected function configureOptions(OptionsResolver $resolver) 'category_delete_route', ]) ->setAllowedTypes('category_id_field', 'string') - ->setAllowedTypes('category_delete_route', 'string') - ; + ->setAllowedTypes('category_delete_route', 'string'); } } diff --git a/src/Core/Grid/Action/Row/Type/LinkRowAction.php b/src/Core/Grid/Action/Row/Type/LinkRowAction.php index ae208c3d9a3ab..4a9dde6813fce 100644 --- a/src/Core/Grid/Action/Row/Type/LinkRowAction.php +++ b/src/Core/Grid/Action/Row/Type/LinkRowAction.php @@ -59,8 +59,7 @@ protected function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('route_param_name', 'string') ->setAllowedTypes('route_param_field', 'string') ->setAllowedTypes('confirm_message', 'string') - ->setAllowedTypes('accessibility_checker', [AccessibilityCheckerInterface::class, 'callable', 'null']) - ; + ->setAllowedTypes('accessibility_checker', [AccessibilityCheckerInterface::class, 'callable', 'null']); } /** diff --git a/src/Core/Grid/Action/Row/Type/SubmitRowAction.php b/src/Core/Grid/Action/Row/Type/SubmitRowAction.php index 06efd4e10ca94..578fd83f4fd28 100644 --- a/src/Core/Grid/Action/Row/Type/SubmitRowAction.php +++ b/src/Core/Grid/Action/Row/Type/SubmitRowAction.php @@ -64,8 +64,7 @@ public function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('route_param_field', 'string') ->setAllowedTypes('method', 'string') ->setAllowedTypes('confirm_message', 'string') - ->setAllowedTypes('accessibility_checker', [AccessibilityCheckerInterface::class, 'callable', 'null']) - ; + ->setAllowedTypes('accessibility_checker', [AccessibilityCheckerInterface::class, 'callable', 'null']); } /** diff --git a/src/Core/Grid/Action/Type/LinkGridAction.php b/src/Core/Grid/Action/Type/LinkGridAction.php index bdcba0d0d160b..84280ef7ea80d 100644 --- a/src/Core/Grid/Action/Type/LinkGridAction.php +++ b/src/Core/Grid/Action/Type/LinkGridAction.php @@ -55,7 +55,6 @@ protected function configureOptions(OptionsResolver $resolver) 'route_params' => [], ]) ->setAllowedTypes('route', 'string') - ->setAllowedTypes('route_params', 'array') - ; + ->setAllowedTypes('route_params', 'array'); } } diff --git a/src/Core/Grid/Action/Type/SubmitGridAction.php b/src/Core/Grid/Action/Type/SubmitGridAction.php index bb6e295b0c8ad..ca4b6f5a386d7 100644 --- a/src/Core/Grid/Action/Type/SubmitGridAction.php +++ b/src/Core/Grid/Action/Type/SubmitGridAction.php @@ -57,7 +57,6 @@ protected function configureOptions(OptionsResolver $resolver) ]) ->setAllowedTypes('submit_route', 'string') ->setAllowedTypes('confirm_message', ['null', 'string']) - ->setAllowedValues('submit_method', ['POST', 'GET']) - ; + ->setAllowedValues('submit_method', ['POST', 'GET']); } } diff --git a/src/Core/Grid/Column/AbstractColumn.php b/src/Core/Grid/Column/AbstractColumn.php index 7e051f10721e6..a5b817468b027 100644 --- a/src/Core/Grid/Column/AbstractColumn.php +++ b/src/Core/Grid/Column/AbstractColumn.php @@ -115,8 +115,7 @@ protected function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'sortable' => true, ]) - ->setAllowedTypes('sortable', 'bool') - ; + ->setAllowedTypes('sortable', 'bool'); } /** diff --git a/src/Core/Grid/Column/Type/Catalog/PositionColumn.php b/src/Core/Grid/Column/Type/Catalog/PositionColumn.php index cb31783874374..b0a72a066a10e 100644 --- a/src/Core/Grid/Column/Type/Catalog/PositionColumn.php +++ b/src/Core/Grid/Column/Type/Catalog/PositionColumn.php @@ -70,7 +70,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('sortable', 'bool') ->setAllowedTypes('update_method', 'string') ->setAllowedTypes('record_route_params', ['array']) - ->setAllowedValues('update_method', ['GET', 'POST']) - ; + ->setAllowedValues('update_method', ['GET', 'POST']); } } diff --git a/src/Core/Grid/Column/Type/Category/CategoryPositionColumn.php b/src/Core/Grid/Column/Type/Category/CategoryPositionColumn.php index f69d0511a4acc..c09c214cea3a8 100644 --- a/src/Core/Grid/Column/Type/Category/CategoryPositionColumn.php +++ b/src/Core/Grid/Column/Type/Category/CategoryPositionColumn.php @@ -61,7 +61,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('field', 'string') ->setAllowedTypes('id_field', 'string') ->setAllowedTypes('id_parent_field', 'string') - ->setAllowedTypes('update_route', 'string') - ; + ->setAllowedTypes('update_route', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Common/ActionColumn.php b/src/Core/Grid/Column/Type/Common/ActionColumn.php index 0537ab42a3217..2a8ce3b3c7559 100644 --- a/src/Core/Grid/Column/Type/Common/ActionColumn.php +++ b/src/Core/Grid/Column/Type/Common/ActionColumn.php @@ -49,7 +49,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'actions' => null, ]) - ->setAllowedTypes('actions', ['null', RowActionCollection::class]) - ; + ->setAllowedTypes('actions', ['null', RowActionCollection::class]); } } diff --git a/src/Core/Grid/Column/Type/Common/BadgeColumn.php b/src/Core/Grid/Column/Type/Common/BadgeColumn.php index 7d42cc4e0aa2c..cb334908808e5 100644 --- a/src/Core/Grid/Column/Type/Common/BadgeColumn.php +++ b/src/Core/Grid/Column/Type/Common/BadgeColumn.php @@ -59,7 +59,6 @@ protected function configureOptions(OptionsResolver $resolver) ]) ->setAllowedTypes('field', 'string') ->setAllowedTypes('empty_value', 'string') - ->setAllowedValues('badge_type', ['success', 'info', 'danger', 'warning']) - ; + ->setAllowedValues('badge_type', ['success', 'info', 'danger', 'warning']); } } diff --git a/src/Core/Grid/Column/Type/Common/BulkActionColumn.php b/src/Core/Grid/Column/Type/Common/BulkActionColumn.php index d35adf9238ff8..06f26c390b7f6 100644 --- a/src/Core/Grid/Column/Type/Common/BulkActionColumn.php +++ b/src/Core/Grid/Column/Type/Common/BulkActionColumn.php @@ -48,7 +48,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setRequired([ 'bulk_field', ]) - ->setAllowedTypes('bulk_field', 'string') - ; + ->setAllowedTypes('bulk_field', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Common/DateTimeColumn.php b/src/Core/Grid/Column/Type/Common/DateTimeColumn.php index 81a02e94aef1f..07c5a1bd29e62 100644 --- a/src/Core/Grid/Column/Type/Common/DateTimeColumn.php +++ b/src/Core/Grid/Column/Type/Common/DateTimeColumn.php @@ -54,7 +54,6 @@ protected function configureOptions(OptionsResolver $resolver) 'format' => 'Y-m-d H:i:s', ]) ->setAllowedTypes('format', 'string') - ->setAllowedTypes('field', 'string') - ; + ->setAllowedTypes('field', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Common/ImageColumn.php b/src/Core/Grid/Column/Type/Common/ImageColumn.php index ee429070a906e..7cdad3b21183f 100644 --- a/src/Core/Grid/Column/Type/Common/ImageColumn.php +++ b/src/Core/Grid/Column/Type/Common/ImageColumn.php @@ -51,7 +51,6 @@ public function configureOptions(OptionsResolver $resolver) ->setRequired([ 'src_field', ]) - ->setAllowedTypes('src_field', 'string') - ; + ->setAllowedTypes('src_field', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Common/LinkColumn.php b/src/Core/Grid/Column/Type/Common/LinkColumn.php index 185dae29bea14..e0d3b30942c05 100644 --- a/src/Core/Grid/Column/Type/Common/LinkColumn.php +++ b/src/Core/Grid/Column/Type/Common/LinkColumn.php @@ -61,7 +61,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('route', 'string') ->setAllowedTypes('route_param_name', 'string') ->setAllowedTypes('route_param_field', 'string') - ->setAllowedTypes('sortable', 'bool') - ; + ->setAllowedTypes('sortable', 'bool'); } } diff --git a/src/Core/Grid/Column/Type/DataColumn.php b/src/Core/Grid/Column/Type/DataColumn.php index 8258e551d4a40..741197a287127 100644 --- a/src/Core/Grid/Column/Type/DataColumn.php +++ b/src/Core/Grid/Column/Type/DataColumn.php @@ -53,7 +53,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setRequired([ 'field', ]) - ->setAllowedTypes('field', 'string') - ; + ->setAllowedTypes('field', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Employee/EmployeeNameWithAvatarColumn.php b/src/Core/Grid/Column/Type/Employee/EmployeeNameWithAvatarColumn.php index 155acf5eb28e1..57427f29f13b2 100644 --- a/src/Core/Grid/Column/Type/Employee/EmployeeNameWithAvatarColumn.php +++ b/src/Core/Grid/Column/Type/Employee/EmployeeNameWithAvatarColumn.php @@ -50,7 +50,6 @@ protected function configureOptions(OptionsResolver $resolver) ->setRequired([ 'field', ]) - ->setAllowedTypes('field', 'string') - ; + ->setAllowedTypes('field', 'string'); } } diff --git a/src/Core/Grid/Column/Type/Status/SeverityLevelColumn.php b/src/Core/Grid/Column/Type/Status/SeverityLevelColumn.php index 87a53c2f5726a..e9d44d83af486 100644 --- a/src/Core/Grid/Column/Type/Status/SeverityLevelColumn.php +++ b/src/Core/Grid/Column/Type/Status/SeverityLevelColumn.php @@ -54,7 +54,6 @@ protected function configureOptions(OptionsResolver $resolver) 'with_message' => false, ]) ->setAllowedTypes('with_message', 'bool') - ->setAllowedTypes('field', 'string') - ; + ->setAllowedTypes('field', 'string'); } } diff --git a/src/Core/Grid/Definition/Factory/BackupDefinitionFactory.php b/src/Core/Grid/Definition/Factory/BackupDefinitionFactory.php index 7d5b92b6c1228..88f9c60c11c50 100644 --- a/src/Core/Grid/Definition/Factory/BackupDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/BackupDefinitionFactory.php @@ -131,8 +131,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -148,7 +147,6 @@ protected function getBulkActions() 'submit_route' => 'admin_backups_bulk_delete', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/CategoryGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CategoryGridDefinitionFactory.php index 1cfa7727d73d3..7d349ff795a6e 100644 --- a/src/Core/Grid/Definition/Factory/CategoryGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/CategoryGridDefinitionFactory.php @@ -161,8 +161,7 @@ protected function getColumns() ->setOptions([ 'actions' => $this->getRowActions(), ]) - ) - ; + ); if ($this->multistoreContextChecker->isSingleShopContext()) { $columns->addAfter( @@ -221,8 +220,7 @@ protected function getFilters() 'data-redirect' => $this->redirectActionUrl, ], ]) - ) - ; + ); if ($this->multistoreContextChecker->isSingleShopContext()) { $filters->add( @@ -276,8 +274,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -306,8 +303,7 @@ protected function getBulkActions() ->setOptions([ 'categories_bulk_delete_route' => 'admin_category_process_bulk_delete', ]) - ) - ; + ); } /** @@ -345,7 +341,6 @@ private function getRowActions() 'category_id_field' => 'id_category', 'category_delete_route' => 'admin_category_process_delete', ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/ContactGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ContactGridDefinitionFactory.php index 1f9257f248657..b8c5ff2ca1de4 100644 --- a/src/Core/Grid/Definition/Factory/ContactGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/ContactGridDefinitionFactory.php @@ -154,8 +154,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -202,8 +201,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -219,8 +217,7 @@ protected function getBulkActions() 'submit_route' => 'admin_contacts_delete_bulk', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } /** @@ -243,7 +240,6 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/CustomerGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CustomerGridDefinitionFactory.php index 970f2b467cee4..239aa97dc7d8d 100644 --- a/src/Core/Grid/Definition/Factory/CustomerGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/CustomerGridDefinitionFactory.php @@ -240,8 +240,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); if ($this->isB2bFeatureEnabled) { $columns->addAfter( @@ -344,8 +343,7 @@ protected function getFilters() 'redirect_route' => 'admin_customers_index', ]) ->setAssociatedColumn('actions') - ) - ; + ); if ($this->isB2bFeatureEnabled) { $filters->add( @@ -399,8 +397,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -429,7 +426,6 @@ protected function getBulkActions() ->setOptions([ 'submit_route' => 'admin_customers_index', ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/EmailLogsDefinitionFactory.php b/src/Core/Grid/Definition/Factory/EmailLogsDefinitionFactory.php index 1ff365cb29127..f1e7907a9083b 100644 --- a/src/Core/Grid/Definition/Factory/EmailLogsDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/EmailLogsDefinitionFactory.php @@ -167,8 +167,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -230,8 +229,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -263,8 +261,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -280,7 +277,6 @@ protected function getBulkActions() 'submit_route' => 'admin_emails_delete_bulk', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/EmployeeGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/EmployeeGridDefinitionFactory.php index 90e780f94b930..16939971d8013 100644 --- a/src/Core/Grid/Definition/Factory/EmployeeGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/EmployeeGridDefinitionFactory.php @@ -173,8 +173,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -239,8 +238,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -263,8 +261,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -293,7 +290,6 @@ protected function getBulkActions() ->setOptions([ 'submit_route' => 'admin_employees_index', ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/LanguageGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/LanguageGridDefinitionFactory.php index 62e8001ea84b1..23eb12907cc40 100644 --- a/src/Core/Grid/Definition/Factory/LanguageGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/LanguageGridDefinitionFactory.php @@ -193,8 +193,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -284,8 +283,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -308,8 +306,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -339,7 +336,6 @@ protected function getBulkActions() 'submit_route' => 'admin_languages_index', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php index 77c0896da3193..624ed2619b99f 100644 --- a/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php @@ -151,8 +151,7 @@ protected function getColumns() ->add( (new ActionColumn('actions')) ->setName($this->trans('Actions', [], 'Admin.Global')) - ) - ; + ); } /** @@ -226,8 +225,7 @@ public function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -259,7 +257,6 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/MetaGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/MetaGridDefinitionFactory.php index 6e00f43792b89..5257d2034a6d9 100644 --- a/src/Core/Grid/Definition/Factory/MetaGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/MetaGridDefinitionFactory.php @@ -158,8 +158,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -205,8 +204,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -229,8 +227,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -246,7 +243,6 @@ protected function getBulkActions() 'submit_route' => 'admin_metas_delete_bulk', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php index 9d4ce9e4d58c7..c2d1a17dcab81 100644 --- a/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php @@ -161,8 +161,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -201,8 +200,7 @@ public function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -219,8 +217,7 @@ protected function getBulkActions() 'submit_method' => 'POST', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } /** @@ -243,7 +240,6 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } } diff --git a/src/Core/Grid/Definition/Factory/WebserviceKeyDefinitionFactory.php b/src/Core/Grid/Definition/Factory/WebserviceKeyDefinitionFactory.php index c09a53499c9af..cd90e186f67af 100644 --- a/src/Core/Grid/Definition/Factory/WebserviceKeyDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/WebserviceKeyDefinitionFactory.php @@ -165,8 +165,7 @@ protected function getColumns() ]) ), ]) - ) - ; + ); } /** @@ -207,8 +206,7 @@ protected function getFilters() ], ]) ->setAssociatedColumn('actions') - ) - ; + ); } /** @@ -231,8 +229,7 @@ protected function getGridActions() (new SimpleGridAction('common_export_sql_manager')) ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions')) ->setIcon('storage') - ) - ; + ); } /** @@ -262,7 +259,6 @@ protected function getBulkActions() 'submit_route' => 'admin_delete_multiple_webservice_log', 'confirm_message' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), ]) - ) - ; + ); } } diff --git a/src/Core/Grid/Position/UpdateHandler/DoctrinePositionUpdateHandler.php b/src/Core/Grid/Position/UpdateHandler/DoctrinePositionUpdateHandler.php index c0b4eb50eba97..857256fb3fd7d 100644 --- a/src/Core/Grid/Position/UpdateHandler/DoctrinePositionUpdateHandler.php +++ b/src/Core/Grid/Position/UpdateHandler/DoctrinePositionUpdateHandler.php @@ -69,14 +69,12 @@ public function getCurrentPositions(PositionDefinitionInterface $positionDefinit $qb ->from($this->dbPrefix . $positionDefinition->getTable(), 't') ->select('t.' . $positionDefinition->getIdField() . ', t.' . $positionDefinition->getPositionField()) - ->addOrderBy('t.' . $positionDefinition->getPositionField(), 'ASC') - ; + ->addOrderBy('t.' . $positionDefinition->getPositionField(), 'ASC'); if (null !== $parentId && null !== $positionDefinition->getParentIdField()) { $qb ->andWhere('t.' . $positionDefinition->getParentIdField() . ' = :parentId') - ->setParameter('parentId', $parentId) - ; + ->setParameter('parentId', $parentId); } $positions = $qb->execute()->fetchAll(); @@ -104,8 +102,7 @@ public function updatePositions(PositionDefinitionInterface $positionDefinition, ->set($positionDefinition->getPositionField(), ':position') ->andWhere($positionDefinition->getIdField() . ' = :rowId') ->setParameter('rowId', $rowId) - ->setParameter('position', $positionIndex) - ; + ->setParameter('position', $positionIndex); $statement = $qb->execute(); if ($statement instanceof Statement && $statement->errorCode()) { diff --git a/src/Core/Grid/Query/Builder/CustomerQueryBuilder.php b/src/Core/Grid/Query/Builder/CustomerQueryBuilder.php index ed99a4e4482c2..b5672446eadf4 100644 --- a/src/Core/Grid/Query/Builder/CustomerQueryBuilder.php +++ b/src/Core/Grid/Query/Builder/CustomerQueryBuilder.php @@ -71,8 +71,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) { $searchQueryBuilder = $this->getCustomerQueryBuilder($searchCriteria) ->select('c.id_customer, c.firstname, c.lastname, c.email, c.active, c.newsletter, c.optin') - ->addSelect('c.date_add, gl.name as social_title, s.name as shop_name, c.company') - ; + ->addSelect('c.date_add, gl.name as social_title, s.name as shop_name, c.company'); $this->appendTotalSpentQuery($searchQueryBuilder); $this->appendLastVisitQuery($searchQueryBuilder); @@ -87,8 +86,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria) { $countQueryBuilder = $this->getCustomerQueryBuilder($searchCriteria) - ->select('COUNT(*)') - ; + ->select('COUNT(*)'); return $countQueryBuilder; } @@ -117,8 +115,7 @@ private function getCustomerQueryBuilder(SearchCriteriaInterface $searchCriteria ->where('c.deleted = 0') ->andWhere('c.id_shop IN (:context_shop_ids)') ->setParameter('context_shop_ids', $this->contextShopIds, Connection::PARAM_INT_ARRAY) - ->setParameter('context_lang_id', $this->contextLangId) - ; + ->setParameter('context_lang_id', $this->contextLangId); $this->applyFilters($searchCriteria->getFilters(), $queryBuilder); @@ -136,8 +133,7 @@ private function appendTotalSpentQuery(QueryBuilder $queryBuilder) ->where('o.id_customer = c.id_customer') ->andWhere('o.id_shop IN (:context_shop_ids)') ->andWhere('o.valid = 1') - ->setParameter('context_shop_ids', $this->contextShopIds, Connection::PARAM_INT_ARRAY) - ; + ->setParameter('context_shop_ids', $this->contextShopIds, Connection::PARAM_INT_ARRAY); $queryBuilder->addSelect('(' . $totalSpentQueryBuilder->getSQL() . ') as total_spent'); } @@ -155,8 +151,7 @@ private function appendLastVisitQuery(QueryBuilder $queryBuilder) ->leftJoin('g', $this->dbPrefix . 'connections', 'con', 'con.id_guest = g.id_guest') ->where('g.id_customer = c.id_customer') ->orderBy('c.date_add', 'DESC') - ->setMaxResults(1) - ; + ->setMaxResults(1); $queryBuilder->addSelect('(' . $lastVisitQueryBuilder->getSQL() . ') as connect'); } diff --git a/src/Core/Grid/Query/Builder/EmployeeQueryBuilder.php b/src/Core/Grid/Query/Builder/EmployeeQueryBuilder.php index c288beaa8a4ca..9e360ef212d90 100644 --- a/src/Core/Grid/Query/Builder/EmployeeQueryBuilder.php +++ b/src/Core/Grid/Query/Builder/EmployeeQueryBuilder.php @@ -79,8 +79,7 @@ public function __construct( public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) { $searchQueryBuilder = $this->getEmployeeQueryBuilder($searchCriteria) - ->select('e.*, pl.name as profile_name') - ; + ->select('e.*, pl.name as profile_name'); $this->searchCriteriaApplicator->applyPagination($searchCriteria, $searchQueryBuilder); $this->applySorting($searchCriteria, $searchQueryBuilder); @@ -94,8 +93,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria) { $countQueryBuilder = $this->getEmployeeQueryBuilder($searchCriteria) - ->select('COUNT(e.id_profile)') - ; + ->select('COUNT(e.id_profile)'); return $countQueryBuilder; } @@ -111,8 +109,7 @@ private function getEmployeeQueryBuilder(SearchCriteriaInterface $searchCriteria ->select(1) ->from($this->dbPrefix . 'employee_shop', 'es') ->where('e.id_employee = es.id_employee') - ->andWhere('es.id_shop IN (:context_shop_ids)') - ; + ->andWhere('es.id_shop IN (:context_shop_ids)'); $qb = $this->connection->createQueryBuilder() ->from($this->dbPrefix . 'employee', 'e') @@ -123,8 +120,7 @@ private function getEmployeeQueryBuilder(SearchCriteriaInterface $searchCriteria 'e.id_profile = pl.id_profile AND pl.id_lang = ' . (int) $this->contextIdLang ) ->andWhere('EXISTS (' . $sub->getSQL() . ')') - ->setParameter('context_shop_ids', $this->contextShopIds, Connection::PARAM_INT_ARRAY) - ; + ->setParameter('context_shop_ids', $this->contextShopIds, Connection::PARAM_INT_ARRAY); $this->applyFilters($qb, $searchCriteria->getFilters()); diff --git a/src/Core/Grid/Query/Builder/LanguageQueryBuilder.php b/src/Core/Grid/Query/Builder/LanguageQueryBuilder.php index 07fe823c6f03c..46ad2cf65bb14 100644 --- a/src/Core/Grid/Query/Builder/LanguageQueryBuilder.php +++ b/src/Core/Grid/Query/Builder/LanguageQueryBuilder.php @@ -63,13 +63,11 @@ public function __construct( public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) { $builder = $this->getLanguageQueryBuilder($searchCriteria) - ->select('l.*') - ; + ->select('l.*'); $this->searchCriteriaApplicator ->applySorting($searchCriteria, $builder) - ->applyPagination($searchCriteria, $builder) - ; + ->applyPagination($searchCriteria, $builder); return $builder; } @@ -90,8 +88,7 @@ public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria) private function getLanguageQueryBuilder(SearchCriteriaInterface $searchCriteria) { $builder = $this->connection->createQueryBuilder() - ->from($this->dbPrefix . 'lang', 'l') - ; + ->from($this->dbPrefix . 'lang', 'l'); $this->applyFilters($builder, $searchCriteria); diff --git a/src/Core/Grid/Query/CategoryQueryBuilder.php b/src/Core/Grid/Query/CategoryQueryBuilder.php index 5467e53079699..9b7a85bf96532 100644 --- a/src/Core/Grid/Query/CategoryQueryBuilder.php +++ b/src/Core/Grid/Query/CategoryQueryBuilder.php @@ -99,8 +99,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) $this->searchCriteriaApplicator ->applyPagination($searchCriteria, $qb) - ->applySorting($searchCriteria, $qb) - ; + ->applySorting($searchCriteria, $qb); return $qb; } @@ -129,8 +128,7 @@ private function getQueryBuilder(array $filters) ->createQueryBuilder() ->from($this->dbPrefix . 'category', 'c') ->setParameter('context_lang_id', $this->contextLangId) - ->setParameter('context_shop_id', $this->contextShopId) - ; + ->setParameter('context_shop_id', $this->contextShopId); $qb->leftJoin( 'c', diff --git a/src/Core/Grid/Query/ContactsQueryBuilder.php b/src/Core/Grid/Query/ContactsQueryBuilder.php index 09f6a9cdff948..9a342f4accc55 100644 --- a/src/Core/Grid/Query/ContactsQueryBuilder.php +++ b/src/Core/Grid/Query/ContactsQueryBuilder.php @@ -79,13 +79,11 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) $qb = $this->getQueryBuilder($searchCriteria->getFilters()); $qb ->select('c.id_contact, c.email, cl.name, cl.description') - ->groupBy('c.id_contact') - ; + ->groupBy('c.id_contact'); $this->searchCriteriaApplicator ->applySorting($searchCriteria, $qb) - ->applyPagination($searchCriteria, $qb) - ; + ->applyPagination($searchCriteria, $qb); return $qb; } @@ -96,8 +94,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria) { $qb = $this->getQueryBuilder($searchCriteria->getFilters()) - ->select('COUNT(DISTINCT c.id_contact)') - ; + ->select('COUNT(DISTINCT c.id_contact)'); return $qb; } @@ -126,8 +123,7 @@ private function getQueryBuilder(array $filters) ->andWhere('cl.`id_lang`= :language') ->andWhere('cs.`id_shop` IN (:shops)') ->setParameter('language', $this->languageId) - ->setParameter('shops', $this->contextShopsIds, Connection::PARAM_INT_ARRAY) - ; + ->setParameter('shops', $this->contextShopsIds, Connection::PARAM_INT_ARRAY); foreach ($filters as $name => $value) { if (!in_array($name, $allowedFilters, true)) { diff --git a/src/Core/Grid/Query/MetaQueryBuilder.php b/src/Core/Grid/Query/MetaQueryBuilder.php index 5faa7a11ada67..e105985f6c5ea 100644 --- a/src/Core/Grid/Query/MetaQueryBuilder.php +++ b/src/Core/Grid/Query/MetaQueryBuilder.php @@ -80,8 +80,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) $this->searchCriteriaApplicator ->applyPagination($searchCriteria, $qb) - ->applySorting($searchCriteria, $qb) - ; + ->applySorting($searchCriteria, $qb); return $qb; } diff --git a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php index c564b9fd9223a..828586503221a 100644 --- a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php +++ b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php @@ -75,8 +75,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) $this->getModifiedOrderBy($searchCriteria->getOrderBy()), $searchCriteria->getOrderWay() ) - ->groupBy('wa.`id_webservice_account`') - ; + ->groupBy('wa.`id_webservice_account`'); $this->searchCriteriaApplicator->applyPagination($searchCriteria, $qb); @@ -89,8 +88,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria) public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria) { $qb = $this->getQueryBuilder($searchCriteria->getFilters()) - ->select('COUNT(DISTINCT wa.`id_webservice_account`)') - ; + ->select('COUNT(DISTINCT wa.`id_webservice_account`)'); return $qb; } @@ -112,8 +110,7 @@ private function getQueryBuilder(array $filters) $this->dbPrefix . 'webservice_account_shop', 'was', 'was.`id_webservice_account` = wa.`id_webservice_account`' - ) - ; + ); $qb->andWhere('was.`id_shop` IN (:shops)'); diff --git a/src/Core/Localization/RTL/StylesheetGenerator.php b/src/Core/Localization/RTL/StylesheetGenerator.php index c68fb0648e923..5df6ade039efb 100644 --- a/src/Core/Localization/RTL/StylesheetGenerator.php +++ b/src/Core/Localization/RTL/StylesheetGenerator.php @@ -111,8 +111,7 @@ private function shouldProcessFile($file, $regenerate) // does not end with .rtlfix && substr(rtrim($file, '.' . $this->fileType), -4) !== $this->rtlSuffix // RTL file does not exist or we are regenerating them - && ($regenerate || !file_exists($this->getRtlFileName($file))) - ; + && ($regenerate || !file_exists($this->getRtlFileName($file))); } /** diff --git a/src/Core/Module/HookConfigurator.php b/src/Core/Module/HookConfigurator.php index 86c2577b1519b..6f0ed8369cac4 100644 --- a/src/Core/Module/HookConfigurator.php +++ b/src/Core/Module/HookConfigurator.php @@ -71,8 +71,7 @@ public function getThemeHooksConfiguration(array $hooks) $firstNullValueFound = true; $existing = isset($currentHooks[$hookName]) ? $currentHooks[$hookName] : - [] - ; + []; $currentHooks[$hookName] = []; foreach ($modules as $key => $module) { if ($module === null && $firstNullValueFound) { diff --git a/src/Core/Product/Search/SortOrder.php b/src/Core/Product/Search/SortOrder.php index 2b7583694f661..f98471853c2a2 100644 --- a/src/Core/Product/Search/SortOrder.php +++ b/src/Core/Product/Search/SortOrder.php @@ -40,8 +40,7 @@ public function __construct($entity, $field, $direction = 'asc') $this ->setEntity($entity) ->setField($field) - ->setDirection($direction) - ; + ->setDirection($direction); } public static function random() diff --git a/src/Core/Search/SearchParameters.php b/src/Core/Search/SearchParameters.php index 94a3dbd5d3376..c7e61ecf7242c 100644 --- a/src/Core/Search/SearchParameters.php +++ b/src/Core/Search/SearchParameters.php @@ -73,8 +73,7 @@ public function getFiltersFromRequest(Request $request, $filterClass) public function getFiltersFromRepository($employeeId, $shopId, $controller, $action, $filterClass) { $adminFilter = $this->adminFilterRepository - ->findByEmployeeAndRouteParams($employeeId, $shopId, $controller, $action) - ; + ->findByEmployeeAndRouteParams($employeeId, $shopId, $controller, $action); $savedFilters = []; diff --git a/src/Core/Shop/LogoUploader.php b/src/Core/Shop/LogoUploader.php index d1a104adbfa51..dfed3b22bc769 100644 --- a/src/Core/Shop/LogoUploader.php +++ b/src/Core/Shop/LogoUploader.php @@ -191,8 +191,7 @@ private function getLogoName($logoPrefix, $fileExtension) . $logoPrefix . '-' . (int) Configuration::get('PS_IMG_UPDATE_TIME') - . (int) $shopId . $fileExtension - ; + . (int) $shopId . $fileExtension; if ($this->shop->getContext() == Shop::CONTEXT_ALL || $shopId == 0 @@ -200,8 +199,7 @@ private function getLogoName($logoPrefix, $fileExtension) ) { $logoName = Tools::link_rewrite($shopName) . '-' - . $logoPrefix . '-' . (int) Configuration::get('PS_IMG_UPDATE_TIME') . $fileExtension - ; + . $logoPrefix . '-' . (int) Configuration::get('PS_IMG_UPDATE_TIME') . $fileExtension; } return $logoName; diff --git a/src/PrestaShopBundle/Command/ExportThemeCommand.php b/src/PrestaShopBundle/Command/ExportThemeCommand.php index 291d84d95558f..0492a7cb27898 100644 --- a/src/PrestaShopBundle/Command/ExportThemeCommand.php +++ b/src/PrestaShopBundle/Command/ExportThemeCommand.php @@ -40,8 +40,7 @@ protected function configure() $this ->setName('prestashop:theme:export') ->setDescription('Create zip to distribute theme with its dependencies') - ->addArgument('theme', InputArgument::REQUIRED, 'Theme to export directory name.') - ; + ->addArgument('theme', InputArgument::REQUIRED, 'Theme to export directory name.'); } protected function execute(InputInterface $input, OutputInterface $output) diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php index f979f18fe6072..9b5a5557034f5 100644 --- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php +++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php @@ -113,8 +113,7 @@ public function addAction(Request $request) $postValues->get('server_ip'), $postValues->getInt('server_port'), $postValues->get('server_weight') - ) - ; + ); return new JsonResponse($server, 201); } diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php index 8ca763a0c5909..1e3c5e18047c1 100644 --- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php +++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php @@ -93,7 +93,6 @@ public function customizePageLayoutsAction(Request $request) protected function canCustomizePageLayouts(Request $request) { return !$this->isDemoModeEnabled() && - $this->isGranted(PageVoter::UPDATE, $request->attributes->get('_legacy_controller')) - ; + $this->isGranted(PageVoter::UPDATE, $request->attributes->get('_legacy_controller')); } } diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php index cb69d63bda21e..6356957392aba 100755 --- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php +++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php @@ -316,8 +316,7 @@ public function refreshCatalogAction(Request $request) $filters = new AddonListFilter(); $filters->setType(AddonListFilterType::MODULE | AddonListFilterType::SERVICE) - ->setStatus(~AddonListFilterStatus::INSTALLED) - ; + ->setStatus(~AddonListFilterStatus::INSTALLED); try { $modulesFromRepository = AddonsCollection::createFrom($moduleRepository->getFilteredList($filters)); diff --git a/src/PrestaShopBundle/Controller/Admin/ProductController.php b/src/PrestaShopBundle/Controller/Admin/ProductController.php index 559da59ee2b31..add044113afab 100644 --- a/src/PrestaShopBundle/Controller/Admin/ProductController.php +++ b/src/PrestaShopBundle/Controller/Admin/ProductController.php @@ -666,8 +666,7 @@ private function createProductForm(Product $product, AdminModelAdapter $modelMap ->add('step5', ProductSeo::class, [ 'mapping_type' => $product->getRedirectType(), ]) - ->add('step6', ProductOptions::class) - ; + ->add('step6', ProductOptions::class); // Prepare combination form (fake but just to validate the form) $combinations = $product->getAttributesResume( diff --git a/src/PrestaShopBundle/Controller/Admin/SecurityController.php b/src/PrestaShopBundle/Controller/Admin/SecurityController.php index 9486644abcb5e..3c6bf3ea8df3d 100644 --- a/src/PrestaShopBundle/Controller/Admin/SecurityController.php +++ b/src/PrestaShopBundle/Controller/Admin/SecurityController.php @@ -43,8 +43,7 @@ public function compromisedAccessAction(Request $request) $newToken = $this->get('security.csrf.token_manager') ->getToken($username) - ->getValue() - ; + ->getValue(); $newUri = PrestaShopRouter::generateTokenizedUrl($requestUri, $newToken); diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php index 905e8e15c4cc3..850b1a9fe6e1f 100644 --- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php +++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php @@ -689,8 +689,7 @@ public function exportAction(CategoryFilters $filters) return (new CsvResponse()) ->setData($data) ->setHeadersData($headers) - ->setFileName('category_' . date('Y-m-d_His') . '.csv') - ; + ->setFileName('category_' . date('Y-m-d_His') . '.csv'); } /** diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php index ddf562944e47f..7b68e1ec24708 100644 --- a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php +++ b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php @@ -229,8 +229,7 @@ public function transformGuestToCustomerAction($customerId) $error = isset($errors[$e->getCode()]) ? $errors[$e->getCode()] : - $this->getFallbackErrorMessage(get_class($e), $e->getCode()) - ; + $this->getFallbackErrorMessage(get_class($e), $e->getCode()); $this->addFlash('error', $error); } catch (CustomerException $e) { diff --git a/src/PrestaShopBundle/Controller/ArgumentResolver/SearchParametersResolver.php b/src/PrestaShopBundle/Controller/ArgumentResolver/SearchParametersResolver.php index 82c795c10cad8..6716e3800d136 100644 --- a/src/PrestaShopBundle/Controller/ArgumentResolver/SearchParametersResolver.php +++ b/src/PrestaShopBundle/Controller/ArgumentResolver/SearchParametersResolver.php @@ -98,8 +98,7 @@ public function __construct( public function supports(Request $request, ArgumentMetadata $argument) { return is_subclass_of($argument->getType(), Filters::class) && - $this->employee instanceof Employee - ; + $this->employee instanceof Employee; } /** diff --git a/src/PrestaShopBundle/Entity/Repository/AdminFilterRepository.php b/src/PrestaShopBundle/Entity/Repository/AdminFilterRepository.php index d612ca2ddd5cf..d76478cf54075 100644 --- a/src/PrestaShopBundle/Entity/Repository/AdminFilterRepository.php +++ b/src/PrestaShopBundle/Entity/Repository/AdminFilterRepository.php @@ -107,8 +107,7 @@ public function createOrUpdateByEmployeeAndRouteParams($employeeId, $shopId, $fi ->setController($controller) ->setEmployee($employeeId) ->setShop($shopId) - ->setFilter(json_encode($filters)) - ; + ->setFilter(json_encode($filters)); $this->getEntityManager()->persist($adminFilter); diff --git a/src/PrestaShopBundle/Entity/Repository/AttributeRepository.php b/src/PrestaShopBundle/Entity/Repository/AttributeRepository.php index 99322a322e685..66a7707ffbdee 100644 --- a/src/PrestaShopBundle/Entity/Repository/AttributeRepository.php +++ b/src/PrestaShopBundle/Entity/Repository/AttributeRepository.php @@ -59,8 +59,7 @@ public function findByLangAndShop($idLang, $idShop) ->setParameters(array( 'idShop' => $idShop, 'idLang' => $idLang, - )) - ; + )); $result = $qb->getQuery()->getArrayResult(); diff --git a/src/PrestaShopBundle/Entity/Repository/ImportMatchRepository.php b/src/PrestaShopBundle/Entity/Repository/ImportMatchRepository.php index b352e941029b9..e6a8d6df18df7 100644 --- a/src/PrestaShopBundle/Entity/Repository/ImportMatchRepository.php +++ b/src/PrestaShopBundle/Entity/Repository/ImportMatchRepository.php @@ -68,8 +68,7 @@ public function findOneById($id) ->select('*') ->from($this->importMatchTable) ->where('id_import_match = :id') - ->setParameter('id', $id) - ; + ->setParameter('id', $id); return $queryBuilder->execute()->fetch(); } @@ -88,8 +87,7 @@ public function findOneByName($name) ->select('*') ->from($this->importMatchTable) ->where('`name` = :name') - ->setParameter('name', $name) - ; + ->setParameter('name', $name); return $queryBuilder->execute()->fetch(); } @@ -102,8 +100,7 @@ public function findAll() $queryBuilder = $this->connection ->createQueryBuilder() ->select('*') - ->from($this->importMatchTable) - ; + ->from($this->importMatchTable); return $queryBuilder->execute()->fetchAll(); } diff --git a/src/PrestaShopBundle/Entity/Repository/LogRepository.php b/src/PrestaShopBundle/Entity/Repository/LogRepository.php index dc31b68f0c96b..42e5fb85723e0 100644 --- a/src/PrestaShopBundle/Entity/Repository/LogRepository.php +++ b/src/PrestaShopBundle/Entity/Repository/LogRepository.php @@ -128,8 +128,7 @@ public function getAllWithEmployeeInformationQuery($filters) ->innerJoin('l', $employeeTable, 'e', 'l.id_employee = e.id_employee') ->orderBy($filters['orderBy'], $filters['sortOrder']) ->setFirstResult($filters['offset']) - ->setMaxResults($filters['limit']) - ; + ->setMaxResults($filters['limit']); if (!empty($scalarFilters)) { foreach ($scalarFilters as $column => $value) { diff --git a/src/PrestaShopBundle/Entity/Repository/ModuleRepository.php b/src/PrestaShopBundle/Entity/Repository/ModuleRepository.php index 415b12a5acbde..70196db475384 100644 --- a/src/PrestaShopBundle/Entity/Repository/ModuleRepository.php +++ b/src/PrestaShopBundle/Entity/Repository/ModuleRepository.php @@ -76,8 +76,7 @@ public function findRestrictedCountryIds($moduleId, $shopId) ->where('mc.id_module = :id_module') ->setParameter('id_module', $moduleId) ->andWhere('mc.id_shop = :id_shop') - ->setParameter('id_shop', $shopId) - ; + ->setParameter('id_shop', $shopId); return $qb->execute()->fetchAll(PDO::FETCH_COLUMN); } @@ -98,8 +97,7 @@ public function findRestrictedCurrencyIds($moduleId, $shopId) ->where('mc.id_module = :id_module') ->setParameter('id_module', $moduleId) ->andWhere('mc.id_shop = :id_shop') - ->setParameter('id_shop', $shopId) - ; + ->setParameter('id_shop', $shopId); return $qb->execute()->fetchAll(PDO::FETCH_COLUMN); } @@ -120,8 +118,7 @@ public function findRestrictedGroupIds($moduleId, $shopId) ->where('mg.id_module = :id_module') ->setParameter('id_module', $moduleId) ->andWhere('mg.id_shop = :id_shop') - ->setParameter('id_shop', $shopId) - ; + ->setParameter('id_shop', $shopId); return $qb->execute()->fetchAll(PDO::FETCH_COLUMN); } @@ -142,8 +139,7 @@ public function findRestrictedCarrierReferenceIds($moduleId, $shopId) ->where('mc.id_module = :id_module') ->setParameter('id_module', $moduleId) ->andWhere('mc.id_shop = :id_shop') - ->setParameter('id_shop', $shopId) - ; + ->setParameter('id_shop', $shopId); return $qb->execute()->fetchAll(PDO::FETCH_COLUMN); } diff --git a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php index 10602eb21f767..4ac762d0a5768 100644 --- a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php +++ b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php @@ -123,8 +123,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('group_association', MaterialChoiceTableType::class, [ 'choices' => $this->customerGroupChoices, 'required' => false, - ]) - ; + ]); if ($this->multistoreFeature->isUsed()) { $builder->add('shop_association', ShopChoiceTreeType::class); diff --git a/src/PrestaShopBundle/Form/Admin/Catalog/Category/CategoryType.php b/src/PrestaShopBundle/Form/Admin/Catalog/Category/CategoryType.php index dd2519f115ece..aec2cf84b277d 100644 --- a/src/PrestaShopBundle/Form/Admin/Catalog/Category/CategoryType.php +++ b/src/PrestaShopBundle/Form/Admin/Catalog/Category/CategoryType.php @@ -47,8 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // when using CategoryType to edit category // user should not be able to select that category as parent 'disabled_values' => null !== $options['id_category'] ? [$options['id_category']] : [], - ]) - ; + ]); } /** @@ -60,7 +59,6 @@ public function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'id_category' => null, ]) - ->setAllowedTypes('id_category', ['int', 'null']) - ; + ->setAllowedTypes('id_category', ['int', 'null']); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Backup/BackupOptionsType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Backup/BackupOptionsType.php index 9997ab81d7fc2..56d02eedabbb9 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Backup/BackupOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Backup/BackupOptionsType.php @@ -42,7 +42,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('backup_all', SwitchType::class) - ->add('backup_drop_tables', SwitchType::class) - ; + ->add('backup_drop_tables', SwitchType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/EmailConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/EmailConfigurationType.php index beefd79d9b58d..1a48eaa6b83cc 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/EmailConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/EmailConfigurationType.php @@ -91,7 +91,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) $this->trans('Both', 'Admin.Advparameters.Feature') => MailOption::TYPE_BOTH, ], ]) - ->add('log_emails', SwitchType::class) - ; + ->add('log_emails', SwitchType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php index d093254f206fe..cd0200f180faa 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php @@ -68,7 +68,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('port', TextType::class, [ 'required' => false, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/TestEmailSendingType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/TestEmailSendingType.php index 6fcc568d613b1..5c0075ff51b44 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/TestEmailSendingType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/TestEmailSendingType.php @@ -48,7 +48,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('smtp_username', HiddenType::class) ->add('smtp_password', HiddenType::class) ->add('smtp_port', HiddenType::class) - ->add('smtp_encryption', HiddenType::class) - ; + ->add('smtp_encryption', HiddenType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Employee/EmployeeOptionsType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Employee/EmployeeOptionsType.php index ca1e9752eefd4..0df07769de07c 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Employee/EmployeeOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Employee/EmployeeOptionsType.php @@ -71,7 +71,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('allow_employee_specific_language', SwitchType::class, [ 'required' => false, 'disabled' => !$this->canOptionsBeChanged, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportDataConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportDataConfigurationType.php index 92490b055a8b2..58ef2db6cfa8a 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportDataConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportDataConfigurationType.php @@ -106,7 +106,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('forceIDs', HiddenType::class) ->add('sendemail', HiddenType::class) ->add('separator', HiddenType::class) - ->add('multiple_value_separator', HiddenType::class) - ; + ->add('multiple_value_separator', HiddenType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportType.php index 61b97e711d909..999ee198b00f0 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportType.php @@ -74,8 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('match_ref', SwitchType::class) ->add('regenerate', SwitchType::class) ->add('forceIDs', SwitchType::class) - ->add('sendemail', SwitchType::class) - ; + ->add('sendemail', SwitchType::class); $builder->get('entity') ->addModelTransformer(new CallbackTransformer( @@ -89,8 +88,7 @@ function ($entity) { function ($entity) { return $entity; } - )) - ; + )); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestFormHandler.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestFormHandler.php index db2841eb3cf1b..9aced75bc002e 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestFormHandler.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestFormHandler.php @@ -118,8 +118,7 @@ private function getRequestSqlForm(array $formData = []) ->add('request_sql', SqlRequestType::class) ->setData([ 'request_sql' => $formData, - ]) - ; + ]); return $builder->getForm(); } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php index b096881bd44a5..edb08450221c4 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestSettingsType.php @@ -45,7 +45,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) CharsetEncoding::ISO_8859_1 => CharsetEncoding::ISO_8859_1, ], 'translation_domain' => false, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestType.php index ca9f9130c8a0d..11e53383bc11c 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/RequestSql/SqlRequestType.php @@ -71,7 +71,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ), ]), ], - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Webservice/WebserviceConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Webservice/WebserviceConfigurationType.php index 65e293fac6985..1dd00632a2727 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Webservice/WebserviceConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Webservice/WebserviceConfigurationType.php @@ -47,8 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('enable_cgi', SwitchType::class, [ 'required' => true, - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/SetUpUrlType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/SetUpUrlType.php index ecf30de094442..71837a301f899 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/SetUpUrlType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/SetUpUrlType.php @@ -84,14 +84,12 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'choices' => $this->canonicalUrlChoices, 'translation_domain' => false, ] - ) - ; + ); if (!$this->isHostMode && $this->isHtaccessFileWritable) { $builder ->add('disable_apache_multiview', SwitchType::class) - ->add('disable_apache_mod_security', SwitchType::class) - ; + ->add('disable_apache_mod_security', SwitchType::class); } } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/ShopUrlType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/ShopUrlType.php index 5d508e060985d..663c81562abec 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/ShopUrlType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/ShopUrlType.php @@ -75,8 +75,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('domain', TextType::class) ->add('domain_ssl', TextType::class) - ->add('physical_uri', TextType::class) - ; + ->add('physical_uri', TextType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/UrlSchemaType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/UrlSchemaType.php index a584bbd8d9552..2a5e193756f4d 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/UrlSchemaType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/UrlSchemaType.php @@ -66,8 +66,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('manufacturer_rule', TextType::class) ->add('cms_rule', TextType::class) ->add('cms_category_rule', TextType::class) - ->add('module', TextType::class) - ; + ->add('module', TextType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutCustomizationFormFactory.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutCustomizationFormFactory.php index d74401c85720a..8a5e9f329480e 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutCustomizationFormFactory.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutCustomizationFormFactory.php @@ -96,8 +96,7 @@ private function getCustomizablePageLayouts(Theme $theme, array $customizationPa foreach ($customizationPages as $page) { $selectedLayout = isset($pageLayouts[$page->getPage()]) ? $pageLayouts[$page->getPage()] : - $defaultLayout['key'] - ; + $defaultLayout['key']; $layouts[$page->getPage()] = $selectedLayout; } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutsCustomizationType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutsCustomizationType.php index 8bc1060ff2c70..422e7ae44d467 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutsCustomizationType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/PageLayoutsCustomizationType.php @@ -63,7 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'translation_domain' => false, 'choices' => $this->pageLayoutsChoices, ], - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationByIpAddressType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationByIpAddressType.php index 1df5d2cfdeb89..a7ae205d156b6 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationByIpAddressType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationByIpAddressType.php @@ -42,7 +42,6 @@ class GeolocationByIpAddressType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('geolocation_enabled', SwitchType::class) - ; + ->add('geolocation_enabled', SwitchType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationIpAddressWhitelistType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationIpAddressWhitelistType.php index bd6fa443c7c45..e33db2ee288d5 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationIpAddressWhitelistType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationIpAddressWhitelistType.php @@ -49,8 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'col' => 15, 'rows' => 30, ], - ]) - ; + ]); $builder->get('geolocation_whitelist') ->addModelTransformer(new CallbackTransformer( @@ -60,7 +59,6 @@ function ($ipWhitelistTextWithSemiColons) { function ($ipWhitelistTextWithNewLines) { return str_replace(["\r\n", "\r", "\n"], ';', $ipWhitelistTextWithNewLines); } - )) - ; + )); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationOptionsType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationOptionsType.php index 578c87b6de43f..59435d4091ec0 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Geolocation/GeolocationOptionsType.php @@ -92,8 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('geolocation_countries', MaterialChoiceTableType::class, [ 'choices' => $this->countryChoices, 'choice_translation_domain' => false, - ]) - ; + ]); $builder->get('geolocation_countries')->addModelTransformer(new CallbackTransformer( function ($countriesAsString) { diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/AdvancedConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/AdvancedConfigurationType.php index 751187303400e..18482c6d3f6f9 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/AdvancedConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/AdvancedConfigurationType.php @@ -43,7 +43,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('language_identifier', TextType::class) - ->add('country_identifier', TextType::class) - ; + ->add('country_identifier', TextType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/ImportLocalizationPackType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/ImportLocalizationPackType.php index c1852f15090fc..26ede19328606 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/ImportLocalizationPackType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/ImportLocalizationPackType.php @@ -84,8 +84,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('download_pack_data', SwitchType::class, [ 'data' => 1, - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalUnitsType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalUnitsType.php index ab36d45b9e626..a86086de7450c 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalUnitsType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalUnitsType.php @@ -45,7 +45,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('weight_unit', TextType::class) ->add('distance_unit', TextType::class) ->add('volume_unit', TextType::class) - ->add('dimension_unit', TextType::class) - ; + ->add('dimension_unit', TextType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalizationConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalizationConfigurationType.php index 15cc04ee32242..b0a4f97d6139b 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalizationConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Localization/LocalizationConfigurationType.php @@ -98,7 +98,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('timezone', ChoiceType::class, [ 'choices' => $this->timezoneChoices, 'choice_translation_domain' => false, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/CopyLanguageType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/CopyLanguageType.php index 4bd723ebddf95..0609c81cb2b95 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/CopyLanguageType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/CopyLanguageType.php @@ -79,7 +79,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('to_theme', ChoiceType::class, [ 'choices' => $this->themeChoices, 'choice_translation_domain' => false, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/ModifyTranslationsType.php b/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/ModifyTranslationsType.php index ba131cd1fd4f0..d2b2ef50484aa 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/ModifyTranslationsType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/International/Translations/ModifyTranslationsType.php @@ -115,7 +115,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'placeholder' => $this->trans('Language', 'Admin.Global'), 'choices' => $this->getLocaleChoices(), 'choice_translation_domain' => false, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Payment/Preferences/PaymentModulePreferencesType.php b/src/PrestaShopBundle/Form/Admin/Improve/Payment/Preferences/PaymentModulePreferencesType.php index f54687d5e72cb..fa28975010587 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Payment/Preferences/PaymentModulePreferencesType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Payment/Preferences/PaymentModulePreferencesType.php @@ -122,8 +122,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'label' => $this->trans('Carrier restrictions', 'Admin.Payment.Feature'), 'choices' => $this->carrierChoices, 'multiple_choices' => $this->getCarrierChoicesForPaymentModules(), - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/CarrierOptionsType.php b/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/CarrierOptionsType.php index 9929e545522c0..c6feb11f49480 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/CarrierOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/CarrierOptionsType.php @@ -88,8 +88,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('carrier_default_order_way', ChoiceType::class, [ 'choices' => $this->orderWayChoices, 'choice_translation_domain' => 'Admin.Global', - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/HandlingType.php b/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/HandlingType.php index 6854377597128..88435119a7ad4 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/HandlingType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Shipping/Preferences/HandlingType.php @@ -81,8 +81,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'unit' => $weightUnit, 'required' => false, 'empty_data' => '0', - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Category/DeleteCategoriesType.php b/src/PrestaShopBundle/Form/Admin/Sell/Category/DeleteCategoriesType.php index a435e0d4cc1eb..bd3d9daab5165 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Category/DeleteCategoriesType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Category/DeleteCategoriesType.php @@ -67,7 +67,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'entry_type' => HiddenType::class, 'label' => false, 'allow_add' => true, - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Customer/PrivateNoteType.php b/src/PrestaShopBundle/Form/Admin/Sell/Customer/PrivateNoteType.php index 71481c972e8fe..ed4fe8568b905 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Customer/PrivateNoteType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Customer/PrivateNoteType.php @@ -44,7 +44,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('note', TextareaType::class, [ 'required' => false, 'empty_data' => '', - ]) - ; + ]); } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Customer/TransferGuestAccountType.php b/src/PrestaShopBundle/Form/Admin/Sell/Customer/TransferGuestAccountType.php index fbd2ff47a047a..8f9046a90378c 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Customer/TransferGuestAccountType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Customer/TransferGuestAccountType.php @@ -42,7 +42,6 @@ class TransferGuestAccountType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('id_customer', HiddenType::class) - ; + ->add('id_customer', HiddenType::class); } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByDateType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByDateType.php index 8ff19305dc24a..da4597ac8ce6b 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByDateType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByDateType.php @@ -44,8 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('date_from', DatePickerType::class) - ->add('date_to', DatePickerType::class) - ; + ->add('date_to', DatePickerType::class); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByStatusType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByStatusType.php index 59a459ef4f3e0..83d5034cb3c36 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByStatusType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/GenerateByStatusType.php @@ -69,8 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'expanded' => true, 'multiple' => true, 'choices' => $this->orderStateChoiceProvider->getChoices(), - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/InvoiceOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/InvoiceOptionsType.php index ae8ecc1764c2b..0874eba3fa1f7 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/InvoiceOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Invoices/InvoiceOptionsType.php @@ -107,8 +107,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'choices' => $this->invoiceModelChoiceProvider->getChoices(), 'translation_domain' => false, ]) - ->add('use_disk_cache', SwitchType::class) - ; + ->add('use_disk_cache', SwitchType::class); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Type/Common/Team/ProfileChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/Common/Team/ProfileChoiceType.php index 0b2b1b243b98e..a40b200afcf48 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/Common/Team/ProfileChoiceType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/Common/Team/ProfileChoiceType.php @@ -59,8 +59,7 @@ public function configureOptions(OptionsResolver $resolver) 'translation_domain' => false, 'expanded' => false, 'multiple' => false, - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Type/DateRangeType.php b/src/PrestaShopBundle/Form/Admin/Type/DateRangeType.php index 31aafb1da4cb0..5e6550fca2398 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/DateRangeType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/DateRangeType.php @@ -50,8 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'placeholder' => 'To', ], 'translation_domain' => 'Admin.Global', - ]) - ; + ]); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Type/Material/MaterialChoiceTreeType.php b/src/PrestaShopBundle/Form/Admin/Type/Material/MaterialChoiceTreeType.php index 70fb3e000a8e1..bebce82cd4a1b 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/Material/MaterialChoiceTreeType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/Material/MaterialChoiceTreeType.php @@ -73,8 +73,7 @@ public function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('choice_label', 'string') ->setAllowedTypes('choice_children', 'string') ->setAllowedTypes('disabled_values', 'array') - ->addAllowedValues('compound', false) - ; + ->addAllowedValues('compound', false); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Type/SearchAndResetType.php b/src/PrestaShopBundle/Form/Admin/Type/SearchAndResetType.php index 28b2e4dba5f9a..f9c3ddf46e21a 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/SearchAndResetType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/SearchAndResetType.php @@ -112,8 +112,7 @@ public function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('reset_route', ['string', 'null']) ->setAllowedTypes('reset_route_params', 'array') ->setAllowedTypes('redirect_route', ['string', 'null']) - ->setAllowedTypes('redirect_route_params', 'array') - ; + ->setAllowedTypes('redirect_route_params', 'array'); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Type/TextWithLengthCounterType.php b/src/PrestaShopBundle/Form/Admin/Type/TextWithLengthCounterType.php index df636c5d4fd16..9b93b713f7f44 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/TextWithLengthCounterType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/TextWithLengthCounterType.php @@ -59,8 +59,7 @@ public function configureOptions(OptionsResolver $resolver) 'position' => 'before', ]) ->setAllowedTypes('max_length', 'int') - ->setAllowedValues('position', ['before', 'after']) - ; + ->setAllowedValues('position', ['before', 'after']); } /** diff --git a/src/PrestaShopBundle/Service/DataProvider/Marketplace/ApiClient.php b/src/PrestaShopBundle/Service/DataProvider/Marketplace/ApiClient.php index fb963642cc0aa..3c1c00f1ca775 100644 --- a/src/PrestaShopBundle/Service/DataProvider/Marketplace/ApiClient.php +++ b/src/PrestaShopBundle/Service/DataProvider/Marketplace/ApiClient.php @@ -57,8 +57,7 @@ public function __construct( $this->setIsoLang($isoLang) ->setIsoCode($isoCode) ->setVersion($shopVersion) - ->setShopUrl($domain) - ; + ->setShopUrl($domain); $this->defaultQueryParameters = $this->queryParameters; } @@ -105,8 +104,7 @@ public function getNativesModules() { $response = $this->setMethod('listing') ->setAction('native') - ->getResponse() - ; + ->getResponse(); $responseArray = json_decode($response); @@ -117,8 +115,7 @@ public function getPreInstalledModules() { $response = $this->setMethod('listing') ->setAction('install-modules') - ->getResponse() - ; + ->getResponse(); $responseDecoded = json_decode($response); return isset($responseDecoded->modules) ? $responseDecoded->modules : array(); @@ -128,8 +125,7 @@ public function getMustHaveModules() { $response = $this->setMethod('listing') ->setAction('must-have') - ->getResponse() - ; + ->getResponse(); $responseArray = json_decode($response); @@ -159,8 +155,7 @@ public function getServices() { $response = $this->setMethod('listing') ->setAction('service') - ->getResponse() - ; + ->getResponse(); $responseArray = json_decode($response); @@ -171,8 +166,7 @@ public function getCategories() { $response = $this->setMethod('listing') ->setAction('categories') - ->getResponse() - ; + ->getResponse(); $responseArray = json_decode($response); @@ -184,8 +178,7 @@ public function getModule($moduleId) $response = $this->setMethod('listing') ->setAction('module') ->setModuleId($moduleId) - ->getResponse() - ; + ->getResponse(); $responseArray = json_decode($response); @@ -205,8 +198,7 @@ public function getModuleZip($moduleId) { return $this->setMethod('module') ->setModuleId($moduleId) - ->getPostResponse() - ; + ->getPostResponse(); } public function getCustomerModules($userMail, $password) @@ -215,8 +207,7 @@ public function getCustomerModules($userMail, $password) ->setAction('customer') ->setUserMail($userMail) ->setPassword($password) - ->getPostResponse() - ; + ->getPostResponse(); $responseArray = json_decode($response); @@ -236,8 +227,7 @@ public function getCustomerThemes() { $response = $this->setMethod('listing') ->setAction('customer-themes') - ->getPostResponse() - ; + ->getPostResponse(); $responseDecoded = json_decode($response); @@ -255,8 +245,7 @@ public function getResponse() null, array('query' => $this->queryParameters, ) - )->getBody() - ; + )->getBody(); } public function getPostResponse() diff --git a/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php b/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php index e30d686359fb2..0cfd37225f149 100644 --- a/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php +++ b/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php @@ -326,8 +326,7 @@ protected function metadataContainNotes(array $metadata = null) { return !is_null($metadata) && array_key_exists('notes', $metadata) && is_array($metadata['notes']) && array_key_exists(0, $metadata['notes']) && is_array($metadata['notes'][0]) && - array_key_exists('content', $metadata['notes'][0]) - ; + array_key_exists('content', $metadata['notes'][0]); } /** diff --git a/src/PrestaShopBundle/Translation/Extractor/ThemeExtractor.php b/src/PrestaShopBundle/Translation/Extractor/ThemeExtractor.php index 945da03ffc5d7..978961efb0746 100644 --- a/src/PrestaShopBundle/Translation/Extractor/ThemeExtractor.php +++ b/src/PrestaShopBundle/Translation/Extractor/ThemeExtractor.php @@ -105,8 +105,7 @@ private function overrideFromDefaultCatalog($locale, &$catalogue) { $defaultCatalogue = $this->themeProvider ->setLocale($locale) - ->getDefaultCatalogue() - ; + ->getDefaultCatalogue(); if (empty($defaultCatalogue)) { return; @@ -155,8 +154,7 @@ private function overrideFromDatabase($themeName, $locale, &$catalogue) $databaseCatalogue = $this->themeProvider ->setLocale($locale) ->setThemeName($themeName) - ->getDatabaseCatalogue() - ; + ->getDatabaseCatalogue(); $catalogue->addCatalogue($databaseCatalogue); } diff --git a/src/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactory.php b/src/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactory.php index 358a90751ad04..11e940cdf9b3e 100644 --- a/src/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactory.php +++ b/src/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactory.php @@ -56,8 +56,7 @@ public function createCatalogue($themeName, $locale = 'en_US') return $this->themeProvider ->setThemeName($themeName) ->setLocale($locale) - ->getMessageCatalogue() - ; + ->getMessageCatalogue(); } /** diff --git a/src/PrestaShopBundle/Translation/Loader/DatabaseTranslationLoader.php b/src/PrestaShopBundle/Translation/Loader/DatabaseTranslationLoader.php index 595b762b34073..22f9d44ae7537 100644 --- a/src/PrestaShopBundle/Translation/Loader/DatabaseTranslationLoader.php +++ b/src/PrestaShopBundle/Translation/Loader/DatabaseTranslationLoader.php @@ -53,38 +53,32 @@ public function load($resource, $locale, $domain = 'messages', $theme = null) if (!array_key_exists($locale, $langs)) { $langs[$locale] = $this->entityManager ->getRepository('PrestaShopBundle:Lang') - ->findOneByLocale($locale) - ; + ->findOneByLocale($locale); } $translationRepository = $this->entityManager - ->getRepository('PrestaShopBundle:Translation') - ; + ->getRepository('PrestaShopBundle:Translation'); $queryBuilder = $translationRepository ->createQueryBuilder('t') ->where('t.lang =:lang') - ->setParameter('lang', $langs[$locale]) - ; + ->setParameter('lang', $langs[$locale]); if (!is_null($theme)) { $queryBuilder ->andWhere('t.theme = :theme') - ->setParameter('theme', $theme) - ; + ->setParameter('theme', $theme); } else { $queryBuilder->andWhere('t.theme IS NULL'); } if ($domain !== '*') { $queryBuilder->andWhere('REGEXP(t.domain, :domain) = true') - ->setParameter('domain', $domain) - ; + ->setParameter('domain', $domain); } $translations = $queryBuilder->getQuery() - ->getResult() - ; + ->getResult(); $catalogue = new MessageCatalogue($locale); diff --git a/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php b/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php index 86b9e470104ca..13afeaa5ab497 100644 --- a/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php +++ b/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php @@ -77,8 +77,7 @@ public function load($resource, $locale, $domain = 'messages') $selectTranslationsQuery = ' SELECT `key`, `translation`, `domain` FROM `' . _DB_PREFIX_ . 'translation` - WHERE `id_lang` = ' . $localeResults[$locale]['id_lang'] - ; + WHERE `id_lang` = ' . $localeResults[$locale]['id_lang']; $translations = Db::getInstance()->executeS($selectTranslationsQuery); $catalogue = new MessageCatalogue($locale); @@ -87,8 +86,7 @@ public function load($resource, $locale, $domain = 'messages') if (!is_null($this->theme)) { $selectThemeTranslationsQuery = $selectTranslationsQuery . "\n" . - "AND theme = '" . $this->theme->getName() . "'" - ; + "AND theme = '" . $this->theme->getName() . "'"; $themeTranslations = Db::getInstance()->executeS($selectThemeTranslationsQuery); $this->addTranslationsToCatalogue($themeTranslations, $catalogue); } diff --git a/src/PrestaShopBundle/Translation/Provider/ThemeProvider.php b/src/PrestaShopBundle/Translation/Provider/ThemeProvider.php index ae23402126549..7e73a06b5cbf9 100644 --- a/src/PrestaShopBundle/Translation/Provider/ThemeProvider.php +++ b/src/PrestaShopBundle/Translation/Provider/ThemeProvider.php @@ -207,8 +207,7 @@ public function synchronizeTheme() $this->themeExtractor ->setOutputPath($path) ->setThemeProvider($this) - ->extract($theme, $this->locale) - ; + ->extract($theme, $this->locale); $translationFilesPath = $path . DIRECTORY_SEPARATOR . $this->locale; Flattenizer::flatten($translationFilesPath, $translationFilesPath, $this->locale, false); diff --git a/src/PrestaShopBundle/Twig/HookExtension.php b/src/PrestaShopBundle/Twig/HookExtension.php index 8426d5251620d..893ae73b85d1e 100644 --- a/src/PrestaShopBundle/Twig/HookExtension.php +++ b/src/PrestaShopBundle/Twig/HookExtension.php @@ -162,8 +162,7 @@ public function renderHook($hookName, array $hookParameters = array()) return $this->hookDispatcher ->dispatchRenderingWithParameters($hookName, $hookParameters) - ->outputContent() - ; + ->outputContent(); } /** diff --git a/src/PrestaShopBundle/Twig/TranslationsExtension.php b/src/PrestaShopBundle/Twig/TranslationsExtension.php index dc3abf62349a6..6ada389bccb48 100644 --- a/src/PrestaShopBundle/Twig/TranslationsExtension.php +++ b/src/PrestaShopBundle/Twig/TranslationsExtension.php @@ -468,8 +468,7 @@ protected function replaceWarningPlaceholder($output, $subtree) array('%nb_translations%' => $missingTranslationsCount), 'Admin.International.Feature' ) . - '' - ; + ''; $missingTranslationsLongMessage = '
' . $this->translator->trans( @@ -480,8 +479,7 @@ protected function replaceWarningPlaceholder($output, $subtree) ), 'Admin.International.Feature' ) . - '
' - ; + ''; $missingTranslationsClass = ' missing-translations'; } diff --git a/tests-legacy/Integration/PrestaShopBundle/Controller/Admin/SurvivalTest.php b/tests-legacy/Integration/PrestaShopBundle/Controller/Admin/SurvivalTest.php index d93ef2b4174e4..a475932cc35aa 100644 --- a/tests-legacy/Integration/PrestaShopBundle/Controller/Admin/SurvivalTest.php +++ b/tests-legacy/Integration/PrestaShopBundle/Controller/Admin/SurvivalTest.php @@ -163,23 +163,19 @@ private function logIn() 'getRoles', 'isAuthenticated', ]) - ->getMockForAbstractClass() - ; + ->getMockForAbstractClass(); $tokenMock->expects($this->any()) ->method('getUser') - ->willReturn($loggedEmployeeMock) - ; + ->willReturn($loggedEmployeeMock); $tokenMock->expects($this->any()) ->method('getRoles') - ->willReturn([]) - ; + ->willReturn([]); $tokenMock->expects($this->any()) ->method('isAuthenticated') - ->willReturn(true) - ; + ->willReturn(true); $tokenStorageMock = $this->getMockBuilder(TokenStorage::class) ->setMethods([ @@ -187,12 +183,10 @@ private function logIn() ]) ->disableAutoload() ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $tokenStorageMock->method('getToken') - ->willReturn($tokenMock) - ; + ->willReturn($tokenMock); self::$kernel->getContainer()->set('security.token_storage', $tokenStorageMock); } diff --git a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/ApiTestCase.php b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/ApiTestCase.php index 81d10b6aa9b37..4793ea0b58b45 100644 --- a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/ApiTestCase.php +++ b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/ApiTestCase.php @@ -95,8 +95,7 @@ protected function mockContextAdapter() 'getRootUrl', 'getLanguage', )) - ->getMock() - ; + ->getMock(); $contextMock = $this->mockContext(); $legacyContextMock->method('getContext')->willReturn($contextMock); @@ -155,8 +154,7 @@ private function mockEmployee() private function mockLanguage() { $languageMock = $this->getMockBuilder('\Language') - ->getMock() - ; + ->getMock(); $languageMock->iso_code = 'en-US'; @@ -183,8 +181,7 @@ private function mockShop() 'getContextType', 'getGroup', )) - ->getMock() - ; + ->getMock(); $shopMock->method('getContextualShopId')->willReturn(1); $shopMock->method('getCategory')->willReturn(1); @@ -206,8 +203,7 @@ private function mockController() { $controller = $this->getMockBuilder('\AdminController') ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $controller->controller_type = 'admin'; diff --git a/tests-legacy/Integration/PrestaShopBundle/Test/LightWebTestCase.php b/tests-legacy/Integration/PrestaShopBundle/Test/LightWebTestCase.php index 79847e50db3cc..ea54417ad6bd6 100644 --- a/tests-legacy/Integration/PrestaShopBundle/Test/LightWebTestCase.php +++ b/tests-legacy/Integration/PrestaShopBundle/Test/LightWebTestCase.php @@ -130,12 +130,10 @@ public function setUp() $currencyDataProviderMock = $this->getMockBuilder(CurrencyDataProvider::class) ->disableOriginalConstructor() ->setMethods(['getDefaultCurrencyIsoCode']) - ->getMock() - ; + ->getMock(); $currencyDataProviderMock->method('getDefaultCurrencyIsoCode') - ->will(self::returnValue('en')) - ; + ->will(self::returnValue('en')); $legacyContextMock = $this->getMockBuilder(LegacyContext::class) ->setMethods([ diff --git a/tests-legacy/PrestaShopBundle/Routing/Converter/CacheProviderTest.php b/tests-legacy/PrestaShopBundle/Routing/Converter/CacheProviderTest.php index 2058d5aa96a40..448bbefc090bb 100644 --- a/tests-legacy/PrestaShopBundle/Routing/Converter/CacheProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Routing/Converter/CacheProviderTest.php @@ -207,19 +207,16 @@ private function buildExistingCache() $itemMock ->expects($this->once()) ->method('isHit') - ->willReturn(true) - ; + ->willReturn(true); $itemMock ->expects($this->never()) - ->method('set') - ; + ->method('set'); $itemMock ->expects($this->once()) ->method('get') - ->willReturn($this->expectedCacheValue) - ; + ->willReturn($this->expectedCacheValue); //AdapterInterface mock $cacheMock = $this @@ -230,13 +227,11 @@ private function buildExistingCache() $cacheMock ->expects($this->once()) ->method('getItem') - ->willReturn($itemMock) - ; + ->willReturn($itemMock); $cacheMock ->expects($this->never()) - ->method('save') - ; + ->method('save'); return $cacheMock; } @@ -255,19 +250,16 @@ private function buildSavingCache() $itemMock ->expects($this->once()) ->method('isHit') - ->willReturn(false) - ; + ->willReturn(false); $itemMock ->expects($this->once()) ->method('set') - ->with($this->expectedCacheValue) - ; + ->with($this->expectedCacheValue); $itemMock ->expects($this->never()) - ->method('get') - ; + ->method('get'); //AdapterInterface mock $cacheMock = $this @@ -278,13 +270,11 @@ private function buildSavingCache() $cacheMock ->expects($this->once()) ->method('getItem') - ->willReturn($itemMock) - ; + ->willReturn($itemMock); $cacheMock ->expects($this->once()) - ->method('save') - ; + ->method('save'); return $cacheMock; } @@ -303,8 +293,7 @@ private function buildMockRouterProvider(array $legacyRoutes) $providerMock ->expects($this->once()) //Very important to assert this method is only called once to create the cache ->method('getLegacyRoutes') - ->willReturn($legacyRoutes) - ; + ->willReturn($legacyRoutes); return $providerMock; } @@ -321,8 +310,7 @@ private function buildCachedRouterProvider() $providerMock ->expects($this->never()) //Very important to assert this method is only called once to create the cache - ->method('getLegacyRoutes') - ; + ->method('getLegacyRoutes'); return $providerMock; } @@ -339,8 +327,7 @@ private function buildCacheKeyGenerator() $generatorMock ->method('getCacheKey') - ->willReturn(self::CACHE_KEY) - ; + ->willReturn(self::CACHE_KEY); return $generatorMock; } diff --git a/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php b/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php index 37ea057a21985..5cc443ac66348 100644 --- a/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php +++ b/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php @@ -309,13 +309,11 @@ public function testConvertByRequest() ->method('fromRequest') ->with( $this->equalTo($request) - ) - ; + ); $router ->expects($this->once()) ->method('getContext') - ->willReturn($contextMock) - ; + ->willReturn($contextMock); $converter = new LegacyUrlConverter($router, new RouterProvider($router)); $url = $converter->convertByRequest($request); @@ -456,13 +454,11 @@ private function buildRouterMock($routeName, $routePath, $legacyLink, array $leg $mockRouter = $this ->getMockBuilder(Router::class) ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $mockRouter ->method('getRouteCollection') - ->willReturn($routeCollection) - ; + ->willReturn($routeCollection); if (null !== $expectedParameters) { $mockRouter @@ -471,8 +467,7 @@ private function buildRouterMock($routeName, $routePath, $legacyLink, array $leg $this->equalTo($routeName), $this->equalTo($expectedParameters) ) - ->willReturn($routePath) - ; + ->willReturn($routePath); } else { $mockRouter ->method('generate') @@ -480,8 +475,7 @@ private function buildRouterMock($routeName, $routePath, $legacyLink, array $leg $this->equalTo($routeName), $this->anything() ) - ->willReturn($routePath) - ; + ->willReturn($routePath); } @@ -499,13 +493,11 @@ private function buildMultipleRouterMock(array $routes) $mockRouter = $this ->getMockBuilder(Router::class) ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $mockRouter ->method('getRouteCollection') - ->willReturn($routeCollection) - ; + ->willReturn($routeCollection); $mockRouter ->method('generate') @@ -515,8 +507,7 @@ function($routeName) use ($routeCollection) { return null !== $route ? $route->getPath() : null; } - )) - ; + )); return $mockRouter; } diff --git a/tests-legacy/PrestaShopBundle/Routing/Converter/RouterProviderTest.php b/tests-legacy/PrestaShopBundle/Routing/Converter/RouterProviderTest.php index 415a5a048801f..85006f3f02416 100644 --- a/tests-legacy/PrestaShopBundle/Routing/Converter/RouterProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Routing/Converter/RouterProviderTest.php @@ -245,14 +245,12 @@ private function buildMultipleRouterMock(array $routes) $mockRouter = $this ->getMockBuilder(RouterInterface::class) ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $mockRouter ->expects($this->once()) ->method('getRouteCollection') - ->willReturn($routeCollection) - ; + ->willReturn($routeCollection); $mockRouter ->method('generate') @@ -262,8 +260,7 @@ function($routeName) use ($routeCollection) { return null !== $route ? $route->getPath() : null; } - )) - ; + )); return $mockRouter; } diff --git a/tests-legacy/PrestaShopBundle/Translation/Exporter/ThemeExporterTest.php b/tests-legacy/PrestaShopBundle/Translation/Exporter/ThemeExporterTest.php index 5530f76ffbe17..c979a35be4af1 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Exporter/ThemeExporterTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Exporter/ThemeExporterTest.php @@ -212,8 +212,7 @@ protected function mockThemeProvider() 'Override Me Twice' => 'Overridden Once', ), ) - )) - ; + )); $this->providerMock->method('getDatabaseCatalogue') ->willReturn(new MessageCatalogue( @@ -224,7 +223,6 @@ protected function mockThemeProvider() 'Override Me Twice' => 'Overridden Twice', ), ) - )) - ; + )); } } diff --git a/tests-legacy/PrestaShopBundle/Translation/Extractor/ThemeExtractorTest.php b/tests-legacy/PrestaShopBundle/Translation/Extractor/ThemeExtractorTest.php index 6038398a610a3..91c703412686a 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Extractor/ThemeExtractorTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Extractor/ThemeExtractorTest.php @@ -82,8 +82,7 @@ public function testExtractWithLegacyFormat() $this->themeExtractor ->addDumper(new PhpDumper()) ->setFormat('php') - ->extract($this->getFakeTheme()) - ; + ->extract($this->getFakeTheme()); $legacyTranslationFile = self::$legacyFolder.'/en-US.php'; $this->assertTrue($this->filesystem->exists($legacyTranslationFile)); @@ -93,8 +92,7 @@ public function testExtractWithXliffFormat() { $this->themeExtractor ->setOutputPath(self::$xliffFolder) - ->extract($this->getFakeTheme()) - ; + ->extract($this->getFakeTheme()); $isFilesExists = $this->filesystem->exists(array( self::$xliffFolder.'/en-US/Shop/Theme/Actions.xlf', diff --git a/tests-legacy/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactoryTest.php b/tests-legacy/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactoryTest.php index 80c8421a43dbc..f651dc7d685df 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactoryTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Factory/ThemeTranslationsFactoryTest.php @@ -52,8 +52,7 @@ public function setUp() { $this->themeProviderMock = $this->getMockBuilder('PrestaShopBundle\Translation\Provider\ThemeProvider') ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $this->factory = new ThemeTranslationsFactory($this->themeProviderMock); $this->factory->addProvider($this->mockThemeProvider()); @@ -71,20 +70,17 @@ public function testCreateCatalogue($theme, $locale) ->expects($this->once()) ->method('setThemeName') ->with($theme) - ->willReturn($this->themeProviderMock) - ; + ->willReturn($this->themeProviderMock); $this->themeProviderMock ->expects($this->once()) ->method('setLocale') ->with($locale) - ->willReturn($this->themeProviderMock) - ; + ->willReturn($this->themeProviderMock); $this->themeProviderMock ->expects($this->once()) - ->method('getMessageCatalogue') - ; + ->method('getMessageCatalogue'); $this->factory->createCatalogue($theme, $locale); } @@ -114,15 +110,13 @@ public function testCreateTranslationsArray($theme, $locale) ->expects($this->once()) ->method('setThemeName') ->with($theme) - ->willReturn($this->themeProviderMock) - ; + ->willReturn($this->themeProviderMock); $this->themeProviderMock ->expects($this->once()) ->method('setLocale') ->with($locale) - ->willReturn($this->themeProviderMock) - ; + ->willReturn($this->themeProviderMock); $this->translations = $this->factory->createTranslationsArray($theme, $locale); @@ -208,8 +202,7 @@ private function mockProvider($providerPath, $providerIdentifier, $locale) { $providerMock = $this->getMockBuilder($providerPath) ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $providerMock ->expects($this->any()) diff --git a/tests-legacy/PrestaShopBundle/Translation/Factory/TranslationsFactoryTest.php b/tests-legacy/PrestaShopBundle/Translation/Factory/TranslationsFactoryTest.php index 3d8da047cb68a..83554582c21d2 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Factory/TranslationsFactoryTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Factory/TranslationsFactoryTest.php @@ -42,28 +42,22 @@ public function setUp() { $this->providerMock = $this->getMockBuilder('PrestaShopBundle\Translation\Provider\AbstractProvider') ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $this->providerMock->method('getIdentifier') - ->willReturn('mock') - ; + ->willReturn('mock'); $this->providerMock->method('setLocale') - ->will($this->returnSelf()) - ; + ->will($this->returnSelf()); $this->providerMock->method('getMessageCatalogue') - ->willReturn(new MessageCatalogue('en-US')) - ; + ->willReturn(new MessageCatalogue('en-US')); $this->providerMock->method('getDefaultCatalogue') - ->willReturn(new MessageCatalogue('en-US')) - ; + ->willReturn(new MessageCatalogue('en-US')); $this->providerMock->method('getDatabaseCatalogue') - ->willReturn(new MessageCatalogue('en-US')) - ; + ->willReturn(new MessageCatalogue('en-US')); $this->factory = new TranslationsFactory(); } @@ -72,8 +66,7 @@ public function testCreateCatalogueWithoutProviderFails() { $this->expectException('PrestaShopBundle\Translation\Factory\ProviderNotFoundException'); $expected = $this->factory - ->createCatalogue($this->providerMock->getIdentifier()) - ; + ->createCatalogue($this->providerMock->getIdentifier()); } public function testCreateCatalogueWithProvider() @@ -81,8 +74,7 @@ public function testCreateCatalogueWithProvider() $this->factory->addProvider($this->providerMock); $expected = $this->factory - ->createCatalogue($this->providerMock->getIdentifier()) - ; + ->createCatalogue($this->providerMock->getIdentifier()); $this->assertInstanceOf('Symfony\Component\Translation\MessageCatalogue', $expected); } @@ -91,20 +83,17 @@ public function testCreateTranslationsArrayWithoutProviderFails() { $this->expectException('PrestaShopBundle\Translation\Factory\ProviderNotFoundException'); $expected = $this->factory - ->createTranslationsArray($this->providerMock->getIdentifier()) - ; + ->createTranslationsArray($this->providerMock->getIdentifier()); } public function testCreateTranslationsArrayWithProvider() { $this->providerMock->method('getXliffCatalogue') - ->willReturn(new MessageCatalogue('en-US')) - ; + ->willReturn(new MessageCatalogue('en-US')); $this->factory->addProvider($this->providerMock); $expected = $this->factory - ->createTranslationsArray($this->providerMock->getIdentifier()) - ; + ->createTranslationsArray($this->providerMock->getIdentifier()); } } diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/BackOfficeProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/BackOfficeProviderTest.php index d08dea31bf2f6..14b9e172189f3 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/BackOfficeProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/BackOfficeProviderTest.php @@ -41,8 +41,7 @@ class BackOfficeProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); self::$resourcesDir = __DIR__.'/../../resources/translations'; $this->provider = new BackOfficeProvider($loader, self::$resourcesDir); diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/FrontOfficeProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/FrontOfficeProviderTest.php index 1813ff1dd6379..1fd0f59b24bbc 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/FrontOfficeProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/FrontOfficeProviderTest.php @@ -41,8 +41,7 @@ class FrontOfficeProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); self::$resourcesDir = __DIR__.'/../../resources/translations'; $this->provider = new FrontOfficeProvider($loader, self::$resourcesDir); diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/ModuleProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/ModuleProviderTest.php index 2d09afc3e585a..680f1a2974b88 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/ModuleProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/ModuleProviderTest.php @@ -43,8 +43,7 @@ class ModuleProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); $this->moduleName = 'ps_wirepayment'; self::$resourcesDir = __DIR__.'/../../resources/translations'; diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/ModulesProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/ModulesProviderTest.php index eed91cee216cc..68045f6fa66a2 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/ModulesProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/ModulesProviderTest.php @@ -41,8 +41,7 @@ class ModulesProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); self::$resourcesDir = __DIR__.'/../../resources/translations'; $this->provider = new ModulesProvider($loader, self::$resourcesDir); diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/SearchProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/SearchProviderTest.php index 3efc91ed6fbb1..f69c73081a8cf 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/SearchProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/SearchProviderTest.php @@ -41,8 +41,7 @@ class SearchProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); self::$resourcesDir = __DIR__.'/../../resources/translations'; $this->provider = new SearchProvider($loader, self::$resourcesDir); diff --git a/tests-legacy/PrestaShopBundle/Translation/Provider/ThemeProviderTest.php b/tests-legacy/PrestaShopBundle/Translation/Provider/ThemeProviderTest.php index ea443f7112b31..d9ec052c4e0de 100644 --- a/tests-legacy/PrestaShopBundle/Translation/Provider/ThemeProviderTest.php +++ b/tests-legacy/PrestaShopBundle/Translation/Provider/ThemeProviderTest.php @@ -41,8 +41,7 @@ class ThemeProviderTest extends TestCase public function setUp() { $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface') - ->getMock() - ; + ->getMock(); self::$resourcesDir = __DIR__.'/../../resources/themes/fakeTheme2'; $this->provider = new ThemeProvider($loader, self::$resourcesDir); diff --git a/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php b/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php index ea2d4b4ea0cee..281f6f431da04 100644 --- a/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php +++ b/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php @@ -139,8 +139,7 @@ public function setUp() $this->sfKernel->getContainer()->get('filesystem'), $this->languages, )) - ->getMock() - ; + ->getMock(); $this->tabRegister ->method('getModuleAdminControllersFilename') ->will($this->returnValueMap($this->moduleAdminControllers)); diff --git a/tests-legacy/Unit/Core/Addon/Module/ModuleRepositoryTest.php b/tests-legacy/Unit/Core/Addon/Module/ModuleRepositoryTest.php index 7496b537b0eb8..89193f02f6729 100644 --- a/tests-legacy/Unit/Core/Addon/Module/ModuleRepositoryTest.php +++ b/tests-legacy/Unit/Core/Addon/Module/ModuleRepositoryTest.php @@ -87,18 +87,15 @@ public function setUp() $this->apiClientS = $this->getMockBuilder('PrestaShopBundle\Service\DataProvider\Marketplace\ApiClient') ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $this->addonsDataProviderS = $this->getMockBuilder('PrestaShop\PrestaShop\Adapter\Addons\AddonsDataProvider') ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $this->categoriesProviderS = $this->getMockBuilder('PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider') ->disableOriginalConstructor() - ->getmock() - ; + ->getmock(); $this->translatorStub = $this->getMockBuilder('Symfony\Component\Translation\Translator') ->disableOriginalConstructor() @@ -110,8 +107,7 @@ public function setUp() $this->adminModuleDataProviderStub = $this->getMockBuilder('PrestaShop\PrestaShop\Adapter\Module\AdminModuleDataProvider') ->setConstructorArgs(array($this->translatorStub, $this->logger, $this->addonsDataProviderS, $this->categoriesProviderS, $this->moduleDataProviderStub)) ->setMethods(array('getCatalogModulesNames')) - ->getMock() - ; + ->getMock(); $this->adminModuleDataProviderStub ->method('getCatalogModulesNames') @@ -136,8 +132,7 @@ public function setUp() __DIR__.'/../../../../resources/modules/', )) ->setMethods(array('readCacheFile', 'generateCacheFile')) - ->getMock() - ; + ->getMock(); /* * Mock function 'readCacheFile()' to disable the cache diff --git a/tests-legacy/Unit/Core/Business/Product/Search/PaginationTest.php b/tests-legacy/Unit/Core/Business/Product/Search/PaginationTest.php index a2de99e594dcf..11fb5cc989fb2 100644 --- a/tests-legacy/Unit/Core/Business/Product/Search/PaginationTest.php +++ b/tests-legacy/Unit/Core/Business/Product/Search/PaginationTest.php @@ -40,8 +40,7 @@ public function testPaginationAddsContextFirstAndLastPageAndPreviousNext() { $this->pagination ->setPagesCount(10) - ->setPage(5) - ; + ->setPage(5); $this->assertEquals([ ['type' => 'previous', 'clickable' => true, 'page' => 4, 'current' => false], @@ -60,8 +59,7 @@ public function testPaginationContextWhenOnFirstPage() { $this->pagination ->setPagesCount(10) - ->setPage(1) - ; + ->setPage(1); $this->assertEquals([ ['type' => 'previous', 'clickable' => false, 'page' => 1, 'current' => false], @@ -78,8 +76,7 @@ public function testPaginationContextWhenOnLastPage() { $this->pagination ->setPagesCount(10) - ->setPage(10) - ; + ->setPage(10); $this->assertEquals([ ['type' => 'previous', 'clickable' => true, 'page' => 9, 'current' => false], @@ -96,8 +93,7 @@ public function testPaginationContextMakesSenseWhenOnlyOnePage() { $this->pagination ->setPagesCount(1) - ->setPage(1) - ; + ->setPage(1); $this->assertEquals([ ['type' => 'previous', 'clickable' => false, 'page' => 1, 'current' => false], diff --git a/tests-legacy/Unit/Core/Grid/Column/ColumnCollectionTest.php b/tests-legacy/Unit/Core/Grid/Column/ColumnCollectionTest.php index 5d82f4162619a..a5ae8fd2dc563 100644 --- a/tests-legacy/Unit/Core/Grid/Column/ColumnCollectionTest.php +++ b/tests-legacy/Unit/Core/Grid/Column/ColumnCollectionTest.php @@ -38,8 +38,7 @@ public function testItAddsColumnsToCollection() $columns = (new ColumnCollection()) ->add($this->createColumnMock('first')) ->add($this->createColumnMock('second')) - ->add($this->createColumnMock('third')) - ; + ->add($this->createColumnMock('third')); $this->assertEquals([ 'first', @@ -58,8 +57,7 @@ public function testItAddsColumnsBeforeGivenColumn(ColumnCollection $columns) $columns ->addBefore('first', $this->createColumnMock('before_first')) ->addBefore('second', $this->createColumnMock('before_second')) - ->addBefore('third', $this->createColumnMock('before_third')) - ; + ->addBefore('third', $this->createColumnMock('before_third')); $this->assertEquals([ 'before_first', @@ -81,8 +79,7 @@ public function testItAddsColumnsAfterGivenColumn(ColumnCollection $columns) $columns ->addAfter('first', $this->createColumnMock('after_first')) ->addAfter('second', $this->createColumnMock('after_second')) - ->addAfter('third', $this->createColumnMock('after_third')) - ; + ->addAfter('third', $this->createColumnMock('after_third')); $this->assertEquals([ 'before_first', @@ -125,8 +122,7 @@ public function testMixingMethodsProducesCollectionWithCorrectColumnPositions() ->add($this->createColumnMock('second')) ->remove('to_be_removed') ->add($this->createColumnMock('third')) - ->addAfter('second', $this->createColumnMock('after_second')) - ; + ->addAfter('second', $this->createColumnMock('after_second')); $this->assertEquals([ 'before_first', @@ -150,8 +146,7 @@ public function testNumericColumnIdAreAccepted() ->add($this->createColumnMock('second')) ->addAfter('second', $this->createColumnMock(9)) ->addBefore('second', $this->createColumnMock('7')) - ->add($this->createColumnMock(5)) - ; + ->add($this->createColumnMock(5)); $this->assertEquals([ 2, @@ -183,8 +178,7 @@ public function testColumnsCanBeRetrievedAsArray() $columns = (new ColumnCollection()) ->add($this->createColumnMock('test_1')) ->add($this->createColumnMock('test_2')) - ->add($this->createColumnMock('test_3')) - ; + ->add($this->createColumnMock('test_3')); $columnsArray = $columns->toArray(); diff --git a/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php b/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php index e277544ed0bcf..875e4755a3a6a 100644 --- a/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php +++ b/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php @@ -43,8 +43,7 @@ public function testItProvidesGridData() { $hookDispatcher = $this->createHookDispatcherMock(); $hookDispatcher->expects($this->once()) - ->method('dispatchWithParameters') - ; + ->method('dispatchWithParameters'); $queryParser = $this->createQueryParserMock(); @@ -96,8 +95,7 @@ private function createDoctrineQueryBuilderMock() $qb->method('getParameters') ->willReturn([ 'id' => 1, - ]) - ; + ]); $doctrineQueryBuilder = $this->createMock(DoctrineQueryBuilderInterface::class); $doctrineQueryBuilder->method('getSearchQueryBuilder') diff --git a/tests-legacy/Unit/Core/Grid/Definition/Factory/AbstractGridDefinitionFactoryTest.php b/tests-legacy/Unit/Core/Grid/Definition/Factory/AbstractGridDefinitionFactoryTest.php index 66df58171f189..d0c0b9bbf05e1 100644 --- a/tests-legacy/Unit/Core/Grid/Definition/Factory/AbstractGridDefinitionFactoryTest.php +++ b/tests-legacy/Unit/Core/Grid/Definition/Factory/AbstractGridDefinitionFactoryTest.php @@ -49,18 +49,15 @@ public function setUp() $definitionFactory ->expects($this->once()) ->method('getName') - ->willReturn('Test name') - ; + ->willReturn('Test name'); $definitionFactory ->expects($this->once()) ->method('getId') - ->willReturn('test_id') - ; + ->willReturn('test_id'); $definitionFactory ->expects($this->once()) ->method('getColumns') - ->willReturn($this->getColumns()) - ; + ->willReturn($this->getColumns()); $this->definitionFactory = $definitionFactory; } @@ -74,8 +71,7 @@ public function testItCreatesDefinitionAndDispatchesHookToAllowDefinitionModific ->withConsecutive( [$this->equalTo('actionTestIdGridDefinitionModifier')], [$this->isType('array'), $this->arrayHasKey('definition')] - ) - ; + ); $this->definitionFactory->setHookDispatcher($hookDispatcherMock); @@ -98,8 +94,7 @@ private function getColumns() return (new ColumnCollection()) ->add($this->createColumnMock('test_1')) ->add($this->createColumnMock('test_2')) - ->add($this->createColumnMock('test_3')) - ; + ->add($this->createColumnMock('test_3')); } private function createColumnMock($id) diff --git a/tests-legacy/Unit/Core/Grid/Position/GridPositionUpdaterTest.php b/tests-legacy/Unit/Core/Grid/Position/GridPositionUpdaterTest.php index 997462b143f44..12cab375d4de2 100644 --- a/tests-legacy/Unit/Core/Grid/Position/GridPositionUpdaterTest.php +++ b/tests-legacy/Unit/Core/Grid/Position/GridPositionUpdaterTest.php @@ -148,8 +148,7 @@ private function createUpdateHandlerMockThrowingException() 'Could not update #%i', 'Admin.Catalog.Notification', [5] - )) - ; + )); return $updaterMock; diff --git a/tests-legacy/Unit/Core/Hook/HookDispatcherTest.php b/tests-legacy/Unit/Core/Hook/HookDispatcherTest.php index bf5ddfe9855ec..238ec0279963c 100644 --- a/tests-legacy/Unit/Core/Hook/HookDispatcherTest.php +++ b/tests-legacy/Unit/Core/Hook/HookDispatcherTest.php @@ -61,8 +61,7 @@ public function testDispatchHook() $this->hookDispatcherAdapter ->expects($this->once()) ->method('dispatchForParameters') - ->with($this->equalTo('hookName'), $this->equalTo([])) - ; + ->with($this->equalTo('hookName'), $this->equalTo([])); $this->hookDispatcher->dispatchHook($hook); } @@ -73,8 +72,7 @@ public function testDispatchWithParameters() $this->hookDispatcherAdapter ->expects($this->once()) ->method('dispatchForParameters') - ->with($this->equalTo('fooHook'), $this->equalTo(['bar' => 'Bar'])) - ; + ->with($this->equalTo('fooHook'), $this->equalTo(['bar' => 'Bar'])); $this->hookDispatcher->dispatchWithParameters('fooHook', ['bar' => 'Bar']); } @@ -94,8 +92,7 @@ public function testDispatchRendering() $hook->getName(), $hook->getParameters() ) - ->willReturn($hookEvent) - ; + ->willReturn($hookEvent); $renderedHook = $this->hookDispatcher->dispatchRendering($hook); @@ -119,8 +116,7 @@ public function testDispatchRenderingWithParameters() $hook->getName(), $hook->getParameters() ) - ->willReturn($hookEvent) - ; + ->willReturn($hookEvent); $renderedHook = $this->hookDispatcher->dispatchRenderingWithParameters('Baz', ['hello' => 'World']); diff --git a/tests-legacy/Unit/Core/Module/HookConfiguratorTest.php b/tests-legacy/Unit/Core/Module/HookConfiguratorTest.php index ae206220a8775..457a91a94ab90 100644 --- a/tests-legacy/Unit/Core/Module/HookConfiguratorTest.php +++ b/tests-legacy/Unit/Core/Module/HookConfiguratorTest.php @@ -49,8 +49,7 @@ private function setCurrentDisplayHooksConfiguration(array $hookConfiguration) { Phake::when($this->hookRepository) ->getDisplayHooksWithModules() - ->thenReturn($hookConfiguration) - ; + ->thenReturn($hookConfiguration); return $this; } diff --git a/tests-legacy/Unit/Core/Payment/Core_Payment_PaymentOptionTest.php b/tests-legacy/Unit/Core/Payment/Core_Payment_PaymentOptionTest.php index 32dada808e0ee..ebf0aeabf7c7d 100644 --- a/tests-legacy/Unit/Core/Payment/Core_Payment_PaymentOptionTest.php +++ b/tests-legacy/Unit/Core/Payment/Core_Payment_PaymentOptionTest.php @@ -39,8 +39,7 @@ public function testConvertLegacyOptionConvertsOneOption() ->setLogo('http://example.com/logo.png') ->setAction('http://example.com/submit') ->setForm(null) - ->setInputs(array('key' => 42)) - ; + ->setInputs(array('key' => 42)); $legacyOption = array( 'cta_text' => 'Pay by bankwire', @@ -64,8 +63,7 @@ public function testConvertLegacyOptionConvertsTwoOptionsSpecifiedAsOne() ->setLogo('http://example.com/logo.png') ->setAction('http://example.com/submit') ->setForm(null) - ->setInputs(array('key' => 42)) - ; + ->setInputs(array('key' => 42)); $singleLegacyOption = array( 'cta_text' => 'Pay by bankwire', diff --git a/tests-legacy/Unit/PrestaShopBundle/Api/QueryParamsCollectionTest.php b/tests-legacy/Unit/PrestaShopBundle/Api/QueryParamsCollectionTest.php index 4d9d58a78b383..45e28f11464a0 100644 --- a/tests-legacy/Unit/PrestaShopBundle/Api/QueryParamsCollectionTest.php +++ b/tests-legacy/Unit/PrestaShopBundle/Api/QueryParamsCollectionTest.php @@ -264,8 +264,7 @@ public function getFilterParams() $supplierFilterMessage = 'It should provide with a SQL condition clause on supplier'; $categoryFilterMessage = 'It should provide with a SQL condition clause on category'; $keywordsFilterMessage = - 'It should provide with SQL conditions clauses on product references, names and supplier names' - ; + 'It should provide with SQL conditions clauses on product references, names and supplier names'; $attributesFilterMessage = 'It should provide with SQL conditions clauses on product attributes'; $featuresFilterMessage = 'It should provide with SQL conditions clauses on product features'; diff --git a/tests-legacy/resources/modules/ps_featuredproducts/ps_featuredproducts.php b/tests-legacy/resources/modules/ps_featuredproducts/ps_featuredproducts.php index be89eb14d983d..acdfe1c677855 100644 --- a/tests-legacy/resources/modules/ps_featuredproducts/ps_featuredproducts.php +++ b/tests-legacy/resources/modules/ps_featuredproducts/ps_featuredproducts.php @@ -55,7 +55,6 @@ public function install() && $this->registerHook('updateproduct') && $this->registerHook('deleteproduct') && $this->registerHook('categoryUpdate') - && $this->registerHook('displayHome') - ; + && $this->registerHook('displayHome'); } } diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 2c67f0d493057..89dd8566b1da9 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -732,8 +732,7 @@ function ($cfgValue) { return (int) $cfgValue === 0; }, || (extension_loaded('xcache') && ini_get('xcache.cacher')) || - (extension_loaded('wincache') && ini_get('wincache.ocenabled')) - ; + (extension_loaded('wincache') && ini_get('wincache.ocenabled')); $this->addRecommendation( $accelerator,