Merge pull request PrestaShop#12166 from PierreRambaud/update/css-fixer

Update php-cs-fixer to a recent version to be compatible with PHP7.3
ckubitza · Jan 16, 2019 · 7b87a09 · 7b87a09
2 parents 0eb62bf + e2d5d37
commit 7b87a09
Show file tree

Hide file tree

Showing 52 changed files with 128 additions and 123 deletions.
diff --git a/classes/Address.php b/classes/Address.php
@@ -577,7 +577,7 @@ public static function getAddressIdBySupplierId($id_supplier)
      * @param int $id_address Address id
      * @param int $id_customer Customer id
      *
-     * @return false|null|string Amount of aliases found
+     * @return false|string|null Amount of aliases found
      * @todo: Find out if we shouldn't be returning an int instead? (breaking change)
      */
     public static function aliasExist($alias, $id_address, $id_customer)

diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php
@@ -597,7 +597,7 @@ public function getFormat($idCountry)
     /**
      * @param int $idCountry
      *
-     * @return false|null|string
+     * @return false|string|null
      *
      * @deprecated 1.7.0
      */
@@ -611,7 +611,7 @@ protected function _getFormatDB($idCountry)
      *
      * @param int $idCountry Country ID
      *
-     * @return false|null|string Address format
+     * @return false|string|null Address format
      *
      * @since 1.7.0
      */

diff --git a/classes/Attachment.php b/classes/Attachment.php
@@ -129,7 +129,7 @@ public function deleteSelection($attachments)
      * @param int $idProduct Product ID
      * @param bool $include Whether the attachments are included or excluded from the Product ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Database query result
