Skip to content

Commit d0e2534

Browse files
committed
MAGETWO-66480: [GITHUB] URL key for specified store already exists #6671
- pool name refactoring
1 parent 505c98c commit d0e2534

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function testExecute()
2929
$helper->getConstructArguments(\Magento\Backend\Model\Session::class)
3030
);
3131

32-
$exceptionMessagePool = $this->getMockBuilder(
33-
\Magento\Framework\Message\ExceptionMessagePool::class
32+
$exceptionMessageFactoryPool = $this->getMockBuilder(
33+
\Magento\Framework\Message\ExceptionMessageFactoryPool::class
3434
)
3535
->disableOriginalConstructor()
3636
->setMethods(
@@ -40,7 +40,7 @@ public function testExecute()
4040

4141
$messageManagerParams = $helper->getConstructArguments(\Magento\Framework\Message\Manager::class);
4242

43-
$messageManagerParams['exceptionMessagePool'] = $exceptionMessagePool;
43+
$messageManagerParams['exceptionMessageFactoryPool'] = $exceptionMessageFactoryPool;
4444

4545
$messageManager = $this->getMock(
4646
\Magento\Framework\Message\Manager::class,

app/code/Magento/UrlRewrite/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9-
<type name="Magento\Framework\Message\ExceptionMessagePool">
9+
<type name="Magento\Framework\Message\ExceptionMessageFactoryPool">
1010
<arguments>
1111
<argument name="exceptionMessageFactoryMap" xsi:type="array">
1212
<item name="Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException" xsi:type="object">\Magento\UrlRewrite\Model\Message\UrlRewriteExceptionMessageFactory</item>

app/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@
13261326
<argument name="logCallStack" xsi:type="init_parameter">Magento\Framework\Config\ConfigOptionsListConstants::CONFIG_PATH_DB_LOGGER_INCLUDE_STACKTRACE</argument>
13271327
</arguments>
13281328
</type>
1329-
<type name="Magento\Framework\Message\ExceptionMessagePool">
1329+
<type name="Magento\Framework\Message\ExceptionMessageFactoryPool">
13301330
<arguments>
13311331
<argument name="defaultExceptionMessageFactory" xsi:type="object">\Magento\Framework\Message\DefaultExceptionMessageFactory</argument>
13321332
</arguments>

lib/internal/Magento/Framework/Message/ExceptionMessagePool.php renamed to lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\Framework\Message;
88

9-
class ExceptionMessagePool
9+
class ExceptionMessageFactoryPool
1010
{
1111
/**
1212
* Key of instance is the exception format parameter
@@ -28,7 +28,7 @@ public function __construct(
2828
}
2929

3030
/**
31-
* Gets instance of a message exception message
31+
* Gets instance of a exception message factory
3232
*
3333
* @param \Exception $exception
3434
* @return ExceptionMessageFactoryInterface|null

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class Manager implements ManagerInterface
5656
protected $hasMessages = false;
5757

5858
/**
59-
* @var ExceptionMessagePool
59+
* @var ExceptionMessageFactoryPool
6060
*/
61-
private $exceptionMessagePool;
61+
private $exceptionMessageFactoryPool;
6262

6363
/**
6464
* @param Session $session
@@ -67,7 +67,7 @@ class Manager implements ManagerInterface
6767
* @param Event\ManagerInterface $eventManager
6868
* @param LoggerInterface $logger
6969
* @param string $defaultGroup
70-
* @param ExceptionMessagePool|null $exceptionMessagePool
70+
* @param ExceptionMessageFactoryPool|null $exceptionMessageFactoryPool
7171
*/
7272
public function __construct(
7373
Session $session,
@@ -76,16 +76,16 @@ public function __construct(
7676
Event\ManagerInterface $eventManager,
7777
LoggerInterface $logger,
7878
$defaultGroup = self::DEFAULT_GROUP,
79-
$exceptionMessagePool = null
79+
$exceptionMessageFactoryPool = null
8080
) {
8181
$this->session = $session;
8282
$this->messageFactory = $messageFactory;
8383
$this->messagesFactory = $messagesFactory;
8484
$this->eventManager = $eventManager;
8585
$this->logger = $logger;
8686
$this->defaultGroup = $defaultGroup;
87-
$this->exceptionMessagePool = $exceptionMessagePool ?: ObjectManager::getInstance()
88-
->get(ExceptionMessagePool::class);
87+
$this->exceptionMessageFactoryPool = $exceptionMessageFactoryPool ?: ObjectManager::getInstance()
88+
->get(ExceptionMessageFactoryPool::class);
8989
}
9090

9191
/**
@@ -256,7 +256,7 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
256256
if ($alternativeText) {
257257
$this->addError($alternativeText, $group);
258258
} else {
259-
$messageGenerator = $this->exceptionMessagePool->getMessageGenerator($exception);
259+
$messageGenerator = $this->exceptionMessageFactoryPool->getMessageGenerator($exception);
260260
$this->addMessage($messageGenerator->createMessage($exception), $group);
261261
}
262262

@@ -295,7 +295,7 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
295295
if ($alternativeText) {
296296
$this->addErrorMessage($alternativeText, $group);
297297
} else {
298-
$messageGenerator = $this->exceptionMessagePool->getMessageGenerator($exception);
298+
$messageGenerator = $this->exceptionMessageFactoryPool->getMessageGenerator($exception);
299299
$this->addMessage($messageGenerator->createMessage($exception), $group);
300300
}
301301

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\Framework\Message\MessageInterface;
1313
use Magento\Framework\Message\Session;
1414
use Psr\Log\LoggerInterface;
15-
use Magento\Framework\Message\ExceptionMessagePool;
15+
use Magento\Framework\Message\ExceptionMessageFactoryPool;
1616

1717
/**
1818
* \Magento\Framework\Message\Manager test case
@@ -62,9 +62,9 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
6262
private $logger;
6363

6464
/**
65-
* @var ExceptionMessagePool | \PHPUnit_Framework_MockObject_MockObject
65+
* @var ExceptionMessageFactoryPool | \PHPUnit_Framework_MockObject_MockObject
6666
*/
67-
private $exceptionMessagePool;
67+
private $exceptionMessageFactoryPool;
6868

6969
protected function setUp()
7070
{
@@ -89,8 +89,8 @@ protected function setUp()
8989
$this->eventManager = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
9090
$this->logger = $this->getMock(\Psr\Log\LoggerInterface::class);
9191

92-
$this->exceptionMessagePool = $this->getMockBuilder(
93-
\Magento\Framework\Message\ExceptionMessagePool::class
92+
$this->exceptionMessageFactoryPool = $this->getMockBuilder(
93+
\Magento\Framework\Message\ExceptionMessageFactoryPool::class
9494
)
9595
->disableOriginalConstructor()
9696
->setMethods(
@@ -107,7 +107,7 @@ protected function setUp()
107107
$this->eventManager,
108108
$this->logger,
109109
Manager::DEFAULT_GROUP,
110-
$this->exceptionMessagePool
110+
$this->exceptionMessageFactoryPool
111111
);
112112
}
113113

@@ -255,7 +255,7 @@ public function testAddExceptionRenderable()
255255
\Magento\Framework\Message\ExceptionMessageFactoryInterface::class
256256
);
257257

258-
$this->exceptionMessagePool->expects(
258+
$this->exceptionMessageFactoryPool->expects(
259259
$this->once()
260260
)->method(
261261
'getMessageGenerator'

0 commit comments

Comments
 (0)