Skip to content

Commit 704f20d

Browse files
AC-8119: Fedex Shipping Method Configuration Fix
1 parent b53691f commit 704f20d

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

app/code/Magento/Fedex/Model/Config/Backend/FedexUrl.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
use Magento\Framework\App\Config\Value;
1414
use Magento\Framework\Data\Collection\AbstractDb;
1515
use Magento\Framework\Exception\ValidatorException;
16+
use Magento\Framework\Model\AbstractModel;
1617
use Magento\Framework\Model\Context;
1718
use Magento\Framework\Model\ResourceModel\AbstractResource;
1819
use Magento\Framework\Registry;
1920
use Magento\Framework\Validator\Url;
20-
use Magento\Framework\Model\AbstractModel;
2121

2222
/**
2323
* Represents a config URL that may point to a Fedex endpoint
@@ -49,12 +49,14 @@ public function __construct(
4949
Url $url,
5050
array $data = []
5151
) {
52-
$this->url = $url;
5352
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
53+
$this->url = $url;
5454
}
5555

5656
/**
57-
* @inheritdoc
57+
* @inheritDoc
58+
*
59+
* @return AbstractModel
5860
* @throws ValidatorException
5961
*/
6062
public function beforeSave(): AbstractModel

app/code/Magento/Fedex/Test/Unit/Model/Config/Backend/FedexUrlTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
namespace Magento\Fedex\Test\Unit\Model\Config\Backend;
1010

11-
use Magento\Fedex\Model\Config\Backend\FedexUrl;
1211
use Magento\Framework\Exception\ValidatorException;
1312
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
13+
use Magento\Fedex\Model\Config\Backend\FedexUrl;
1414
use PHPUnit\Framework\TestCase;
1515

1616
/**
@@ -24,6 +24,9 @@ class FedexUrlTest extends TestCase
2424
*/
2525
private $config;
2626

27+
/**
28+
* @return void
29+
*/
2730
protected function setUp(): void
2831
{
2932
$objectManager = new ObjectManager($this);

0 commit comments

Comments
 (0)