Skip to content

Commit c6e0f78

Browse files
committedJan 19, 2025
AC-13738::Adobe Commerce 2.4.8-beta2 core code is compatible with PHP 8.4
1 parent 45b51c9 commit c6e0f78

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed
 

‎app/code/Magento/Directory/Model/Config/Backend/WeightUnit.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2024 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -45,8 +45,8 @@ public function __construct(
4545
Registry $registry,
4646
ScopeConfigInterface $config,
4747
TypeListInterface $cacheTypeList,
48-
AbstractResource $resource = null,
49-
AbstractDb $resourceCollection = null,
48+
?AbstractResource $resource = null,
49+
?AbstractDb $resourceCollection = null,
5050
array $data = []
5151
) {
5252
$this->source = $source;

‎app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -60,7 +60,7 @@ public function __construct(
6060
private readonly Usage $couponUsage,
6161
private readonly CouponRepositoryInterface $couponRepository,
6262
private readonly SearchCriteriaBuilder $criteriaBuilder,
63-
LockManagerInterface $lockManager = null
63+
?LockManagerInterface $lockManager = null
6464
) {
6565
$this->lockManager = $lockManager ?? ObjectManager::getInstance()->get(LockManagerInterface::class);
6666
}

‎pub/errors/processor.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -22,11 +22,11 @@
2222
*/
2323
class Processor
2424
{
25-
const MAGE_ERRORS_LOCAL_XML = 'local.xml';
26-
const MAGE_ERRORS_DESIGN_XML = 'design.xml';
27-
const DEFAULT_SKIN = 'default';
28-
const ERROR_DIR = 'pub/errors';
29-
const NUMBER_SYMBOLS_IN_SUBDIR_NAME = 2;
25+
public const MAGE_ERRORS_LOCAL_XML = 'local.xml';
26+
public const MAGE_ERRORS_DESIGN_XML = 'design.xml';
27+
public const DEFAULT_SKIN = 'default';
28+
public const ERROR_DIR = 'pub/errors';
29+
public const NUMBER_SYMBOLS_IN_SUBDIR_NAME = 2;
3030

3131
/**
3232
* Page title
@@ -178,9 +178,9 @@ class Processor
178178
*/
179179
public function __construct(
180180
Http $response,
181-
Json $serializer = null,
182-
Escaper $escaper = null,
183-
DocumentRoot $documentRoot = null
181+
?Json $serializer = null,
182+
?Escaper $escaper = null,
183+
?DocumentRoot $documentRoot = null
184184
) {
185185
$this->_response = $response;
186186
$this->_errorDir = __DIR__ . '/';
@@ -739,7 +739,7 @@ protected function _validate()
739739
* @param \stdClass $config
740740
* @return void
741741
*/
742-
protected function _setSkin($value, \stdClass $config = null)
742+
protected function _setSkin($value, ?\stdClass $config = null)
743743
{
744744
if (preg_match('/^[a-z0-9_]+$/i', $value) && is_dir($this->_errorDir . $value)) {
745745
if (!$config) {

0 commit comments

Comments
 (0)
Please sign in to comment.