+     * @return array|false|mysqli_result|PDOStatement|resource|null Database query result
      */
     public static function getAttachments($idLang, $idProduct, $include = true)
     {

diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php
@@ -321,7 +321,7 @@ public function setWsProductOptionValues($values)
     /**
      * Get values of current AttributeGroup instance for the webservice.
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getWsProductOptionValues()
     {

diff --git a/classes/CMS.php b/classes/CMS.php
@@ -167,7 +167,7 @@ public static function getLinks($idLang, $selection = null, $active = true, Link
      * @param bool $idBlock
      * @param bool $active
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function listCms($idLang = null, $idBlock = false, $active = true)
     {
@@ -260,7 +260,7 @@ public static function cleanPositions($idCategory)
     /**
      * @param $idCategory
      *
-     * @return false|null|string
+     * @return false|string|null
      */
     public static function getLastPosition($idCategory)
     {
@@ -278,7 +278,7 @@ public static function getLastPosition($idCategory)
      * @param bool $active
      * @param null $idShop
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getCMSPages($idLang = null, $idCmsCategory = null, $active = true, $idShop = null)
     {
@@ -314,7 +314,7 @@ public static function getCMSPages($idLang = null, $idCmsCategory = null, $activ
     /**
      * @param $idCms
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getUrlRewriteInformations($idCms)
     {
@@ -332,7 +332,7 @@ public static function getUrlRewriteInformations($idCms)
      * @param int|null $idLang
      * @param int|null $idShop
      *
-     * @return array|bool|null|object
+     * @return array|bool|object|null
      */
     public static function getCMSContent($idCms, $idLang = null, $idShop = null)
     {

diff --git a/classes/Carrier.php b/classes/Carrier.php
@@ -351,7 +351,7 @@ public static function checkDeliveryPriceByWeight($id_carrier, $total_weight, $i
      *
      * @param int $id_zone Zone ID
      *
-     * @return false|null|string Maximum delivery price
+     * @return false|string|null Maximum delivery price
      */
     public function getMaxDeliveryPriceByWeight($id_zone)
     {
@@ -584,7 +584,7 @@ public static function getCarriers($id_lang, $active = false, $delete = false, $
     /**
      * Get most used Tax rules group.
      *
-     * @return false|null|string Most used Tax rules group ID
+     * @return false|string|null Most used Tax rules group ID
      */
     public static function getIdTaxRulesGroupMostUsed()
     {
@@ -1197,7 +1197,7 @@ public function getRangeSuffix($currency = null)
      *
      * @param Context|null $context Context
      *
-     * @return false|null|string TaxrulesGroup ID
+     * @return false|string|null TaxrulesGroup ID
      *                           false if not found
      */
     public function getIdTaxRulesGroup(Context $context = null)
@@ -1211,7 +1211,7 @@ public function getIdTaxRulesGroup(Context $context = null)
      * @param int $id_carrier Carrier ID
      * @param Context|null $context Context
      *
-     * @return false|null|string TaxRulesGroup ID
+     * @return false|string|null TaxRulesGroup ID
      *                           false if not found
      */
     public static function getIdTaxRulesGroupByIdCarrier($id_carrier, Context $context = null)

diff --git a/classes/Cart.php b/classes/Cart.php
@@ -447,7 +447,7 @@ public function getAverageProductsTaxRate(&$cartAmountTaxExcluded = null, &$cart
      *                    - FILTER_ACTION_ALL_NOCAP
      * @param bool $autoAdd automaticaly adds cart ruls without code to cart
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Database result
+     * @return array|false|mysqli_result|PDOStatement|resource|null Database result
      */
     public function getCartRules($filter = CartRule::FILTER_ACTION_ALL, $autoAdd = true)
     {
@@ -1770,7 +1770,7 @@ protected function getProductsGifts($id_product, $id_product_attribute)
      * @param int $id_customization Customization Id
      * @param null $id_product Unused
      * @param null $id_product_attribute Unused
-     * @param null|int $id_address_delivery Unused
+     * @param int|null $id_address_delivery Unused
      *
      * @return bool Indicates if the Customization was successfully deleted
      * @todo: Remove unused parameters
@@ -4199,7 +4199,7 @@ public function getProductCustomization($id_product, $type = null, $not_in_cart
      * @param int $id_customer Customer ID
      * @param bool $with_order Only return Carts that have been converted into an Order
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource DB result
+     * @return array|false|mysqli_result|PDOStatement|resource|null DB result
      */
     public static function getCustomerCarts($id_customer, $with_order = true)
     {
@@ -4371,7 +4371,7 @@ public function duplicate()
     /**
      * Get Cart rows from DB for the webservice.
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource DB result
+     * @return array|false|mysqli_result|PDOStatement|resource|null DB result
      */
     public function getWsCartRows()
     {

diff --git a/classes/Category.php b/classes/Category.php
@@ -656,7 +656,7 @@ public static function getCategories($idLang = false, $active = true, $order = t
      * @param string $limit Set the limit
      *                      Both the offset and limit can be given
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Array with `id_category` and `name`
+     * @return array|false|mysqli_result|PDOStatement|resource|null Array with `id_category` and `name`
      */
     public static function getAllCategoriesName(
         $idRootCategory = null,
@@ -815,7 +815,7 @@ public static function getNestedCategories(
      *
      * @param int $idLang Language ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getSimpleCategories($idLang)
     {
@@ -836,7 +836,7 @@ public static function getSimpleCategories($idLang)
      *
      * @param int $idLang Language ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getSimpleCategoriesWithParentInfos($idLang)
     {
@@ -1873,7 +1873,7 @@ public static function getUrlRewriteInformations($idCategory)
      *
      * @param $idCategory
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      *
      * @since 1.7.0
      */
@@ -1968,7 +1968,7 @@ public static function inShopStatic($idCategory, Shop $shop = null)
     /**
      * Get Children for the webservice.
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getChildrenWs()
     {
@@ -1984,7 +1984,7 @@ public function getChildrenWs()
     /**
      * Get Products for webservice.
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getProductsWs()
     {
@@ -2014,7 +2014,7 @@ public function getDuplicatePosition()
     /**
      * Recursively get amount of Products for the webservice.
      *
-     * @return false|int|null|string
+     * @return false|int|string|null
      */
     public function getWsNbProductsRecursive()
     {
@@ -2138,7 +2138,7 @@ public function addShop($idShop)
      * @param int|null $idLang Language ID
      * @param bool $active Whether the root Category must be active
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Root Categories
+     * @return array|false|mysqli_result|PDOStatement|resource|null Root Categories
      */
     public static function getRootCategories($idLang = null, $active = true)
     {
@@ -2157,7 +2157,7 @@ public static function getRootCategories($idLang = null, $active = true)
     /**
      * Get Categories without parent.
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Categories without parent
+     * @return array|false|mysqli_result|PDOStatement|resource|null Categories without parent
      */
     public static function getCategoriesWithoutParent()
     {
@@ -2258,7 +2258,7 @@ public function addPosition($position, $idShop = null)
      *
      * @param int $idCategory Category ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource Array with Shop IDs
+     * @return array|false|mysqli_result|PDOStatement|resource|null Array with Shop IDs
      */
     public static function getShopsByCategory($idCategory)
     {

diff --git a/classes/Combination.php b/classes/Combination.php
@@ -280,7 +280,7 @@ public function setWsProductOptionValues($values)
     }
 
     /**
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getWsProductOptionValues()
     {
@@ -294,7 +294,7 @@ public function getWsProductOptionValues()
     }
 
     /**
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getWsImages()
     {
@@ -356,7 +356,7 @@ public function setWsImages($values)
     /**
      * @param $idLang
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getAttributesName($idLang)
     {
@@ -424,7 +424,7 @@ public static function getIdByReference($idProduct, $reference)
     }
 
     /**
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public function getColorsAttributes()
     {

diff --git a/classes/ConnectionsSource.php b/classes/ConnectionsSource.php
@@ -131,7 +131,7 @@ public static function logHttpReferer(Cookie $cookie = null)
      *
      * @param int $idOrder Order ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getOrderSources($idOrder)
     {

diff --git a/classes/Country.php b/classes/Country.php
@@ -331,7 +331,7 @@ public static function getNeedZipCode($idCountry)
      *
      * @param int $idCountry Country ID
      *
-     * @return bool|false|null|string
+     * @return bool|false|string|null
      */
     public static function getZipCodeFormat($idCountry)
     {
@@ -357,7 +357,7 @@ public static function getZipCodeFormat($idCountry)
      * @param int $idZone Zone ID
      * @param int $idLang Language ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getCountriesByZoneId($idZone, $idLang)
     {

diff --git a/classes/Currency.php b/classes/Currency.php
@@ -397,7 +397,7 @@ public static function getPaymentCurrenciesSpecial($idModule, $idShop = null)
      * @param int $idModule Module ID
      * @param null $idShop Shop ID
      *
-     * @return array|false|mysqli_result|null|PDOStatement|resource
+     * @return array|false|mysqli_result|PDOStatement|resource|null
      */
     public static function getPaymentCurrencies($idModule, $idShop = null)
     {
@@ -423,7 +423,7 @@ public static function getPaymentCurrencies($idModule, $idShop = null)
      * @param int $idModule Module ID
      * @param null $idShop Shop ID
      *
-     * @return array|null|PDOStatement|resource
+     * @return array|PDOStatement|resource|null
      */
     public static function checkPaymentCurrencies($idModule, $idShop = null)
     {
@@ -451,7 +451,7 @@ public static function checkPaymentCurrencies($idModule, $idShop = null)
      *
      * @param int $idCurrency Currency ID
      *
-     * @return array|bool|null|object
+     * @return array|bool|object|null
      */
     public static function getCurrency($idCurrency)
     {