// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names

classes/tax/Tax.php

@@ -169,7 +169,7 @@ class TaxCore extends ObjectModel
 		if ($active_only)
 			$sql->where('t.`active` = 1');
 
-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
+		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 	}
 
 	public static function excludeTaxeOption()

classes/tax/TaxRule.php

@@ -69,7 +69,7 @@ class TaxRuleCore extends ObjectModel
         if (empty($id_group))
             die(Tools::displayError());
 
-        return Db::getInstance()->Execute('
+        return Db::getInstance()->execute('
         DELETE FROM `'._DB_PREFIX_.'tax_rule`
         WHERE `id_tax_rules_group` = '.(int)$id_group
         );
@@ -84,7 +84,7 @@ class TaxRuleCore extends ObjectModel
 
 	public static function getTaxRulesByGroupId($id_lang, $id_group)
 	{
-		return Db::getInstance()->ExecuteS('
+		return Db::getInstance()->executeS('
 		SELECT g.`id_tax_rule`,
 				 c.`name` AS country_name,
 				 s.`name` AS state_name,
@@ -103,7 +103,7 @@ class TaxRuleCore extends ObjectModel
 
     public static function deleteTaxRuleByIdTax($id_tax)
     {
-        return Db::getInstance()->Execute('
+        return Db::getInstance()->execute('
         DELETE FROM `'._DB_PREFIX_.'tax_rule`
         WHERE `id_tax` = '.(int)$id_tax
         );
@@ -171,7 +171,7 @@ class TaxRuleCore extends ObjectModel
 	*/
 	public static function swapTaxId($old_id, $new_id)
 	{
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'tax_rule`
 		SET `id_tax` = '.(int)$new_id.'
 		WHERE `id_tax` = '.(int)$old_id

classes/tax/TaxRulesGroup.php

@@ -52,7 +52,7 @@ class TaxRulesGroupCore extends ObjectModel
 
 	public static function getTaxRulesGroups($only_active = true)
 	{
-	    return Db::getInstance()->ExecuteS('
+	    return Db::getInstance()->executeS('
 	    SELECT *
 	    FROM `'._DB_PREFIX_.'tax_rules_group` g'
 	    .($only_active ? ' WHERE g.`active` = 1' : '')
@@ -74,7 +74,7 @@ class TaxRulesGroupCore extends ObjectModel
 	*/
 	public static function getAssociatedTaxRatesByIdCountry($id_country)
 	{
-	    $rows = Db::getInstance()->ExecuteS('
+	    $rows = Db::getInstance()->executeS('
 	    SELECT rg.`id_tax_rules_group`, t.`rate`
 	    FROM `'._DB_PREFIX_.'tax_rules_group` rg
    	    LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.`id_tax_rules_group` = rg.`id_tax_rules_group`)

classes/tax/TaxRulesTaxManager.php

@@ -67,7 +67,7 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
 
 		if (!isset(self::$cache_tax_calculator[$postcode]))
 		{
-			$rows = Db::getInstance()->ExecuteS('
+			$rows = Db::getInstance()->executeS('
 			SELECT *
 			FROM `'._DB_PREFIX_.'tax_rule`
 			WHERE `id_country` = '.(int)$this->address->id_country.'