MAGETWO-66480: [GITHUB] URL key for specified store already exists #6671

- refactoring
magento · Jun 21, 2017 · 4531b09 · 4531b09
1 parent df19fed
commit 4531b09
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php b/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
@@ -16,8 +16,6 @@ class UrlRewriteExceptionMessageFactory implements ExceptionMessageFactoryInterf
 {
     const URL_DUPLICATE_MESSAGE = 'urlDuplicateMessage';
 
-    const EXCEPTION_CLASS = UrlAlreadyExistsException::class;
-
     /** @var Factory */
     private $messageFactory;
 

diff --git a/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php b/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php
@@ -33,7 +33,7 @@ public function __construct(
      * @param \Exception $exception
      * @return ExceptionMessageFactoryInterface|null
      */
-    public function getMessageGenerator(\Exception $exception)
+    public function getMessageFactory(\Exception $exception)
     {
         if (isset($this->exceptionMessageFactoryMap[get_class($exception)])) {
             return $this->exceptionMessageFactoryMap[get_class($exception)];

diff --git a/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php b/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php
@@ -26,7 +26,7 @@ public function __construct(ExceptionMessageFactoryPool $exceptionMessageFactory
      */
     public function createMessage(\Exception $exception, $type = MessageInterface::TYPE_ERROR)
     {
-        $messageGenerator = $this->exceptionMessageFactoryPool->getMessageGenerator($exception);
+        $messageGenerator = $this->exceptionMessageFactoryPool->getMessageFactory($exception);
         return $messageGenerator->createMessage($exception, $type);
     }
 }
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
@@ -50,7 +50,7 @@ public function testSuccessfulDefaultCreateMessage()
         $exception = new \Exception('message');
         $this->assertEquals(
             $this->defaultExceptionMessageFactoryMock,
-            $this->exceptionMessageFactoryPool->getMessageGenerator($exception)
+            $this->exceptionMessageFactoryPool->getMessageFactory($exception)
         );
     }
 
@@ -59,7 +59,7 @@ public function testSuccessfulSpecificCreateMessage()
         $localizedException = new LocalizedException(__('message'));
         $this->assertEquals(
             $this->specificExceptionMessageFactoryPoolMock,
-            $this->exceptionMessageFactoryPool->getMessageGenerator($localizedException)
+            $this->exceptionMessageFactoryPool->getMessageFactory($localizedException)
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php
@@ -29,7 +29,7 @@ protected function setUp()
     {
         $this->exceptionMessageFactoryPool = $this->getMock(
             \Magento\Framework\Message\ExceptionMessageFactoryPool::class,
-            ['getMessageGenerator'],
+            ['getMessageFactory'],
             [],
             '',
             false
@@ -58,7 +58,7 @@ public function test()
         $this->exceptionMessageFactoryPool->expects(
             $this->once()
         )->method(
-            'getMessageGenerator'
+            'getMessageFactory'
         )->with(
             $exception
         )->will(