Merge pull request PrestaShop#3808 from gskema/psr2_12

[PSR-2] Fix coding standards and indentation in Range* class files
Shakarhaba · Aug 25, 2015 · bc07147 · bc07147
2 parents 41b97cf + 861257d
commit bc07147
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/classes/range/RangePrice.php b/classes/range/RangePrice.php
@@ -89,32 +89,32 @@ public function add($autodate = true, $null_values = false)
     public static function getRanges($id_carrier)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
-			SELECT *
-			FROM `'._DB_PREFIX_.'range_price`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			ORDER BY `delimiter1` ASC');
+            SELECT *
+            FROM `'._DB_PREFIX_.'range_price`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            ORDER BY `delimiter1` ASC');
     }
 
     public static function rangeExist($id_carrier, $delimiter1, $delimiter2)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT count(*)
-			FROM `'._DB_PREFIX_.'range_price`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
+            SELECT count(*)
+            FROM `'._DB_PREFIX_.'range_price`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
     }
 
     public static function isOverlapping($id_carrier, $delimiter1, $delimiter2, $id_rang = null)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT count(*)
-			FROM `'._DB_PREFIX_.'range_price`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			AND ((`delimiter1` >= '.(float)$delimiter1.' AND `delimiter1` < '.(float)$delimiter2.')
-			    OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` < '.(float)$delimiter2.')
-			    OR ('.(float)$delimiter1.' > `delimiter1` AND '.(float)$delimiter1.' < `delimiter2`)
-			    OR ('.(float)$delimiter2.' < `delimiter1` AND '.(float)$delimiter2.' > `delimiter2`)
-			    )
-			'.(!is_null($id_rang) ? ' AND `id_range_price` != '.(int)$id_rang : ''));
+            SELECT count(*)
+            FROM `'._DB_PREFIX_.'range_price`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            AND ((`delimiter1` >= '.(float)$delimiter1.' AND `delimiter1` < '.(float)$delimiter2.')
+                OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` < '.(float)$delimiter2.')
+                OR ('.(float)$delimiter1.' > `delimiter1` AND '.(float)$delimiter1.' < `delimiter2`)
+                OR ('.(float)$delimiter2.' < `delimiter1` AND '.(float)$delimiter2.' > `delimiter2`)
+                )
+            '.(!is_null($id_rang) ? ' AND `id_range_price` != '.(int)$id_rang : ''));
     }
 }
diff --git a/classes/range/RangeWeight.php b/classes/range/RangeWeight.php
@@ -44,9 +44,9 @@ class RangeWeightCore extends ObjectModel
     );
 
     protected $webserviceParameters = array(
-            'objectNodeName' => 'weight_range',
-            'objectsNodeName' => 'weight_ranges',
-            'fields' => array(
+        'objectNodeName' => 'weight_range',
+        'objectsNodeName' => 'weight_ranges',
+        'fields' => array(
             'id_carrier' => array('xlink_resource' => 'carriers'),
         )
     );
@@ -89,32 +89,32 @@ public function add($autodate = true, $null_values = false)
     public static function getRanges($id_carrier)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
-			SELECT *
-			FROM `'._DB_PREFIX_.'range_weight`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			ORDER BY `delimiter1` ASC');
+            SELECT *
+            FROM `'._DB_PREFIX_.'range_weight`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            ORDER BY `delimiter1` ASC');
     }
 
     public static function rangeExist($id_carrier, $delimiter1, $delimiter2)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT count(*)
-			FROM `'._DB_PREFIX_.'range_weight`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
+            SELECT count(*)
+            FROM `'._DB_PREFIX_.'range_weight`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
     }
 
     public static function isOverlapping($id_carrier, $delimiter1, $delimiter2, $id_rang = null)
     {
         return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT count(*)
-			FROM `'._DB_PREFIX_.'range_weight`
-			WHERE `id_carrier` = '.(int)$id_carrier.'
-			AND ((`delimiter1` >= '.(float)$delimiter1.' AND `delimiter1` < '.(float)$delimiter2.')
-			    OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` < '.(float)$delimiter2.')
-			    OR ('.(float)$delimiter1.' > `delimiter1` AND '.(float)$delimiter1.' < `delimiter2`)
-			    OR ('.(float)$delimiter2.' < `delimiter1` AND '.(float)$delimiter2.' > `delimiter2`)
-			    )
-			'.(!is_null($id_rang) ? ' AND `id_range_weight` != '.(int)$id_rang : ''));
+            SELECT count(*)
+            FROM `'._DB_PREFIX_.'range_weight`
+            WHERE `id_carrier` = '.(int)$id_carrier.'
+            AND ((`delimiter1` >= '.(float)$delimiter1.' AND `delimiter1` < '.(float)$delimiter2.')
+                OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` < '.(float)$delimiter2.')
+                OR ('.(float)$delimiter1.' > `delimiter1` AND '.(float)$delimiter1.' < `delimiter2`)
+                OR ('.(float)$delimiter2.' < `delimiter1` AND '.(float)$delimiter2.' > `delimiter2`)
+                )
+            '.(!is_null($id_rang) ? ' AND `id_range_weight` != '.(int)$id_rang : ''));
     }
 }