cs fixer

src/Adapter/Carrier/CarrierDataProvider.php

@@ -51,7 +51,7 @@ public function __construct(Configuration $configuration)
      * @param bool $active Returns only active carriers when true
      * @param bool $delete
      * @param bool|int $id_zone
-     * @param null|string $ids_group
+     * @param string|null $ids_group
      * @param $modules_filters , possible values:
      * PS_CARRIERS_ONLY
      * CARRIERS_MODULE

src/Adapter/Customer/CustomerDataProvider.php

@@ -59,7 +59,7 @@ public function getCustomer($id)
      *
      * @param int $idCustomer Customer ID
      *
-     * @return mixed|null|string
+     * @return mixed|string|null
      */
     public function getDefaultGroupId($idCustomer)
     {

src/Adapter/File/HtaccessFileGenerator.php

@@ -66,7 +66,7 @@ public function __construct(CacheClearer $cacheClearer, Tools $tools, $multipleV
     /**
      * Generates htaccess file and its content.
      *
-     * @param null|bool $disableMultiView if null, rely on the Shop configuration
+     * @param bool|null $disableMultiView if null, rely on the Shop configuration
      *
      * @return bool
      */

src/Adapter/Language/LanguageDataProvider.php

@@ -53,7 +53,7 @@ public function getLanguages($active = true, $shopId = false, $onlyIds = false)
      *
      * @param string $isoCode - ISO 3166-2 alpha-2 format code
      *
-     * @return false|null|string
+     * @return false|string|null
      */
     public function getLanguageCodeByIso($isoCode)
     {

src/Adapter/Module/ModuleZip.php

@@ -55,7 +55,7 @@ public function __construct($source)
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getName()
     {
@@ -71,7 +71,7 @@ public function getSource()
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getSandboxPath()
     {

src/Adapter/Module/ModuleZipManager.php

@@ -191,7 +191,7 @@ public function storeInModulesFolder($source)
     /**
      * @param $source
      *
-     * @return null|string
+     * @return string|null
      */
     private function getSandboxPath($source)
     {
@@ -210,7 +210,7 @@ private function getSandboxPath($source)
      *
      * @param string $source
      *
-     * @return null|ModuleZip
+     * @return ModuleZip|null
      */
     private function getSource($source)
     {

src/Adapter/Presenter/Product/ProductLazyArray.php

@@ -192,7 +192,7 @@ public function getCanonicalUrl()
     /**
      * @arrayAccess
      *
-     * @return null|string
+     * @return string|null
      */
     public function getAddToCartUrl()
     {
@@ -250,7 +250,7 @@ public function getCondition()
     /**
      * @arrayAccess
      *
-     * @return null|string
+     * @return string|null
      */
     public function getDeliveryInformation()
     {
@@ -284,7 +284,7 @@ public function getEmbeddedAttributes()
     /**
      * @arrayAccess
      *
-     * @return null|string
+     * @return string|null
      */
     public function getFileSizeFormatted()
     {

src/Adapter/Presenter/Product/ProductListingLazyArray.php

@@ -33,7 +33,7 @@ class ProductListingLazyArray extends ProductLazyArray
     /**
      * @arrayAccess
      *
-     * @return null|string
+     * @return string|null
      */
     public function getAddToCartUrl()
     {

src/Adapter/Product/AdminProductWrapper.php

@@ -552,7 +552,7 @@ public function deleteSpecificPrice($id_specific_price)
     /**
      * Get price priority.
      *
-     * @param null|int $idProduct
+     * @param int|null $idProduct
      *
      * @return array
      */

src/Core/Addon/Module/ModuleManagerBuilder.php

@@ -82,7 +82,7 @@ class ModuleManagerBuilder
     public static $cacheProvider = null;
 
     /**
-     * @return null|ModuleManagerBuilder
+     * @return ModuleManagerBuilder|null
      */
     public static function getInstance()
     {

src/Core/Cldr/Localize.php

@@ -112,7 +112,7 @@ public static function getEnvironmentLocale()
     /**
      * Parse the language part of a given locale string.
      *
-     * @param null|string $locale The local to parse
+     * @param string|null $locale The local to parse
      *
      * @return string The language parsed from the $locale input
      */
@@ -158,7 +158,7 @@ public static function getLocale()
     /**
      * Gets the best locale value, looking after the input, the browser and the environment locales.
      *
-     * @param null|string|Localize $locale
+     * @param string|Localize|null $locale
      *
      * @return string The best fitting locale
      */
@@ -196,7 +196,7 @@ public static function getPreferedLocale($locale = null)
     /**
      * Parse the region part of the given locale string.
      *
-     * @param null|string $locale The locale value to parse
+     * @param string|null $locale The locale value to parse
      *
      * @return string The region parsed from the input
      */
@@ -230,7 +230,7 @@ public static function toString()
      *
      * @param $locale the locale to fix
      *
-     * @return array|null|string the fixed locale format
+     * @return array|string|null the fixed locale format
      */
     private static function canonicalize($locale)
     {

src/Core/Grid/Search/SearchCriteria.php

@@ -37,22 +37,22 @@ final class SearchCriteria implements SearchCriteriaInterface
     private $filters;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $orderBy;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $orderWay;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $offset;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $limit;
 

src/PrestaShopBundle/Component/CsvResponse.php

@@ -58,7 +58,7 @@ class CsvResponse extends StreamedResponse
     private $modeType = self::MODE_PAGINATION;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     private $start = null;
 

src/PrestaShopBundle/Controller/Admin/SpecificPriceController.php

@@ -253,7 +253,7 @@ private function formatSpecificPriceToPrefillForm($id, $price)
     /**
      * @param string $dateAsString
      *
-     * @return null|string If date is 0000-00-00 00:00:00, null is returned
+     * @return string|null If date is 0000-00-00 00:00:00, null is returned
      *
      * @throws \PrestaShopDatabaseExceptionCore if date is not valid
      */

src/PrestaShopBundle/EventListener/ModuleActivatedListener.php

@@ -154,7 +154,7 @@ private function showNotificationMessage(ModuleActivated $moduleActivated)
      * @param object $controllerObject
      * @param string $methodName
      *
-     * @return null|ModuleActivated
+     * @return ModuleActivated|null
      *
      * @throws AnnotationException
      * @throws \ReflectionException

src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportFormDataProvider.php

@@ -48,7 +48,7 @@ final class ImportFormDataProvider implements ImportFormDataProviderInterface
     private $session;
 
     /**
-     * @var null|RequestStack current request
+     * @var RequestStack|null current request
      */
     private $request;
 

src/PrestaShopBundle/Routing/Converter/LegacyUrlConverter.php

@@ -166,7 +166,7 @@ private function findLegacyRouteNameByParameters(array $parameters)
     /**
      * @param array $parameters
      *
-     * @return null|string
+     * @return string|null
      */
     private function getActionFromParameters(array $parameters)
     {