Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed camelCase in lib/Varien #2403

Merged
merged 1 commit into from
Aug 11, 2022
Merged

Fixed camelCase in lib/Varien #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 0 additions & 155 deletions .github/phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Admin/Model/Resource/Acl.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Admin/Model/Resource/Rules.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 4
path: ../app/code/core/Mage/Admin/Model/Resource/User.php

-
message: "#^Call to an undefined method Mage_Admin_Model_Resource_Roles\\:\\:update\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -1605,16 +1595,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Api/Model/Resource/Roles.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Api/Model/Resource/Rules.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 4
path: ../app/code/core/Mage/Api/Model/Resource/User.php

-
message: "#^Call to an undefined method Mage_Api_Model_Resource_Roles\\:\\:update\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -1860,11 +1840,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Backup/Model/Resource/Db.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Backup/Model/Resource/Db.php

-
message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -2045,11 +2020,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Bundle/Model/Resource/Price/Index.php

-
message: "#^Variable \\$basePrice might not be defined\\.$#"
count: 2
Expand Down Expand Up @@ -2770,11 +2740,6 @@ parameters:
count: 2
path: ../app/code/core/Mage/Catalog/Model/Resource/Product.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Action.php

-
message: "#^Call to an undefined method Varien_Object\\:\\:formatUrlKey\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -2845,11 +2810,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 3
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php

-
message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getIsNullNotNullCondition\\(\\)\\.$#"
count: 1
Expand All @@ -2875,11 +2835,6 @@ parameters:
count: 2
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php

-
message: "#^Cannot call method setTypeId\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#"
count: 1
Expand All @@ -2905,11 +2860,6 @@ parameters:
count: 2
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Website.php

-
message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getCastToIntExpression\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -3035,11 +2985,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 3
path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php

-
message: "#^Call to method fetch\\(\\) on an unknown class PDO_Statement\\.$#"
count: 1
Expand All @@ -3050,11 +2995,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php

-
message: "#^Call to an undefined method Varien_Object\\:\\:isObjectNew\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -3085,11 +3025,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/CatalogRule/Model/Observer.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 3
path: ../app/code/core/Mage/CatalogRule/Model/Resource/Rule.php

-
message: "#^Variable \\$indexAlias might not be defined\\.$#"
count: 1
Expand Down Expand Up @@ -3590,11 +3525,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Core/Model/Resource.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Core/Model/Resource/Cache.php

-
message: "#^Variable \\$alias in isset\\(\\) always exists and is always null\\.$#"
count: 1
Expand All @@ -3610,11 +3540,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Core/Model/Resource/Email/Queue.php

-
message: "#^PHPDoc tag @param for parameter \\$callbacks with type array\\|string is not subtype of native type array\\.$#"
count: 1
Expand Down Expand Up @@ -4240,11 +4165,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php

-
message: "#^Variable \\$attributeCode might not be defined\\.$#"
count: 1
Expand Down Expand Up @@ -4795,11 +4715,6 @@ parameters:
count: 2
path: ../app/code/core/Mage/Log/Model/Resource/Log.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Log/Model/Resource/Visitor/Online.php

-
message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeCode\\(\\)\\.$#"
count: 4
Expand Down Expand Up @@ -4865,11 +4780,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Media/Model/Image.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Newsletter/Model/Resource/Queue.php

-
message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#"
count: 3
Expand Down Expand Up @@ -5510,11 +5420,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php

-
message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#"
count: 1
Expand Down Expand Up @@ -5565,11 +5470,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Rating/Model/Resource/Rating.php

-
message: "#^Variable \\$data in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
Expand All @@ -5585,11 +5485,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Rating/Model/Resource/Rating/Option.php

-
message: "#^Variable \\$dateStart might not be defined\\.$#"
count: 7
Expand Down Expand Up @@ -5720,11 +5615,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Review/Block/Product/View.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Review/Model/Resource/Review.php

-
message: "#^Comparison operation \"\\=\\=\" between array\\|null and 1 results in an error\\.$#"
count: 1
Expand Down Expand Up @@ -5855,11 +5745,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Rule/Model/Resource/Abstract.php

-
message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:formatDate\\(\\)\\.$#"
count: 2
Expand Down Expand Up @@ -6185,36 +6070,16 @@ parameters:
count: 4
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php

-
message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getInsertFromSelectUsingAnalytic\\(\\)\\.$#"
count: 4
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php

-
message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getInsertFromSelectUsingAnalytic\\(\\)\\.$#"
count: 4
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php

-
message: "#^Access to an undefined property Mage_Sales_Model_Resource_Sale_Collection\\:\\:\\$_orderStateValue\\.$#"
count: 2
Expand Down Expand Up @@ -6285,16 +6150,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule.php

-
message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getApplied\\(\\)\\.$#"
count: 1
Expand Down Expand Up @@ -6360,11 +6215,6 @@ parameters:
count: 3
path: ../app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 2
path: ../app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php

-
message: "#^Cannot call method checkAvailableShipCountries\\(\\) on Mage_Core_Model_Abstract\\|true\\.$#"
count: 1
Expand Down Expand Up @@ -6555,11 +6405,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Tax/Model/Resource/Calculation.php

-
message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
count: 1
path: ../app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php

-
message: "#^Variable \\$baseRowTax might not be defined\\.$#"
count: 3
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected function _toHtml()
}

/**
* Field dependences JSON map generator
* Field dependencies JSON map generator
* @return string
*/
protected function _getDependsJson()
Expand Down
2 changes: 1 addition & 1 deletion lib/Varien/Db/Adapter/Pdo/Mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public function commit()
*
* @return Varien_Db_Adapter_Pdo_Mysql
*/
public function rollback()
public function rollBack()
{
if ($this->_transactionLevel === 1) {
$this->_debugTimer();
Expand Down