Skip to content

Commit 59e0e9c

Browse files
authored
Merge branch 'main' into validation
2 parents c4fdeaf + a39f7b9 commit 59e0e9c

File tree

54 files changed

+605
-731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+605
-731
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,6 +1716,15 @@
17161716
"contributions": [
17171717
"code"
17181718
]
1719+
},
1720+
{
1721+
"login": "vernad",
1722+
"name": "vernad",
1723+
"avatar_url": "https://avatars.githubusercontent.com/u/51973447?v=4",
1724+
"profile": "https://github.com/vernad",
1725+
"contributions": [
1726+
"code"
1727+
]
17191728
}
17201729
],
17211730
"commitType": "docs"

.phpstan.dist.baseline.neon

Lines changed: 6 additions & 384 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
277277
<td align="center" valign="top" width="14.28%"><a href="http://www.denisahac.xyz"><img src="https://avatars.githubusercontent.com/u/6700576?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Den Isahac</b></sub></a></td>
278278
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lc-excell"><img src="https://avatars.githubusercontent.com/u/158118232?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>lc-excell</b></sub></a></td>
279279
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/warley-elias-531a4116/"><img src="https://avatars.githubusercontent.com/u/5356619?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Warley Elias</b></sub></a></td>
280+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vernard"><img src="https://avatars.githubusercontent.com/u/6733673?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>vernard</b></sub></a></td>
280281
</tr>
281282
</tbody>
282283
</table>

app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ public function formatPrice($price)
487487
/**
488488
* Retrieve source
489489
*
490-
* @return Mage_Sales_Model_Order_Invoice
490+
* @return Mage_Sales_Model_Abstract
491491
*/
492492
public function getSource()
493493
{

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ protected function _getCollectionClass()
3333

3434
protected function _prepareCollection()
3535
{
36-
$collection = Mage::getResourceModel($this->_getCollectionClass())
36+
/** @var Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection $collection */
37+
$collection = Mage::getResourceModel($this->_getCollectionClass());
38+
$collection
3739
->addFieldToSelect('entity_id')
3840
->addFieldToSelect('created_at')
3941
->addFieldToSelect('increment_id')

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ protected function _getCollectionClass()
3333

3434
protected function _prepareCollection()
3535
{
36-
$collection = Mage::getResourceModel($this->_getCollectionClass())
36+
/** @var Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection $collection */
37+
$collection = Mage::getResourceModel($this->_getCollectionClass());
38+
$collection
3739
->addFieldToSelect('entity_id')
3840
->addFieldToSelect('created_at')
3941
->addFieldToSelect('order_id')

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ protected function _getCollectionClass()
3333

3434
protected function _prepareCollection()
3535
{
36-
$collection = Mage::getResourceModel($this->_getCollectionClass())
36+
/** @var Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection $collection */
37+
$collection = Mage::getResourceModel($this->_getCollectionClass());
38+
$collection
3739
->addFieldToSelect('entity_id')
3840
->addFieldToSelect('created_at')
3941
->addFieldToSelect('increment_id')

app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _prepareLayout()
3131

3232
foreach ($currencies as $currency) {
3333
foreach ($oldCurrencies as $key => $value) {
34-
if (!array_key_exists($currency, $oldCurrencies[$key])) {
34+
if (!array_key_exists($currency, $value)) {
3535
$oldCurrencies[$key][$currency] = '';
3636
}
3737
}
@@ -66,7 +66,7 @@ protected function _prepareRates($array)
6666
foreach ($rate as $code => $value) {
6767
$parts = explode('.', (string) $value);
6868
if (count($parts) === 2) {
69-
$parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
69+
$parts[1] = str_pad(rtrim($parts[1], '0'), 4, '0', STR_PAD_RIGHT);
7070
$array[$key][$code] = implode('.', $parts);
7171
} elseif ($value > 0) {
7272
$array[$key][$code] = number_format($value, 4);

app/code/core/Mage/Adminhtml/Block/Widget/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ public function getMessageBlockVisibility()
967967
}
968968

969969
/**
970-
* @param int $limit
970+
* @param null|int $limit
971971
* @return $this
972972
*/
973973
public function setDefaultLimit($limit)

app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function _initInvoice($update = false)
8282
protected function _saveInvoice($invoice)
8383
{
8484
$invoice->getOrder()->setIsInProcess(true);
85-
$transactionSave = Mage::getModel('core/resource_transaction')
85+
Mage::getModel('core/resource_transaction')
8686
->addObject($invoice)
8787
->addObject($invoice->getOrder())
8888
->save();

0 commit comments

Comments
 (0)