Skip to content

Commit e85eb18

Browse files
committed
fix
1 parent 5ceaaeb commit e85eb18

File tree

3 files changed

+31
-13
lines changed

3 files changed

+31
-13
lines changed

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function __construct()
8181

8282
/**
8383
* @return $this
84+
* @throws Mage_Core_Exception
8485
*/
8586
protected function _initObjects()
8687
{
@@ -97,6 +98,8 @@ protected function _initObjects()
9798

9899
/**
99100
* @return $this
101+
* @throws Exception
102+
* @throws Mage_Core_Exception
100103
*/
101104
public function initForm()
102105
{
@@ -114,7 +117,7 @@ public function initForm()
114117
}
115118

116119
foreach ($sections as $section) {
117-
/** @var Varien_Simplexml_Element $section */
120+
/** @var Mage_Core_Model_Config_Element $section */
118121
if (!$this->_canShowField($section)) {
119122
continue;
120123
}
@@ -124,7 +127,7 @@ public function initForm()
124127
usort($groups, [$this, '_sortForm']);
125128

126129
foreach ($groups as $group) {
127-
/** @var Varien_Simplexml_Element $group */
130+
/** @var Mage_Core_Model_Config_Element $group */
128131
if (!$this->_canShowField($group)) {
129132
continue;
130133
}
@@ -142,9 +145,11 @@ public function initForm()
142145
* Init config group
143146
*
144147
* @param Varien_Data_Form $form
145-
* @param Varien_Simplexml_Element $group
146-
* @param Varien_Simplexml_Element $section
148+
* @param Mage_Core_Model_Config_Element $group
149+
* @param Mage_Core_Model_Config_Element $section
147150
* @param null|Varien_Data_Form_Element_Fieldset $parentElement
151+
* @throws Exception
152+
* @throws Mage_Core_Exception
148153
*/
149154
protected function _initGroup($form, $group, $section, $parentElement = null)
150155
{
@@ -220,12 +225,13 @@ protected function _getDependence()
220225
* Init fieldset fields
221226
*
222227
* @param Varien_Data_Form_Element_Fieldset $fieldset
223-
* @param Varien_Simplexml_Element $group
224-
* @param Varien_Simplexml_Element $section
228+
* @param Mage_Core_Model_Config_Element $group
229+
* @param Mage_Core_Model_Config_Element $section
225230
* @param string $fieldPrefix
226231
* @param string $labelPrefix
227-
* @throw Mage_Core_Exception
228232
* @return $this
233+
* @throws Exception
234+
* @throws Mage_Core_Exception
229235
*/
230236
public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labelPrefix = '')
231237
{
@@ -576,8 +582,9 @@ protected function _sortForm($a, $b)
576582
}
577583

578584
/**
579-
* @param Varien_Simplexml_Element $field
585+
* @param Mage_Core_Model_Config_Element $field
580586
* @return bool
587+
* @throws Exception
581588
*/
582589
public function canUseDefaultValue($field)
583590
{
@@ -593,8 +600,9 @@ public function canUseDefaultValue($field)
593600
}
594601

595602
/**
596-
* @param Varien_Simplexml_Element $field
603+
* @param Mage_Core_Model_Config_Element $field
597604
* @return bool
605+
* @throws Exception
598606
*/
599607
public function canUseWebsiteValue($field)
600608
{
@@ -608,8 +616,9 @@ public function canUseWebsiteValue($field)
608616
/**
609617
* Checking field visibility
610618
*
611-
* @param Varien_Simplexml_Element $field
619+
* @param Mage_Core_Model_Config_Element $field
612620
* @return bool
621+
* @throws Exception
613622
*/
614623
protected function _canShowField($field)
615624
{
@@ -635,6 +644,7 @@ protected function _canShowField($field)
635644
* Retrieve current scope
636645
*
637646
* @return string
647+
* @throws Exception
638648
*/
639649
public function getScope()
640650
{
@@ -656,6 +666,8 @@ public function getScope()
656666

657667
/**
658668
* Returns true if element was overwritten by ENV variable
669+
*
670+
* @throws Exception
659671
*/
660672
public function isOverwrittenByEnvVariable(string $path): bool
661673
{
@@ -701,6 +713,7 @@ public function getScopeLabel($element)
701713
* Get current scope code
702714
*
703715
* @return string
716+
* @throws Exception
704717
*/
705718
public function getScopeCode()
706719
{
@@ -724,6 +737,8 @@ public function getScopeCode()
724737
* Get current scope code
725738
*
726739
* @return int|string
740+
* @throws Exception
741+
* @throws Mage_Core_Exception
727742
*/
728743
public function getScopeId()
729744
{
@@ -766,6 +781,7 @@ protected function _getAdditionalElementTypes()
766781
/**
767782
* @TODO delete this methods when {^see above^} is done
768783
* @return string
784+
* @throws Exception
769785
*/
770786
public function getSectionCode()
771787
{
@@ -775,6 +791,7 @@ public function getSectionCode()
775791
/**
776792
* @TODO delete this methods when {^see above^} is done
777793
* @return string
794+
* @throws Exception
778795
*/
779796
public function getWebsiteCode()
780797
{
@@ -784,6 +801,7 @@ public function getWebsiteCode()
784801
/**
785802
* @TODO delete this methods when {^see above^} is done
786803
* @return string
804+
* @throws Exception
787805
*/
788806
public function getStoreCode()
789807
{

app/code/core/Mage/Usa/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeas
3737
/**
3838
* Convert dimensions in different measure types
3939
*
40-
* @param int|float|string $value
40+
* @param float|int|string $value
4141
* @param string $sourceDimensionMeasure
4242
* @param string $toDimensionMeasure
4343
* @return null|int|string

app/design/frontend/base/default/template/sales/order/trackinginfo.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88

99
/**
10-
* @see Mage_Adminhtml_Block_Sales_Order_Shipment_Tracking_Info
11-
* @var Mage_Adminhtml_Block_Sales_Order_Shipment_Tracking_Info $this
10+
* @see Mage_Core_Block_Template
11+
* @var Mage_Core_Block_Template $this
1212
*/
1313
?>
1414
<span class="field-row grid" id="shipment_tracking_info">

0 commit comments

Comments
 (0)