Skip to content

Commit ba7a004

Browse files
committed
MAGETWO-66480: [GITHUB] URL key for specified store already exists #6671
- changed bad naming
1 parent f6bb4c6 commit ba7a004

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ class ExceptionMessageFactoryPool
1515
*/
1616
private $exceptionMessageFactoryMap = [];
1717

18+
19+
/**
20+
* Key of instance is the exception format parameter
21+
*
22+
* @var ExceptionMessageFactoryInterface
23+
*/
24+
private $defaultExceptionMessageFactory = [];
25+
1826
/**
1927
* @param ExceptionMessageFactoryInterface $defaultExceptionMessageFactory
2028
* @param ExceptionMessageFactoryInterface[] $exceptionMessageFactoryMap
@@ -23,7 +31,7 @@ public function __construct(
2331
ExceptionMessageFactoryInterface $defaultExceptionMessageFactory,
2432
array $exceptionMessageFactoryMap = []
2533
) {
26-
$this->defaultConfiguration = $defaultExceptionMessageFactory;
34+
$this->defaultExceptionMessageFactory = $defaultExceptionMessageFactory;
2735
$this->exceptionMessageFactoryMap = $exceptionMessageFactoryMap;
2836
}
2937

@@ -38,6 +46,6 @@ public function getMessageFactory(\Exception $exception)
3846
if (isset($this->exceptionMessageFactoryMap[get_class($exception)])) {
3947
return $this->exceptionMessageFactoryMap[get_class($exception)];
4048
}
41-
return $this->defaultConfiguration;
49+
return $this->defaultExceptionMessageFactory;
4250
}
4351
}

lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class ExceptionMessageFactoryPoolTest extends \PHPUnit_Framework_TestCase
1717
private $defaultExceptionMessageFactoryMock;
1818

1919
/**
20-
* @var \Magento\Framework\Message\ExceptionMessageFactoryPool
20+
* @var \Magento\Framework\Message\ExceptionMessageFactoryInterface
2121
*/
22-
private $specificExceptionMessageFactoryPoolMock;
22+
private $specificExceptionMessageFactoryMock;
2323

2424
/**
2525
* @var ExceptionMessageFactoryInterface[] | \PHPUnit_Framework_MockObject_MockObject
@@ -33,11 +33,11 @@ class ExceptionMessageFactoryPoolTest extends \PHPUnit_Framework_TestCase
3333

3434
protected function setUp()
3535
{
36-
$this->specificExceptionMessageFactoryPoolMock = $this->getMock(ExceptionMessageFactoryInterface::class);
36+
$this->specificExceptionMessageFactoryMock = $this->getMock(ExceptionMessageFactoryInterface::class);
3737
$this->defaultExceptionMessageFactoryMock = $this->getMock(ExceptionMessageFactoryInterface::class);
3838

3939
$this->exceptionMessageFactoryMapMock = [
40-
\Magento\Framework\Exception\LocalizedException::class => $this->specificExceptionMessageFactoryPoolMock
40+
\Magento\Framework\Exception\LocalizedException::class => $this->specificExceptionMessageFactoryMock
4141
];
4242
$this->exceptionMessageFactoryPool = new \Magento\Framework\Message\ExceptionMessageFactoryPool(
4343
$this->defaultExceptionMessageFactoryMock,
@@ -58,7 +58,7 @@ public function testSuccessfulSpecificCreateMessage()
5858
{
5959
$localizedException = new LocalizedException(__('message'));
6060
$this->assertEquals(
61-
$this->specificExceptionMessageFactoryPoolMock,
61+
$this->specificExceptionMessageFactoryMock,
6262
$this->exceptionMessageFactoryPool->getMessageFactory($localizedException)
6363
);
6464
}

lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function setUp()
4646
);
4747
}
4848

49-
public function test()
49+
public function testCreateMessage()
5050
{
5151
$exceptionMessage = 'exception message';
5252
$exception = new \Exception($exceptionMessage);

0 commit comments

Comments
 (0)