Skip to content

PHP 8.4 compatibility #26

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

Open
peterjaap wants to merge 2 commits into
base: 2.4
Choose a base branch
from
Open

PHP 8.4 compatibility #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ebf119
Add PHP 8.4 compatibility
peterjaap May 9, 2025
43e76ba
Remove useless version tag from composer.json
peterjaap May 9, 2025
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
2 changes: 1 addition & 1 deletion Console/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function __construct(
OrderRepository $orderRepository,
state $state,
Registry $registry,
$name = null
?$name = null
) {
$this->_helperData = $helperData;
$this->orderRepository = $orderRepository;
Expand Down
18 changes: 9 additions & 9 deletions Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function __construct(
*
* @return Collection
*/
public function getMatchingOrders($storeId = null, $limit = 1000)
public function getMatchingOrders(?$storeId = null, $limit = 1000)
{
$orderCollection = $this->orderCollectionFactory->create()
->addFieldToFilter('status', ['in' => $this->getOrderStatusConfig($storeId)])
Expand Down Expand Up @@ -156,7 +156,7 @@ public function setDate($days)
*
* @return mixed
*/
public function getOrderStatusConfig($storeId = null)
public function getOrderStatusConfig(?$storeId = null)
{
return explode(',', $this->getScheduleConfig('order_status', $storeId));
}
Expand All @@ -166,7 +166,7 @@ public function getOrderStatusConfig($storeId = null)
*
* @return mixed
*/
public function getOrderCustomerGroupConfig($storeId = null)
public function getOrderCustomerGroupConfig(?$storeId = null)
{
return explode(',', (string)$this->getScheduleConfig('customer_groups', $storeId));
}
Expand All @@ -176,7 +176,7 @@ public function getOrderCustomerGroupConfig($storeId = null)
*
* @return array
*/
public function getStoreViewConfig($storeId = null)
public function getStoreViewConfig(?$storeId = null)
{
return explode(',', $this->getScheduleConfig('store_views', $storeId));
}
Expand All @@ -186,7 +186,7 @@ public function getStoreViewConfig($storeId = null)
*
* @return mixed
*/
public function getShippingCountryType($storeId = null)
public function getShippingCountryType(?$storeId = null)
{
return $this->getScheduleConfig('country', $storeId);
}
Expand All @@ -196,7 +196,7 @@ public function getShippingCountryType($storeId = null)
*
* @return array
*/
public function getCountriesConfig($storeId = null)
public function getCountriesConfig(?$storeId = null)
{
return explode(',', $this->getScheduleConfig('specific_country', $storeId));
}
Expand All @@ -206,7 +206,7 @@ public function getCountriesConfig($storeId = null)
*
* @return mixed
*/
public function getOrderTotalConfig($storeId = null)
public function getOrderTotalConfig(?$storeId = null)
{
return $this->getScheduleConfig('order_under', $storeId);
}
Expand All @@ -216,7 +216,7 @@ public function getOrderTotalConfig($storeId = null)
*
* @return mixed
*/
public function getPeriodConfig($storeId = null)
public function getPeriodConfig(?$storeId = null)
{
return $this->getScheduleConfig('day_before', $storeId);
}
Expand All @@ -227,7 +227,7 @@ public function getPeriodConfig($storeId = null)
*
* @return mixed
*/
public function getScheduleConfig($code, $storeId = null)
public function getScheduleConfig($code, ?$storeId = null)
{
return $this->getModuleConfig('schedule/' . $code, $storeId);
}
Expand Down
12 changes: 6 additions & 6 deletions Helper/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function __construct(
*
* @return $this
*/
public function sendEmailTemplate($templateParams = [], $storeId = null)
public function sendEmailTemplate($templateParams = [], ?$storeId = null)
{
try {
$toEmails = $this->getToEmail($storeId);
Expand Down Expand Up @@ -108,7 +108,7 @@ public function sendEmailTemplate($templateParams = [], $storeId = null)
*
* @return mixed
*/
public function getConfigEmail($code = '', $storeId = null)
public function getConfigEmail($code = '', ?$storeId = null)
{
$code = ($code !== '') ? '/' . $code : '';

Expand All @@ -120,7 +120,7 @@ public function getConfigEmail($code = '', $storeId = null)
*
* @return bool
*/
public function isEnabledEmail($storeId = null)
public function isEnabledEmail(?$storeId = null)
{
if ($this->_helperData->isEnabled()) {
return (bool) $this->getConfigEmail('enabled', $storeId);
Expand All @@ -134,7 +134,7 @@ public function isEnabledEmail($storeId = null)
*
* @return string
*/
public function getSender($storeId = null)
public function getSender(?$storeId = null)
{
return $this->getConfigEmail('sender', $storeId);
}
Expand All @@ -144,7 +144,7 @@ public function getSender($storeId = null)
*
* @return string
*/
public function getTemplate($storeId = null)
public function getTemplate(?$storeId = null)
{
return $this->getConfigEmail('template', $storeId);
}
Expand All @@ -154,7 +154,7 @@ public function getTemplate($storeId = null)
*
* @return array
*/
public function getToEmail($storeId = null)
public function getToEmail(?$storeId = null)
{
return explode(',', $this->getConfigEmail('to', $storeId));
}
Expand Down
4 changes: 2 additions & 2 deletions Model/Config/Backend/Order/Frequency.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public function __construct(
TypeListInterface $cacheTypeList,
ValueFactory $configValueFactory,
ManagerInterface $messageManager,
AbstractResource $resource = null,
AbstractDb $resourceCollection = null,
?AbstractResource $resource = null,
?AbstractDb $resourceCollection = null,
$runModelPath = '',
array $data = []
) {
Expand Down
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"mageplaza/module-core": "^1.5.3"
},
"type": "magento2-module",
"version": "4.0.2",
"license": "proprietary",
"authors": [
{
Expand Down