From ded2d99e4a9619f17129785e62b79d6bec74277d Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 16 Jun 2019 19:10:07 +0200 Subject: [PATCH 1/5] (int) instead of intval() --- app/code/core/Mage/Admin/Model/Resource/User.php | 2 +- app/code/core/Mage/Admin/Model/User.php | 2 +- app/code/core/Mage/Adminhtml/Block/Api/Buttons.php | 2 +- app/code/core/Mage/Adminhtml/Block/Api/Editroles.php | 2 +- .../Catalog/Product/Attribute/Set/Main/Formgroup.php | 4 ++-- .../Product/Edit/Action/Attribute/Tab/Inventory.php | 2 +- .../core/Mage/Adminhtml/Block/Notification/Survey.php | 2 +- .../core/Mage/Adminhtml/Block/Permissions/Buttons.php | 2 +- .../Mage/Adminhtml/Block/Review/Rating/Detailed.php | 4 ++-- .../Block/System/Config/Form/Field/Datetime.php | 2 +- .../Block/System/Config/Form/Field/Notification.php | 2 +- .../Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php | 2 +- .../Mage/Adminhtml/Model/Customer/Renderer/Region.php | 2 +- .../Model/System/Config/Backend/Currency/Cron.php | 8 ++++---- .../Adminhtml/Model/System/Config/Backend/Log/Cron.php | 4 ++-- .../Model/System/Config/Backend/Product/Alert/Cron.php | 6 +++--- .../Model/System/Config/Backend/Sitemap/Cron.php | 4 ++-- .../Mage/Adminhtml/controllers/Api/RoleController.php | 2 +- .../controllers/Catalog/Product/ReviewController.php | 2 +- .../core/Mage/Adminhtml/controllers/PollController.php | 2 +- app/code/core/Mage/Api/Model/Resource/Role.php | 2 +- app/code/core/Mage/Api/Model/Resource/User.php | 2 +- app/code/core/Mage/Api/Model/User.php | 2 +- .../core/Mage/Backup/Model/Config/Backend/Cron.php | 4 ++-- .../Mage/Bundle/Block/Catalog/Product/List/Partof.php | 4 ++-- app/code/core/Mage/Bundle/Model/Product/Type.php | 4 ++-- .../core/Mage/Catalog/Block/Product/List/Upsell.php | 8 ++++---- .../core/Mage/Catalog/Block/Product/Widget/New.php | 2 +- app/code/core/Mage/Catalog/Helper/Product/Flat.php | 4 ++-- app/code/core/Mage/Catalog/Model/Category.php | 2 +- .../core/Mage/Catalog/Model/Product/Attribute/Api.php | 2 +- .../Catalog/Model/Product/Attribute/Tierprice/Api.php | 2 +- .../Model/Product/Attribute/Tierprice/Api/V2.php | 2 +- .../core/Mage/Catalog/Model/Product/Compare/Item.php | 4 ++-- app/code/core/Mage/Catalog/Model/Product/Image.php | 2 +- .../Mage/Catalog/Model/Product/Option/Type/Date.php | 10 +++++----- .../Mage/Catalog/Model/Product/Option/Type/File.php | 6 +++--- app/code/core/Mage/Catalog/Model/Product/Type.php | 2 +- app/code/core/Mage/Catalog/Model/Resource/Category.php | 2 +- .../core/Mage/Catalog/Model/Resource/Category/Flat.php | 2 +- app/code/core/Mage/CatalogInventory/Model/Observer.php | 4 ++-- .../core/Mage/CatalogInventory/Model/Stock/Item.php | 4 ++-- .../core/Mage/Core/Model/Resource/Helper/Mysql4.php | 4 ++-- app/code/core/Mage/Core/Model/Translate/Inline.php | 2 +- app/code/core/Mage/Customer/Model/Customer.php | 4 ++-- app/code/core/Mage/Directory/Block/Data.php | 2 +- .../Mage/Downloadable/Model/Link/Api/Validator.php | 8 ++++---- .../core/Mage/Eav/Model/Resource/Entity/Attribute.php | 2 +- .../Mage/ImportExport/Model/Export/Entity/Product.php | 2 +- app/code/core/Mage/Log/Helper/Data.php | 2 +- app/code/core/Mage/Log/Model/Visitor.php | 8 ++++---- app/code/core/Mage/Log/Model/Visitor/Online.php | 2 +- app/code/core/Mage/Page/Block/Html/Pager.php | 4 ++-- app/code/core/Mage/Page/Block/Template/Links.php | 4 ++-- app/code/core/Mage/Paypal/Model/Api/Abstract.php | 2 +- app/code/core/Mage/Paypal/Model/Express.php | 8 ++++---- app/code/core/Mage/Persistent/Helper/Data.php | 2 +- app/code/core/Mage/Persistent/Model/Session.php | 2 +- app/code/core/Mage/Poll/controllers/VoteController.php | 4 ++-- app/code/core/Mage/Rating/Block/Entity/Detailed.php | 2 +- .../sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- app/code/core/Mage/Rss/Block/Wishlist.php | 2 +- app/code/core/Mage/Rss/Helper/Order.php | 10 +++++----- app/code/core/Mage/Rss/controllers/IndexController.php | 2 +- app/code/core/Mage/Sales/Model/Quote.php | 2 +- app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php | 8 ++++---- .../Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php | 2 +- .../XmlConnect/Block/Checkout/Payment/Method/List.php | 8 ++++---- .../Block/Checkout/Payment/Method/ListApi23.php | 6 +++--- .../XmlConnect/controllers/Paypal/MepController.php | 2 +- 71 files changed, 122 insertions(+), 122 deletions(-) diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index 12798695197..b5477876812 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.php @@ -249,7 +249,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) $adapter->delete($this->getTable('admin/role'), $conditions); foreach ($rolesIds as $rid) { - $rid = intval($rid); + $rid = (int)$rid; if ($rid > 0) { $row = Mage::getModel('admin/role')->load($rid)->getData(); } else { diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 1efca303eec..d7230a5a7ab 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -154,7 +154,7 @@ protected function _beforeSave() $this->cleanPasswordsValidationData(); if (!is_null($this->getIsActive())) { - $data['is_active'] = intval($this->getIsActive()); + $data['is_active'] = (int)$this->getIsActive(); } $this->addData($data); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php index c5a53f54cef..c36eb03ce09 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php @@ -96,7 +96,7 @@ public function getSaveButtonHtml() public function getDeleteButtonHtml() { - if( intval($this->getRequest()->getParam('rid')) == 0 ) { + if( (int)$this->getRequest()->getParam('rid') == 0 ) { return; } return $this->getChildHtml('deleteButton'); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index 8fb58cfa558..9ceab1f5b7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -52,7 +52,7 @@ protected function _beforeToHtml() 'content' => $this->getLayout()->createBlock('adminhtml/api_tab_rolesedit')->toHtml(), )); - if( intval($roleId) > 0 ) { + if( (int)$roleId > 0 ) { $this->addTab('roles', array( 'label' => Mage::helper('adminhtml')->__('Role Users'), 'title' => Mage::helper('adminhtml')->__('Role Users'), diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index 9495ca9b6a1..d860f806c0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -79,8 +79,8 @@ protected function _prepareForm() protected function _getSetId() { - return ( intval($this->getRequest()->getParam('id')) > 0 ) - ? intval($this->getRequest()->getParam('id')) + return ( (int)$this->getRequest()->getParam('id') > 0 ) + ? (int)$this->getRequest()->getParam('id') : Mage::getModel('eav/entity_type') ->load(Mage::registry('entityType')) ->getDefaultAttributeSetId(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php index 08d2684345c..9a0dacc40bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php @@ -63,7 +63,7 @@ public function getFieldSuffix() public function getStoreId() { $storeId = $this->getRequest()->getParam('store'); - return intval($storeId); + return (int)$storeId; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php b/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php index 33950c8192c..21c837162fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Survey.php @@ -41,7 +41,7 @@ class Mage_Adminhtml_Block_Notification_Survey extends Mage_Adminhtml_Block_Temp public function canShow() { $adminSession = Mage::getSingleton('admin/session'); - $seconds = intval(date('s', time())); + $seconds = (int)date('s', time()); if ($adminSession->getHideSurveyQuestion() || !$adminSession->isAllowed('all') || Mage_AdminNotification_Model_Survey::isSurveyViewed() || !Mage_AdminNotification_Model_Survey::isSurveyUrlValid()) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php index c65d8735870..e8de65ffb0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php @@ -95,7 +95,7 @@ public function getSaveButtonHtml() public function getDeleteButtonHtml() { - if( intval($this->getRequest()->getParam('rid')) == 0 ) { + if( (int)$this->getRequest()->getParam('rid') == 0 ) { return; } return $this->getChildHtml('deleteButton'); diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index 769a33eb2d9..ea9fea399d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -87,10 +87,10 @@ public function getRating() ->setPositionOrder() ->load() ->addOptionToItems(); - if(intval($this->getRequest()->getParam('id'))){ + if((int)$this->getRequest()->getParam('id')){ $this->_voteCollection = Mage::getModel('rating/rating_option_vote') ->getResourceCollection() - ->setReviewFilter(intval($this->getRequest()->getParam('id'))) + ->setReviewFilter((int)$this->getRequest()->getParam('id')) ->addOptionInfo() ->load() ->addRatingOptions(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index 5446414d57b..79d1489a61f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -37,6 +37,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Field_Datetime extends Mage_Adminh protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); - return Mage::app()->getLocale()->date(intval($element->getValue()))->toString($format); + return Mage::app()->getLocale()->date((int)$element->getValue())->toString($format); } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php index 75824e4a938..a7a37af2329 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php @@ -38,6 +38,6 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $element->setValue(Mage::app()->loadCache('admin_notifications_lastcheck')); $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); - return Mage::app()->getLocale()->date(intval($element->getValue()))->toString($format); + return Mage::app()->getLocale()->date((int)$element->getValue())->toString($format); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php index 8dec231b480..96d8c4ea861 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php @@ -37,7 +37,7 @@ class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Data extends Mage_Adminhtml_Bl protected function _getValue (Varien_Object $row) { $data = parent::_getValue($row); - if (intval($data) == $data) { + if ((int)$data == $data) { return (string) number_format($data, 2); } if (!is_null($data)) { diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php index 38be09300d4..8119664d2a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php @@ -103,7 +103,7 @@ public function getSaveButtonHtml() public function getDeleteButtonHtml() { - if( intval($this->getRequest()->getParam('rate')) == 0 ) { + if( (int)$this->getRequest()->getParam('rate') == 0 ) { return; } return $this->getChildHtml('deleteButton'); diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php index 27a817cb4ce..e12ea2df365 100644 --- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php @@ -64,7 +64,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) $regionCollection = self::$_regionCollections[$countryId]; } - $regionId = intval($element->getForm()->getElement('region_id')->getValue()); + $regionId = (int)$element->getForm()->getElement('region_id')->getValue(); $htmlAttributes = $element->getHtmlAttributes(); foreach ($htmlAttributes as $key => $attribute) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php index 1b8398a9a43..cf90b5a6ed3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php @@ -51,11 +51,11 @@ protected function _afterSave() $cronDayOfWeek = date('N'); $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour - ($frequency == $frequencyMonthly) ? '1' : '*', # Day of the Month + (int)$time[1], # Minute + (int)$time[0], # Hour + ($frequency == $frequencyMonthly) ? '1' : '*', # Day of the Month '*', # Month of the Year - ($frequency == $frequencyWeekly) ? '1' : '*', # Day of the Week + ($frequency == $frequencyWeekly) ? '1' : '*', # Day of the Week ); $cronExprString = join(' ', $cronExprArray); diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php index 3bd057dfc8c..51c9ca779a8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php @@ -56,8 +56,8 @@ protected function _afterSave() if ($enabled) { $cronDayOfWeek = date('N'); $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour + (int)$time[1], # Minute + (int)$time[0], # Hour ($frequncy == $frequencyMonthly) ? '1' : '*', # Day of the Month '*', # Month of the Year ($frequncy == $frequencyWeekly) ? '1' : '*', # Day of the Week diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php index 3550de13c1a..3c38c44429d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php @@ -54,11 +54,11 @@ protected function _afterSave() $cronDayOfWeek = date('N'); $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour + (int)$time[1], # Minute + (int)$time[0], # Hour ($frequncy == $frequencyMonthly) ? '1' : '*', # Day of the Month '*', # Month of the Year - ($frequncy == $frequencyWeekly) ? '1' : '*', # Day of the Week + ($frequncy == $frequencyWeekly) ? '1' : '*', # Day of the Week ); $cronExprString = join(' ', $cronExprArray); diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php index 0c79d470f74..2d69ec5a38e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php @@ -52,8 +52,8 @@ protected function _afterSave() $cronDayOfWeek = date('N'); $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour + (int)$time[1], # Minute + (int)$time[0], # Hour ($frequncy == $frequencyMonthly) ? '1' : '*', # Day of the Month '*', # Month of the Year ($frequncy == $frequencyWeekly) ? '1' : '*', # Day of the Week diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index fbeaf44ed58..c757f50cdb1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -85,7 +85,7 @@ public function editRoleAction() $this->_initAction(); $roleId = $this->getRequest()->getParam('rid'); - if( intval($roleId) > 0 ) { + if( (int)$roleId > 0 ) { $breadCrumb = $this->__('Edit Role'); $breadCrumbTitle = $this->__('Edit Role'); $this->_title($this->__('Edit Role')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index 83320c4b32f..1d389666e9c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -291,7 +291,7 @@ public function jsonProductInfoAction() { $response = new Varien_Object(); $id = $this->getRequest()->getParam('id'); - if( intval($id) > 0 ) { + if( (int)$id > 0 ) { $product = Mage::getModel('catalog/product') ->load($id); diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index 2e727eb6f63..6acb98e59d6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -175,7 +175,7 @@ public function validateAction() $_titles[] = $answer['title']; $answerModel = Mage::getModel('poll/poll_answer'); - if( intval($key) > 0 ) { + if( (int)$key > 0 ) { $answerModel->setId($key); } $answerModel->setAnswerTitle($answer['title']) diff --git a/app/code/core/Mage/Api/Model/Resource/Role.php b/app/code/core/Mage/Api/Model/Resource/Role.php index 85f6ac997df..0856dd2ec06 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Role.php @@ -68,7 +68,7 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) */ public function load(Mage_Core_Model_Abstract $object, $value, $field = null) { - if (!intval($value) && is_string($value)) { + if (!(int)$value && is_string($value)) { $field = 'role_id'; } return parent::load($object, $value, $field); diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index 5592c37d106..d857042704c 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.php @@ -278,7 +278,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) $this->getTable('api/role'), array('user_id = ?' => (int) $user->getId())); foreach ($rolesIds as $rid) { - $rid = intval($rid); + $rid = (int)$rid; if ($rid > 0) { //$row = $this->load($user, $rid); } else { diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php index f06182f7b06..77fb3f86eff 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.php @@ -103,7 +103,7 @@ public function save() } if ( !is_null($this->getIsActive()) ) { - $data['is_active'] = intval($this->getIsActive()); + $data['is_active'] = (int)$this->getIsActive(); } $this->setData($data); diff --git a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php index 73cbbd8cb6a..c3007d0df67 100644 --- a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +++ b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php @@ -57,8 +57,8 @@ protected function _afterSave() if ($enabled) { $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour + (int)$time[1], # Minute + (int)$time[0], # Hour ($frequency == $frequencyMonthly) ? '1' : '*', # Day of the Month '*', # Month of the Year ($frequency == $frequencyWeekly) ? '1' : '*', # Day of the Week diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php index b82ae7f8f97..fcffcff34ce 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php @@ -91,8 +91,8 @@ public function getRowCount() public function setColumnCount($columns) { - if (intval($columns) > 0) { - $this->_columnCount = intval($columns); + if ((int)$columns > 0) { + $this->_columnCount = (int)$columns; } return $this; } diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index b6307dc55f8..be8ae61d861 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -446,7 +446,7 @@ public function updateQtyOption($options, Varien_Object $option, $value, $produc foreach ($options as &$option) { if ($option->getCode() == 'selection_qty_'.$selection->getSelectionId()) { if ($optionUpdateFlag) { - $option->setValue(intval($option->getValue())); + $option->setValue((int)$option->getValue()); } else { $option->setValue($value); @@ -468,7 +468,7 @@ public function updateQtyOption($options, Varien_Object $option, $value, $produc */ public function prepareQuoteItemQty($qty, $product = null) { - return intval($qty); + return (int)$qty; } /** diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index 2abd59b39da..02cadfb956a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -115,8 +115,8 @@ public function getRowCount() public function setColumnCount($columns) { - if (intval($columns) > 0) { - $this->_columnCount = intval($columns); + if ((int)$columns > 0) { + $this->_columnCount = (int)$columns; } return $this; } @@ -149,8 +149,8 @@ public function getIterableItem() */ public function setItemLimit($type, $limit) { - if (intval($limit) > 0) { - $this->_itemLimits[$type] = intval($limit); + if ((int)$limit > 0) { + $this->_itemLimits[$type] = (int)$limit; } return $this; } diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php index 3f06397ab84..1ecffa9a488 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php @@ -126,7 +126,7 @@ public function getCacheKeyInfo() return array_merge(parent::getCacheKeyInfo(), array( $this->getDisplayType(), $this->getProductsPerPage(), - intval($this->getRequest()->getParam(self::PAGE_VAR_NAME)) + (int)$this->getRequest()->getParam(self::PAGE_VAR_NAME) )); } diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php index 30bee87baee..f5fddb37efc 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php @@ -159,7 +159,7 @@ public function isBuiltAllStores() */ public function isAddFilterableAttributes() { - return intval(Mage::getConfig()->getNode(self::XML_NODE_ADD_FILTERABLE_ATTRIBUTES)); + return (int)Mage::getConfig()->getNode(self::XML_NODE_ADD_FILTERABLE_ATTRIBUTES); } /** @@ -169,7 +169,7 @@ public function isAddFilterableAttributes() */ public function isAddChildData() { - return intval(Mage::getConfig()->getNode(self::XML_NODE_ADD_CHILD_DATA)); + return (int)Mage::getConfig()->getNode(self::XML_NODE_ADD_CHILD_DATA); } /** diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 36a878de570..b751c9f9fda 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -538,7 +538,7 @@ public function getParentCategory() public function getParentId() { $parentIds = $this->getParentIds(); - return intval(array_pop($parentIds)); + return (int)array_pop($parentIds); } /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index a5a024f998f..fb16fd5f7c0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -511,7 +511,7 @@ protected function _getAttribute($attribute) ->setEntityTypeId($this->_entityTypeId); if (is_numeric($attribute)) { - $model->load(intval($attribute)); + $model->load((int)$attribute); } else { $model->load($attribute, 'attribute_code'); } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php index b61deca18c9..1a562955c70 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php @@ -141,7 +141,7 @@ public function prepareTierPrices($product, $tierPrices = null) } } - if (intval($tierPrice['website']) > 0 && !in_array($tierPrice['website'], $product->getWebsiteIds())) { + if ((int)$tierPrice['website'] > 0 && !in_array($tierPrice['website'], $product->getWebsiteIds())) { $this->_fault('data_invalid', Mage::helper('catalog')->__('Invalid tier prices. The product is not associated to the requested website.')); } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index 55bc427ff04..6d39392ec96 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php @@ -65,7 +65,7 @@ public function prepareTierPrices($product, $tierPrices = null) } } - if (intval($tierPrice->website) > 0 && !in_array($tierPrice->website, $product->getWebsiteIds())) { + if ((int)$tierPrice->website > 0 && !in_array($tierPrice->website, $product->getWebsiteIds())) { $this->_fault('data_invalid', Mage::helper('catalog')->__('Invalid tier prices. The product is not associated to the requested website.')); } diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index 67355321f84..fed92d15e87 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -159,8 +159,8 @@ public function addProductData($product) if ($product instanceof Mage_Catalog_Model_Product) { $this->setProductId($product->getId()); } - else if(intval($product)) { - $this->setProductId(intval($product)); + else if((int)$product) { + $this->setProductId((int)$product); } return $this; diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index 8bfcc9b6eed..e80237ca9c5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -406,7 +406,7 @@ public function resize() */ public function rotate($angle) { - $angle = intval($angle); + $angle = (int)$angle; $this->getImageProcessor()->rotate($angle); return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 3e027439c08..f83177e118b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -69,11 +69,11 @@ public function validateUserValue($values) $this->setUserValue( array( 'date' => isset($value['date']) ? $value['date'] : '', - 'year' => isset($value['year']) ? intval($value['year']) : 0, - 'month' => isset($value['month']) ? intval($value['month']) : 0, - 'day' => isset($value['day']) ? intval($value['day']) : 0, - 'hour' => isset($value['hour']) ? intval($value['hour']) : 0, - 'minute' => isset($value['minute']) ? intval($value['minute']) : 0, + 'year' => isset($value['year']) ? (int)$value['year'] : 0, + 'month' => isset($value['month']) ? (int)$value['month'] : 0, + 'day' => isset($value['day']) ? (int)$value['day'] : 0, + 'hour' => isset($value['hour']) ? (int)$value['hour'] : 0, + 'minute' => isset($value['minute']) ? (int)$value['minute'] : 0, 'day_part' => isset($value['day_part']) ? $value['day_part'] : '', 'date_internal' => isset($value['date_internal']) ? $value['date_internal'] : '', ) diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index d6efea09ccc..43f88025043 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -795,13 +795,13 @@ protected function _getBytesIniValue($ini_key) // kilobytes if (stristr($_bytes, 'k')) { - $_bytes = intval($_bytes) * 1024; + $_bytes = (int)$_bytes * 1024; // megabytes } elseif (stristr($_bytes, 'm')) { - $_bytes = intval($_bytes) * 1024 * 1024; + $_bytes = (int)$_bytes * 1024 * 1024; // gigabytes } elseif (stristr($_bytes, 'g')) { - $_bytes = intval($_bytes) * 1024 * 1024 * 1024; + $_bytes = (int)$_bytes * 1024 * 1024 * 1024; } return (int)$_bytes; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php index 56f96c8e198..f0c7ded6cbd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.php @@ -214,7 +214,7 @@ public static function getTypesByPriority() $types = self::getTypes(); foreach ($types as $typeId => $typeInfo) { - $priority = isset($typeInfo['index_priority']) ? abs(intval($typeInfo['index_priority'])) : 0; + $priority = isset($typeInfo['index_priority']) ? abs((int)$typeInfo['index_priority']) : 0; if (!empty($typeInfo['composite'])) { $b[$typeId] = $priority; } else { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php index 9cf57b18575..34ffe0b5a2c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php @@ -552,7 +552,7 @@ public function getProductCount($category) $bind = array('category_id' => (int)$category->getId()); $counts = $this->getReadConnection()->fetchOne($select, $bind); - return intval($counts); + return (int)$counts; } /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index a29d21b44f4..35ce352f88a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -189,7 +189,7 @@ public function getMainTable() public function getMainStoreTable($storeId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) { if (is_string($storeId)) { - $storeId = intval($storeId); + $storeId = (int)$storeId; } if ($this->getUseStoreTables() && $storeId) { $suffix = sprintf('store_%d', $storeId); diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index 3326200648f..e0e3a542128 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -75,7 +75,7 @@ public function addInventoryData($observer) { $product = $observer->getEvent()->getProduct(); if ($product instanceof Mage_Catalog_Model_Product) { - $productId = intval($product->getId()); + $productId = (int)$product->getId(); if (!isset($this->_stockItemsArray[$productId])) { $this->_stockItemsArray[$productId] = Mage::getModel('cataloginventory/stock_item'); } @@ -423,7 +423,7 @@ public function checkQuoteItemQty($observer) /** * if option's qty was updates we also need to update quote item qty */ - $quoteItem->setData('qty', intval($qty)); + $quoteItem->setData('qty', (int)$qty); } if (!is_null($result->getMessage())) { $option->setMessage($result->getMessage()); diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php index 23011f706eb..c2e366fe9f4 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php @@ -553,7 +553,7 @@ public function checkQuoteItemQty($qty, $summaryQty, $origQty = 0) if (!$this->getIsQtyDecimal()) { $result->setHasQtyOptionUpdate(true); - $qty = intval($qty); + $qty = (int)$qty; /** * Adding stock data to quote item @@ -563,7 +563,7 @@ public function checkQuoteItemQty($qty, $summaryQty, $origQty = 0) if (!is_numeric($qty)) { $qty = Mage::app()->getLocale()->getNumber($qty); } - $origQty = intval($origQty); + $origQty = (int)$origQty; $result->setOrigQty($origQty); } diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php index 4630bb2bcd6..983150cf03d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php @@ -234,12 +234,12 @@ protected function _prepareHaving(Varien_Db_Select $select, $autoReset = false) protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList = array()) { if ($limitCount !== null) { - $limitCount = intval($limitCount); + $limitCount = (int)$limitCount; if ($limitCount <= 0) { // throw new Exception("LIMIT argument count={$limitCount} is not valid"); } - $limitOffset = intval($limitOffset); + $limitOffset = (int)$limitOffset; if ($limitOffset < 0) { // throw new Exception("LIMIT argument offset={$limitOffset} is not valid"); } diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index 599700004e6..9fd3e676b05 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -590,7 +590,7 @@ public function getIsAjaxRequest() */ public function setIsAjaxRequest($flag) { - Mage::app()->getRequest()->setQuery('isAjax', intval((bool)$flag)); + Mage::app()->getRequest()->setQuery('isAjax', (int)(bool)$flag); return $this; } diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index ea1cd1b16bf..aeca9392e13 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -1032,7 +1032,7 @@ public function importFromTextArray(array $row) $regions->addRegionNameFilter($row['billing_region'])->load(); if ($regions) foreach($regions as $region) { - $regionId = intval($region->getId()); + $regionId = (int)$region->getId(); } $billingAddress->setFirstname($row['firstname']); @@ -1074,7 +1074,7 @@ public function importFromTextArray(array $row) $regions->addRegionNameFilter($row['shipping_region'])->load(); if ($regions) foreach($regions as $region) { - $regionId = intval($region->getId()); + $regionId = (int)$region->getId(); } $shippingAddress->setFirstname($row['firstname']); diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php index ab22c2bd72f..6c8a864a972 100644 --- a/app/code/core/Mage/Directory/Block/Data.php +++ b/app/code/core/Mage/Directory/Block/Data.php @@ -109,7 +109,7 @@ public function getRegionHtmlSelect() ->setTitle(Mage::helper('directory')->__('State/Province')) ->setId('state') ->setClass('required-entry validate-state') - ->setValue(intval($this->getRegionId())) + ->setValue((int)$this->getRegionId()) ->setOptions($options) ->getHtml(); Varien_Profiler::start('TEST: '.__METHOD__); diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index ef448788e70..8c065196f45 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php @@ -213,7 +213,7 @@ public function validatePrice(&$var) */ public function validateNumOfDownloads(&$var) { - $var = is_numeric($var)? intval($var) : 0; + $var = is_numeric($var)? (int)$var : 0; } /** @@ -223,7 +223,7 @@ public function validateNumOfDownloads(&$var) */ public function validateUnlimited(&$var) { - $var = ((is_numeric($var) && $var >= 0 && $var <= 1) || (is_bool($var)))? intval($var) : 0; + $var = ((is_numeric($var) && $var >= 0 && $var <= 1) || (is_bool($var)))? (int)$var : 0; } /** @@ -233,7 +233,7 @@ public function validateUnlimited(&$var) */ public function validateShareable(&$var) { - $var = (is_numeric($var) && $var >= 0 && $var <= 2)? intval($var) : 2; + $var = (is_numeric($var) && $var >= 0 && $var <= 2)? (int)$var : 2; } /** @@ -271,7 +271,7 @@ public function validateUrl(&$var) */ public function validateOrder(&$var) { - $var = is_numeric($var)? intval($var) : 0; + $var = is_numeric($var)? (int)$var : 0; } /** diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php index e1a49bbc47d..f088ee96b73 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -119,7 +119,7 @@ public function loadByCode(Mage_Core_Model_Abstract $object, $entityTypeId, $cod */ private function _getMaxSortOrder(Mage_Core_Model_Abstract $object) { - if (intval($object->getAttributeGroupId()) > 0) { + if ((int)$object->getAttributeGroupId() > 0) { $adapter = $this->_getReadAdapter(); $bind = array( ':attribute_set_id' => $object->getAttributeSetId(), diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index 907cebd60b1..2b783116460 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -615,7 +615,7 @@ protected function _prepareExport() // Minimum Products limit $minProductsLimit = 500; - $limitProducts = intval(($memoryLimit * $memoryUsagePercent - memory_get_usage(true)) / $memoryPerProduct); + $limitProducts = (int)($memoryLimit * $memoryUsagePercent - memory_get_usage(true) / $memoryPerProduct); if ($limitProducts < $minProductsLimit) { $limitProducts = $minProductsLimit; } diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php index 560a046f456..d747070316c 100644 --- a/app/code/core/Mage/Log/Helper/Data.php +++ b/app/code/core/Mage/Log/Helper/Data.php @@ -44,7 +44,7 @@ class Mage_Log_Helper_Data extends Mage_Core_Helper_Abstract public function __construct(array $data = array()) { $this->_logLevel = isset($data['log_level']) ? $data['log_level'] - : intval(Mage::getStoreConfig(self::XML_PATH_LOG_ENABLED)); + : (int)Mage::getStoreConfig(self::XML_PATH_LOG_ENABLED); } /** diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index c3be27894d8..3af87bb7170 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.php @@ -141,8 +141,8 @@ public function initServerData() public static function getOnlineMinutesInterval() { $configValue = Mage::getStoreConfig('customer/online_customers/online_minutes_interval'); - return intval($configValue) > 0 - ? intval($configValue) + return (int)$configValue > 0 + ? (int)$configValue : self::DEFAULT_ONLINE_MINUTES_INTERVAL; } @@ -307,7 +307,7 @@ public function addIpData($data) public function addCustomerData($data) { $customerId = $data->getCustomerId(); - if( intval($customerId) <= 0 ) { + if( (int)$customerId <= 0 ) { return $this; } $customerData = Mage::getModel('customer/customer')->load($customerId); @@ -323,7 +323,7 @@ public function addCustomerData($data) public function addQuoteData($data) { $quoteId = $data->getQuoteId(); - if( intval($quoteId) <= 0 ) { + if( (int)$quoteId <= 0 ) { return $this; } $data->setQuoteData(Mage::getModel('sales/quote')->load($quoteId)); diff --git a/app/code/core/Mage/Log/Model/Visitor/Online.php b/app/code/core/Mage/Log/Model/Visitor/Online.php index 691edda39fc..784ecd1a246 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Visitor/Online.php @@ -124,7 +124,7 @@ public function getUpdateFrequency() */ public function getOnlineInterval() { - $value = intval(Mage::getStoreConfig(self::XML_PATH_ONLINE_INTERVAL)); + $value = (int)Mage::getStoreConfig(self::XML_PATH_ONLINE_INTERVAL); if (!$value) { $value = Mage_Log_Model_Visitor::DEFAULT_ONLINE_MINUTES_INTERVAL; } diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php index a63cc03b01b..5d06dbf0ec6 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -432,7 +432,7 @@ public function getJump() */ public function setFrameLength($frame) { - $frame = abs(intval($frame)); + $frame = abs((int)$frame); if ($frame == 0) { $frame = $this->_frameLength; } @@ -452,7 +452,7 @@ public function setFrameLength($frame) */ public function setJump($jump) { - $jump = abs(intval($jump)); + $jump = abs((int)$jump); if ($this->getJump() != $jump) { $this->_setFrameInitialized(false); $this->_jump = $jump; diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php index 6bf2291035d..df49295841d 100644 --- a/app/code/core/Mage/Page/Block/Template/Links.php +++ b/app/code/core/Mage/Page/Block/Template/Links.php @@ -114,7 +114,7 @@ protected function _addIntoPosition($link, $position) { $this->_links[$this->_getNewPosition($position)] = $link; - if (intval($position) > 0) { + if ((int)$position > 0) { ksort($this->_links); } @@ -240,7 +240,7 @@ protected function _beforeToHtml() */ protected function _getNewPosition($position = 0) { - if (intval($position) > 0) { + if ((int)$position > 0) { while (isset($this->_links[$position])) { $position++; } diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php index 3b84e93e6c1..a5e8bc5d8ac 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php +++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php @@ -567,7 +567,7 @@ protected function _buildQuery($request) */ protected function _filterQty($value) { - return intval($value); + return (int)$value; } /** diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 92b86d87cf0..fe64f01fd8e 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -303,8 +303,8 @@ public function void(Varien_Object $payment) public function capture(Varien_Object $payment, $amount) { $authorizationTransaction = $payment->getAuthorizationTransaction(); - $authorizationPeriod = abs(intval($this->getConfigData('authorization_honor_period'))); - $maxAuthorizationNumber = abs(intval($this->getConfigData('child_authorization_number'))); + $authorizationPeriod = abs((int)$this->getConfigData('authorization_honor_period')); + $maxAuthorizationNumber = abs((int)$this->getConfigData('child_authorization_number')); $order = $payment->getOrder(); $isAuthorizationCreated = false; @@ -651,7 +651,7 @@ public function canCapture() return false; } - $orderValidPeriod = abs(intval($this->getConfigData('order_valid_period'))); + $orderValidPeriod = abs((int)$this->getConfigData('order_valid_period')); $dateCompass = new DateTime($orderTransaction->getCreatedAt()); $dateCompass->modify('+' . $orderValidPeriod . ' days'); @@ -705,7 +705,7 @@ protected function _callDoAuthorize($amount, $payment, $parentTransactionId) */ protected function _isTransactionExpired(Mage_Sales_Model_Order_Payment_Transaction $transaction, $period) { - $period = intval($period); + $period = (int)$period; if (0 == $period) { return true; } diff --git a/app/code/core/Mage/Persistent/Helper/Data.php b/app/code/core/Mage/Persistent/Helper/Data.php index cb148579aae..887f57fbdd8 100644 --- a/app/code/core/Mage/Persistent/Helper/Data.php +++ b/app/code/core/Mage/Persistent/Helper/Data.php @@ -103,7 +103,7 @@ public function isShoppingCartPersist($store = null) */ public function getLifeTime($store = null) { - $lifeTime = intval(Mage::getStoreConfig(self::XML_PATH_LIFE_TIME, $store)); + $lifeTime = (int)Mage::getStoreConfig(self::XML_PATH_LIFE_TIME, $store); return ($lifeTime < 0) ? 0 : $lifeTime; } diff --git a/app/code/core/Mage/Persistent/Model/Session.php b/app/code/core/Mage/Persistent/Model/Session.php index 8aca9a599b8..c831df916ab 100644 --- a/app/code/core/Mage/Persistent/Model/Session.php +++ b/app/code/core/Mage/Persistent/Model/Session.php @@ -210,7 +210,7 @@ public function deleteExpired($websiteId = null) $lifetime = Mage::getConfig()->getNode( Mage_Persistent_Helper_Data::XML_PATH_LIFE_TIME, 'website', - intval($websiteId) + (int)$websiteId ); if ($lifetime) { diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index 026f2e1e986..e15f221f5f9 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.php @@ -47,8 +47,8 @@ class Mage_Poll_VoteController extends Mage_Core_Controller_Front_Action */ public function addAction() { - $pollId = intval($this->getRequest()->getParam('poll_id')); - $answerId = intval($this->getRequest()->getParam('vote')); + $pollId = (int)$this->getRequest()->getParam('poll_id'); + $answerId = (int)$this->getRequest()->getParam('vote'); /** @var $poll Mage_Poll_Model_Poll */ $poll = Mage::getModel('poll/poll')->load($pollId); diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php index 6a6e955ac34..505233e397b 100644 --- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php +++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php @@ -42,7 +42,7 @@ public function __construct() protected function _toHtml() { $entityId = Mage::app()->getRequest()->getParam('id'); - if (intval($entityId) <= 0) { + if ((int)$entityId <= 0) { return ''; } diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php index 3e21afa0161..cfb1eaa6832 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -42,7 +42,7 @@ $resource = Mage::getResourceSingleton('review/review'); // count quantity and aggregate packs per 100 items $total = $this->getConnection()->select()->from($this->getTable('review'), 'count(*)'); - $total = intval($this->getConnection()->fetchOne($total)); + $total = (int)$this->getConnection()->fetchOne($total); for ($i = 0; $i < $total; $i += 100) { $select = $this->getConnection()->select() ->from($this->getTable('review'), array('review_id', 'entity_pk_value')) diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php index a1fc56ff015..314da16709e 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.php @@ -83,7 +83,7 @@ protected function _getCustomer() $params = Mage::helper('core')->urlDecode($this->getRequest()->getParam('data')); $data = explode(',', $params); - $cId = abs(intval($data[0])); + $cId = abs((int)$data[0]); if ($cId && ($cId == Mage::getSingleton('customer/session')->getCustomerId()) ) { $this->_customer->load($cId); } diff --git a/app/code/core/Mage/Rss/Helper/Order.php b/app/code/core/Mage/Rss/Helper/Order.php index e1283ee02c7..2fddf322e51 100644 --- a/app/code/core/Mage/Rss/Helper/Order.php +++ b/app/code/core/Mage/Rss/Helper/Order.php @@ -89,16 +89,16 @@ public function getOrderByStatusUrlKey($key) return null; } - $orderId = intval($data['order_id']); - $incrementId = intval($data['increment_id']); - $customerId = intval($data['customer_id']); + $orderId = (int)$data['order_id']; + $incrementId = (int)$data['increment_id']; + $customerId = (int)$data['customer_id']; /** @var $order Mage_Sales_Model_Order */ $order = Mage::getModel('sales/order')->load($orderId); if (!is_null($order->getId()) - && intval($order->getIncrementId()) === $incrementId - && intval($order->getCustomerId()) === $customerId + && (int)$order->getIncrementId() === $incrementId + && (int)$order->getCustomerId() === $customerId ) { return $order; } diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index 1628f7469f4..34375e73213 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -146,7 +146,7 @@ protected function _getCustomer() $params = $this->_getHelper('core')->urlDecode($this->getRequest()->getParam('data')); $data = explode(',', $params); - $customerId = abs(intval($data[0])); + $customerId = abs((int)$data[0]); if ($customerId && ($customerId == Mage::getSingleton('customer/session')->getCustomerId()) ) { $this->_customer->load($customerId); } diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index 1f0134d9163..7ca5b6b24d6 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -1716,7 +1716,7 @@ public function isVirtual() */ public function getIsVirtual() { - return intval($this->isVirtual()); + return (int)$this->isVirtual(); } /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index 851f3fc045c..901028611ec 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -847,8 +847,8 @@ protected function _parseXmlObject($shipXml) is_object($shipXml->Faults) && is_object($shipXml->Faults->Fault) && is_object($shipXml->Faults->Fault->Desc) - && intval($shipXml->Faults->Fault->Code) != self::SUCCESS_CODE - && intval($shipXml->Faults->Fault->Code) != self::SUCCESS_LABEL_CODE + && (int)$shipXml->Faults->Fault->Code != self::SUCCESS_CODE + && (int)$shipXml->Faults->Fault->Code != self::SUCCESS_LABEL_CODE ) { $code = (string)$shipXml->Faults->Fault->Code; $description = $shipXml->Faults->Fault->Desc; @@ -857,8 +857,8 @@ protected function _parseXmlObject($shipXml) is_object($shipXml->Faults) && is_object($shipXml->Result->Code) && is_object($shipXml->Result->Desc) - && intval($shipXml->Result->Code) != self::SUCCESS_CODE - && intval($shipXml->Result->Code) != self::SUCCESS_LABEL_CODE + && (int)$shipXml->Result->Code != self::SUCCESS_CODE + && (int)$shipXml->Result->Code != self::SUCCESS_LABEL_CODE ) { $code = (string)$shipXml->Result->Code; $description = $shipXml->Result->Desc; diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php index 5eac2439ff4..8ca0d0ee506 100644 --- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php +++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php @@ -58,7 +58,7 @@ protected function _toHtml() $renderer = $this->_getTotalRenderer($code)->setTotal($total); switch ($code) { case 'subtotal': - $subtotal = intval($total->getValueExclTax()) ? $total->getValueExclTax() : $total->getValue(); + $subtotal = (int)$total->getValueExclTax() ? $total->getValueExclTax() : $total->getValue(); $paypalTotals->addAttribute($code, Mage::helper('xmlconnect')->formatPriceForXml($subtotal)); break; case 'tax': diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php index 11cb66b6f9b..43f94e5f3cf 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php @@ -90,7 +90,7 @@ public function addGiftcardToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $met 'enterprise_giftcardaccount/checkout_onepage_payment_additional', 'giftcard_info' ); - if (intval($giftcardInfoBlock->getAppliedGiftCardAmount())) { + if ((int)$giftcardInfoBlock->getAppliedGiftCardAmount()) { $amount = $this->getQuote()->getStore()->formatPrice($giftcardInfoBlock->getAppliedGiftCardAmount(), false); $amount = $this->__('Gift Card amount applied to order: %s', $amount); @@ -108,7 +108,7 @@ public function addGiftcardToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $met protected function _isPaymentRequired() { $this->getQuote()->collectTotals(); - return !intval($this->getQuote()->getGrandTotal()) && !$this->getQuote()->hasNominalItems(); + return !(int)$this->getQuote()->getGrandTotal() && !$this->getQuote()->hasNominalItems(); } /** @@ -229,8 +229,8 @@ public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Eleme 'post_name' => 'payment[use_customer_balance]', 'code' => 1, 'label' => $this->__('Use Store Credit (%s available)', $balance), - 'is_cover_a_quote' => intval($customerBalanceBlock->isFullyPaidAfterApplication()), - 'selected' => intval($customerBalanceBlock->isCustomerBalanceUsed()) + 'is_cover_a_quote' => (int)$customerBalanceBlock->isFullyPaidAfterApplication(), + 'selected' => (int)($customerBalanceBlock->isCustomerBalanceUsed() )); } } diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php index af4aeedb42f..441ed02b0d0 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php @@ -69,7 +69,7 @@ public function addGiftCardToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $met 'enterprise_giftcardaccount/checkout_onepage_payment_additional', 'giftcard_info' ); - if (intval($giftCardInfoBlock->getAppliedGiftCardAmount())) { + if ((int)$giftCardInfoBlock->getAppliedGiftCardAmount()) { $amount = $this->getQuote()->getStore()->formatPrice($giftCardInfoBlock->getAppliedGiftCardAmount(), false); $amount = $this->__('Gift Card amount applied to order: %s', $amount); $methodsXmlObj->addCustomChild('information', null, array('label' => $amount)); @@ -98,8 +98,8 @@ public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Eleme 'post_name' => 'payment[use_customer_balance]', 'code' => 1, 'label' => $this->__('Use Store Credit (%s available)', $balance), - 'is_cover_a_quote' => intval($customerBalanceBlock->isFullyPaidAfterApplication()), - 'selected' => intval($customerBalanceBlock->isCustomerBalanceUsed()) + 'is_cover_a_quote' => (int)$customerBalanceBlock->isFullyPaidAfterApplication(), + 'selected' => (int)$customerBalanceBlock->isCustomerBalanceUsed() )); } } diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php index 067c0c296ad..7102bf2965c 100644 --- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php +++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php @@ -79,7 +79,7 @@ public function indexAction() 'enterprise_giftcardaccount/checkout_onepage_payment_additional', 'giftcard_info' ); - if (intval($giftcardInfoBlock->getAppliedGiftCardAmount())) { + if ((int)$giftcardInfoBlock->getAppliedGiftCardAmount()) { $this->_message( $this->__('Paypal MEP doesn\'t support checkout with any discount.'), self::MESSAGE_STATUS_ERROR From 0a810462dad5f72868f8708683a8ab708294d0ad Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 16 Jun 2019 19:21:59 +0200 Subject: [PATCH 2/5] (string) instead of strval() --- .../Config/Backend/Currency/Abstract.php | 4 +- .../Authorizenet/Model/Directpost/Request.php | 50 +++++++++---------- .../core/Mage/Catalog/Helper/Product/Url.php | 2 +- .../Paypal/controllers/PayflowController.php | 2 +- .../controllers/PayflowadvancedController.php | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php index e8c4bd631ea..93306131fed 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php @@ -73,7 +73,7 @@ protected function _getCurrencyBase() $this->getScopeId() ); } - return strval($value); + return (string)$value; } /** @@ -90,6 +90,6 @@ protected function _getCurrencyDefault() $this->getScopeId() ); } - return strval($value); + return (string)$value; } } diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php index 0849e1f9655..4f80ac8be43 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php @@ -134,37 +134,37 @@ public function setDataFromOrder(Mage_Sales_Model_Order $order, Mage_Authorizene //need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript, but we need "" for null values. $billing = $order->getBillingAddress(); if (!empty($billing)) { - $this->setXFirstName(strval($billing->getFirstname())) - ->setXLastName(strval($billing->getLastname())) - ->setXCompany(strval($billing->getCompany())) - ->setXAddress(strval($billing->getStreet(1))) - ->setXCity(strval($billing->getCity())) - ->setXState(strval($billing->getRegion())) - ->setXZip(strval($billing->getPostcode())) - ->setXCountry(strval($billing->getCountry())) - ->setXPhone(strval($billing->getTelephone())) - ->setXFax(strval($billing->getFax())) - ->setXCustId(strval($billing->getCustomerId())) - ->setXCustomerIp(strval($order->getRemoteIp())) - ->setXCustomerTaxId(strval($billing->getTaxId())) - ->setXEmail(strval($order->getCustomerEmail())) - ->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer'))) - ->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email'))); + $this->setXFirstName((string)$billing->getFirstname()) + ->setXLastName((string)$billing->getLastname()) + ->setXCompany((string)$billing->getCompany()) + ->setXAddress((string)$billing->getStreet(1)) + ->setXCity((string)$billing->getCity()) + ->setXState((string)$billing->getRegion()) + ->setXZip((string)$billing->getPostcode()) + ->setXCountry((string)$billing->getCountry()) + ->setXPhone((string)$billing->getTelephone()) + ->setXFax((string)$billing->getFax()) + ->setXCustId((string)$billing->getCustomerId()) + ->setXCustomerIp((string)$order->getRemoteIp()) + ->setXCustomerTaxId((string)$billing->getTaxId()) + ->setXEmail((string)$order->getCustomerEmail()) + ->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer')) + ->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email')); } $shipping = $order->getShippingAddress(); if (!empty($shipping)) { - $this->setXShipToFirstName(strval($shipping->getFirstname())) - ->setXShipToLastName(strval($shipping->getLastname())) - ->setXShipToCompany(strval($shipping->getCompany())) - ->setXShipToAddress(strval($shipping->getStreet(1))) - ->setXShipToCity(strval($shipping->getCity())) - ->setXShipToState(strval($shipping->getRegion())) - ->setXShipToZip(strval($shipping->getPostcode())) - ->setXShipToCountry(strval($shipping->getCountry())); + $this->setXShipToFirstName((string)$shipping->getFirstname()) + ->setXShipToLastName((string)$shipping->getLastname()) + ->setXShipToCompany((string)$shipping->getCompany()) + ->setXShipToAddress((string)$shipping->getStreet(1)) + ->setXShipToCity((string)$shipping->getCity()) + ->setXShipToState((string)$shipping->getRegion()) + ->setXShipToZip((string)$shipping->getPostcode()) + ->setXShipToCountry((string)$shipping->getCountry()); } - $this->setXPoNum(strval($payment->getPoNumber())); + $this->setXPoNum((string)$payment->getPoNumber()); return $this; } diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index 6d7e9f51c13..b7bc8d8e468 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -103,7 +103,7 @@ public function __construct() $convertNode = Mage::getConfig()->getNode('default/url/convert'); if ($convertNode) { foreach ($convertNode->children() as $node) { - $this->_convertTable[strval($node->from)] = strval($node->to); + $this->_convertTable[(string)$node->from] = (string)$node->to; } } } diff --git a/app/code/core/Mage/Paypal/controllers/PayflowController.php b/app/code/core/Mage/Paypal/controllers/PayflowController.php index 6137dcb710d..14cb989538f 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowController.php @@ -69,7 +69,7 @@ public function returnUrlAction() $gotoSection = $this->_cancelPayment( Mage::helper('core') ->stripTags( - strval($this->getRequest()->getParam('RESPMSG')) + (string)$this->getRequest()->getParam('RESPMSG') ) ); $redirectBlock->setGotoSection($gotoSection); diff --git a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php index ecf07162f86..1a5ffb00d0d 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php @@ -95,7 +95,7 @@ public function returnUrlAction() $gotoSection = $this->_cancelPayment( Mage::helper('core') ->stripTags( - strval($this->getRequest()->getParam('RESPMSG')) + (string)$this->getRequest()->getParam('RESPMSG') ) ); $redirectBlock->setGotoSection($gotoSection); From 2d050aaba794e7b32ca38243f144ee246e33b59a Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 16 Jun 2019 19:29:49 +0200 Subject: [PATCH 3/5] (float) instead of floatval() --- .../Block/Report/Grid/Column/Renderer/Currency.php | 2 +- app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php | 2 +- .../Block/Widget/Grid/Column/Renderer/Currency.php | 6 +++--- .../Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php | 6 +++--- app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php | 2 +- app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php | 2 +- .../core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php | 2 +- app/code/core/Mage/Core/Model/Locale.php | 4 ++-- .../core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php | 2 +- .../core/Mage/Downloadable/Model/Link/Api/Validator.php | 2 +- app/code/core/Mage/GoogleBase/Model/Service/Item.php | 2 +- app/code/core/Mage/Sales/Model/Order.php | 2 +- app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index 523155383d9..53d05fc4412 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -50,7 +50,7 @@ public function render(Varien_Object $row) return $data; } - $data = floatval($data) * $this->_getRate($row); + $data = (float)$data * $this->_getRate($row); $data = sprintf("%F", $data); $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); return $data; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index bcaa77dd706..b03ae58e2c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -359,7 +359,7 @@ public function displayPriceInclTax(Varien_Object $item) $basePriceTax = 0; $priceTax = 0; - if (floatval($qty)) { + if ((float)$qty) { $basePriceTax = $item->getBasePrice()+$baseTax/$qty; $priceTax = $item->getPrice()+$tax/$qty; } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php index 32303a553de..dcbba0df21b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php @@ -57,7 +57,7 @@ public function render(Varien_Object $row) return $data; } - $data = floatval($data) * $this->_getRate($row); + $data = (float)$data * $this->_getRate($row); $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && ($data > 0) ? '+' : ''; $data = sprintf("%F", $data); $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); @@ -92,10 +92,10 @@ protected function _getCurrencyCode($row) protected function _getRate($row) { if ($rate = $this->getColumn()->getRate()) { - return floatval($rate); + return (float)$rate; } if ($rate = $row->getData($this->getColumn()->getRateField())) { - return floatval($rate); + return (float)$rate; } return 1; } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php index fe5eb941ee4..57cc5029ec0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php @@ -55,7 +55,7 @@ public function render(Varien_Object $row) return $data; } - $data = floatval($data) * $this->_getRate($row); + $data = (float)$data * $this->_getRate($row); $data = sprintf("%F", $data); $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); return $data; @@ -89,10 +89,10 @@ protected function _getCurrencyCode($row) protected function _getRate($row) { if ($rate = $this->getColumn()->getRate()) { - return floatval($rate); + return (float)$rate; } if ($rate = $row->getData($this->getColumn()->getRateField())) { - return floatval($rate); + return (float)$rate; } return 1; } diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php index 2b7c08beec6..4305a83e0f7 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php @@ -44,7 +44,7 @@ public function isRatesGraterThenZero() $_request->setProductClassId($this->getProduct()->getTaxClassId()); $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request); - return (floatval($defaultTax) > 0 || floatval($currentTax) > 0); + return ((float)$defaultTax > 0 || (float)$currentTax > 0); } /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index 70088c125ba..08548e235e5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -870,7 +870,7 @@ public function getForceChildItemQtyChanges($product = null) */ public function prepareQuoteItemQty($qty, $product = null) { - return floatval($qty); + return (float)$qty; } /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php index 461054afd0e..7348a10d830 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php @@ -265,7 +265,7 @@ public function getCount($filter, $range) /** * Check and set correct variable values to prevent SQL-injections */ - $range = floatval($range); + $range = (float)$range; if ($range == 0) { $range = 1; } diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php index c6578c00576..ab8065b97e1 100644 --- a/app/code/core/Mage/Core/Model/Locale.php +++ b/app/code/core/Mage/Core/Model/Locale.php @@ -654,7 +654,7 @@ public function getNumber($value) } if (!is_string($value)) { - return floatval($value); + return (float)$value; } //trim spaces and apostrophes @@ -676,7 +676,7 @@ public function getNumber($value) $value = str_replace(',', '.', $value); } - return floatval($value); + return (float)$value; } /** diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php index fe3537ca275..3a270af0455 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php @@ -85,6 +85,6 @@ public function getNumber($value) $number = str_replace($separator, '.', $number); } - return floatval($number); + return (float)$number; } } diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index 8c065196f45..bfef483723c 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php @@ -203,7 +203,7 @@ public function validateTitle(&$var) */ public function validatePrice(&$var) { - $var = is_numeric($var)? floatval($var) : floatval(0); + $var = is_numeric($var)? (float)$var : (float)0; } /** diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Item.php b/app/code/core/Mage/GoogleBase/Model/Service/Item.php index 7da73f1abec..d387ac95c56 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Service/Item.php @@ -307,7 +307,7 @@ protected function _setUniversalData() } $entry->setContent($service->newContent()->setText($this->_cleanAtomAttribute($descrText))); - if (isset($attributeValues['price']['value']) && floatval($attributeValues['price']['value']) > 0) { + if (isset($attributeValues['price']['value']) && (float)$attributeValues['price']['value'] > 0) { $price = $attributeValues['price']['value']; } else { $price = $object->getPrice(); diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index 9fa789d2d82..543908d2bbc 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -2185,7 +2185,7 @@ protected function _checkState() * Order can be closed just in case when we have refunded amount. * In case of "0" grand total order checking ForcedCanCreditmemo flag */ - elseif (floatval($this->getTotalRefunded()) || (!$this->getTotalRefunded() + elseif ((float)$this->getTotalRefunded() || (!$this->getTotalRefunded() && $this->hasForcedCanCreditmemo()) ) { if ($this->getState() !== self::STATE_CLOSED) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index 3a4c410c6e5..2ee9b783fd9 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php @@ -1025,7 +1025,7 @@ protected function _parseXmlResponse($xmlResponse) if ($successConversion) { $costArr[$code] = $cost; - $priceArr[$code] = $this->getMethodPrice(floatval($cost),$code); + $priceArr[$code] = $this->getMethodPrice((float)$cost,$code); } } } From 1e4141b82fd1415a0a38cddcc22f6f79311256b9 Mon Sep 17 00:00:00 2001 From: sreichel Date: Wed, 21 Aug 2019 18:43:55 +0200 Subject: [PATCH 4/5] Fixes opening parenthesis --- .../core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php index 43f94e5f3cf..a935b6d516a 100644 --- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php +++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php @@ -230,7 +230,7 @@ public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Eleme 'code' => 1, 'label' => $this->__('Use Store Credit (%s available)', $balance), 'is_cover_a_quote' => (int)$customerBalanceBlock->isFullyPaidAfterApplication(), - 'selected' => (int)($customerBalanceBlock->isCustomerBalanceUsed() + 'selected' => (int)$customerBalanceBlock->isCustomerBalanceUsed() )); } } From 3cf300481d90a7ca2c2938d06917aa5beeae2486 Mon Sep 17 00:00:00 2001 From: Sven Date: Fri, 12 Jun 2020 01:31:48 +0200 Subject: [PATCH 5/5] Fixed missing parenthesis --- app/code/core/Mage/Catalog/Model/Product/Compare/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index e6955df0ac0..d58959b5c5c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -162,7 +162,7 @@ public function addProductData($product) { if ($product instanceof Mage_Catalog_Model_Product) { $this->setProductId($product->getId()); - elseif ((int)$product) { + } elseif ((int)$product) { $this->setProductId(intval($product)); }