Simplifying - we just use whatever message you pass

weaverryan · weaverryan · commit d6169384a495 · 2015-09-26T13:00:25.000-04:00
diff --git a/src/Symfony/Component/Security/Core/Exception/SafeMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/SafeMessageAuthenticationException.php
@@ -30,11 +30,7 @@ public function __construct($message = '', array $messageData = array(), $code =
     {
         parent::__construct($message, $code, $previous);
 
-        if ('' !== $message) {
-            $this->messageKey = $message;
-        }
-
-        $this->messageData = $messageData;
+        $this->setSafeMessage($message, $messageData);
     }
 
     /**
@@ -51,7 +47,7 @@ public function setSafeMessage($messageKey, array $messageData = array())
 
     public function getMessageKey()
     {
-        return null !== $this->messageKey ? $this->messageKey : parent::getMessageKey();
+        return $this->messageKey;
     }
 
     public function getMessageData()
diff --git a/src/Symfony/Component/Security/Core/Tests/Exception/SafeMessageAuthenticationExceptionTest.php b/src/Symfony/Component/Security/Core/Tests/Exception/SafeMessageAuthenticationExceptionTest.php
@@ -24,30 +24,4 @@ public function testConstructWithSAfeMessage()
         $this->assertEquals(array('foo' => true), $e->getMessageData());
         $this->assertEquals('SAFE MESSAGE', $e->getMessage());
     }
-
-    /**
-     * @dataProvider provideKeysAndData
-     */
-    public function testMessageKeyAndData($key, array $data, $expectedKey, array $expectedData)
-    {
-        $e = new SafeMessageAuthenticationException();
-        $e->setSafeMessage($key, $data);
-
-        $this->assertEquals($expectedKey, $e->getMessageKey());
-        $this->assertEquals($expectedData, $e->getMessageData());
-    }
-
-    public function provideKeysAndData()
-    {
-        // the parent exception
-        $authenticationException = new AuthenticationException();
-
-        $tests = array();
-        // null key means the parent is used
-        $tests[] = array(null, array(), $authenticationException->getMessageKey(), array());
-        $tests[] = array('', array(), '', array());
-        $tests[] = array('MESSAGE', array('bar' => false), 'MESSAGE', array('bar' => false));
-
-        return $tests;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,7 @@ public function __construct($message = '', array $messageData = array(), $code =`
`30`	`30`	`{`
`31`	`31`	`parent::__construct($message, $code, $previous);`
`32`	`32`
`33`		`- if ('' !== $message) {`
`34`		`- $this->messageKey = $message;`
`35`		`- }`
`36`		`-`
`37`		`- $this->messageData = $messageData;`
	`33`	`+ $this->setSafeMessage($message, $messageData);`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`/**`
`@@ -51,7 +47,7 @@ public function setSafeMessage($messageKey, array $messageData = array())`
`51`	`47`
`52`	`48`	`public function getMessageKey()`
`53`	`49`	`{`
`54`		`- return null !== $this->messageKey ? $this->messageKey : parent::getMessageKey();`
	`50`	`+ return $this->messageKey;`
`55`	`51`	`}`
`56`	`52`
`57`	`53`	`public function getMessageData()`